3945 files changed, 0 insertions, 114520 deletions

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/.editorconfig b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/.editorconfig
deleted file mode 100644
index fcea945e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/CMakeLists.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/CMakeLists.txt
deleted file mode 100644
index 13839df9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/CMakeLists.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12)
-
-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
-    --test ${CMAKE_CURRENT_BINARY_DIR}/cli
-  ${_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
-    --test ${CMAKE_CURRENT_BINARY_DIR}/cli
-  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.74.0/tests/c-sharp.test b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/c-sharp.test
deleted file mode 100644
index 232315a7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/c-sharp.test
+++ /dev/null
@@ -1,149 +0,0 @@
-#
-# Test cases specifically for the C# language.
-#
-# Range: 10000 - 19999
-# test.name  config.file  input.file
-
-10000  cs/mono.cfg                                  cs/simple.cs
-10001  cs/getset.cfg                                cs/getset.cs
-10002  cs/ben_032.cfg                               cs/simple.cs
-10003  cs/ben_033.cfg                               cs/region.cs
-10010  cs/ben_034.cfg                               cs/var-member.cs
-10011  common/indent_columns-3.cfg                  cs/strings.cs
-10013  cs/625_where-constraints.cfg                 cs/625_where-constraints.cs
-
-10020  common/region-0.cfg                          cs/region.cs
-10021  common/region-1.cfg                          cs/region.cs
-10022  common/region-2.cfg                          cs/region.cs
-10023  common/region-3.cfg                          cs/region.cs
-
-10030  common/sort_imports.cfg                      cs/sort_using.cs
-10031  cs/mod_sort_using-t.cfg                      cs/bug_i_935.cs
-10032  cs/sort_using_categ.cfg                      cs/sort_using_categ.cs
-
-10040  cs/tcf.cfg                                   cs/tcf.cs
-10041  cs/tcf.cfg                                   cs/gs.cs
-10042  cs/ben_036.cfg                               cs/exception-filters.cs
-
-10050  cs/cs_generics.cfg                           cs/generics.cs
-
-10060  cs/ben_037.cfg                               cs/unsafe.cs
-10065  cs/UNI-1975.cfg                              cs/UNI-1975.cs
-
-10070  cs/ben_038.cfg                               cs/utf16le.cs
-10071  cs/ben_038.cfg                               cs/utf16be.cs
-10072  cs/ben_038.cfg                               cs/utf16le_no_bom.cs
-10073  cs/ben_038.cfg                               cs/utf16be_no_bom.cs
-10074  cs/UNI-2020.cfg                              cs/UNI-2020.cs
-
-10080  common/ben_042.cfg                           cs/property.cs
-
-10090  cs/ben_043.cfg                               cs/string_multi.cs
-
-10100  common/empty.cfg                             cs/bug_600.cs
-10101  cs/sf607.cfg                                 cs/sf607.cs
-
-10110  cs/mda_space_a.cfg                           cs/mdarray_space.cs
-10111  cs/sp_after_comma-a.cfg                      cs/mdarray_space.cs
-10112  cs/mda_space_c.cfg                           cs/mdarray_space.cs
-
-10119  common/empty.cfg                             cs/preserveTabs.cs
-10120  common/empty.cfg                             cs/cmt_backslash_eol.cs
-
-10130  cs/sp_between_new_paren.cfg                  cs/sp_between_new_paren.cs
-
-10140  cs/ben_044.cfg                               cs/remove_semi.cs
-
-10150  cs/ben_045.cfg                               cs/operator-null-conditional.cs
-10151  cs/sp_assign-a.cfg                           cs/operator_null-coalescing-assignment.cs
-
-10200  common/empty.cfg                             cs/logger.cs
-
-10300  common/empty.cfg                             cs/1822.cs
-
-10628  common/empty.cfg                             cs/sf628.cs
-10160  common/empty.cfg                             cs/delegate.cs
-10161  cs/indent_cs_delegate_brace-t.cfg            cs/delegate.cs
-12001  cs/bug_620.cfg                               cs/bug_620.cs
-12002  common/empty.cfg                             cs/nullable_prop.cs
-12003  cs/ben_043.cfg                               cs/fncall_as_ctor_in_attr.cs
-12004  cs/verbatim_strings.cfg                      cs/verbatim_strings.cs
-12005  common/empty.cfg                             cs/bug_1591.cs
-
-12101  cs/indent_using_block-f.cfg                  cs/bug_i_679.cs
-
-12102  cs/mod_full_brace_nl_block_rem_mlcond-0.cfg  cs/mod_full_brace_nl_block_rem_mlcond.cs
-12103  cs/mod_full_brace_nl_block_rem_mlcond-1.cfg  cs/mod_full_brace_nl_block_rem_mlcond.cs
-12104  cs/bug_1637.cfg                              cs/bug_1637.cs
-12105  cs/bug_1650.cfg                              cs/bug_1650.cs
-12106  cs/bug_1650.cfg                              cs/UNI-40685.cs
-12107  cs/mod_full_paren_if_bool.cfg                cs/mod_full_paren_if_bool.cs
-12108  cs/Issue_2705.cfg                            cs/Issue_2705.cs
-
-# test the options sp_ with the value "ignore"
-12200  cs/comma-cs-f.cfg                            cs/comma.cs
-12201  cs/comma-cs-i.cfg                            cs/comma.cs
-12202  cs/comma-cs-r.cfg                            cs/comma.cs
-
-# Adopt some UT tests
-10012  common/empty.cfg                             cs/621_this-spacing.cs
-10014  common/empty.cfg                             cs/630_bad-new-init-semicolon-removal.cs
-10015  cs/misc-failures.cfg                         cs/misc-failures.cs
-10016  cs/new-constraint-paren-space.cfg            cs/new-constraint-paren-space.cs
-10018  common/empty.cfg                             cs/delete-space-oc.mm
-10019  common/empty.cfg                             cs/func-param-wrap-oc.mm
-10027  cs/U01-Cs.cfg                                cs/oneline_property.cs
-10028  cs/U02-Cs.cfg                                cs/ifcolalign.cs
-10029  cs/U03-Cs.cfg                                cs/when.cs
-10033  cs/U11-Cpp.cfg                               cs/objc.mm
-10034  cs/U12-Cpp.cfg                               cs/asm.h.mm
-10035  cs/U13-Cpp.cfg                               cs/definesalign.h.mm
-10036  cs/U14-Cpp.cfg                               cs/inttypes.h.mm
-10039  cs/615_nested_usings.cfg                     cs/615_nested-usings.cs
-10044  cs/U04-Cs.cfg                                cs/ifcomment.cs
-10045  cs/UNI-1288.cfg                              cs/UNI-1288.cs
-10046  cs/U15-Cpp.cfg                               cs/UNI-1333.mm
-10051  cs/UNI-1338.cfg                              cs/UNI-1338.cs
-10055  cs/U06-Cs.cfg                                cs/UNI-1345.cs
-10066  cs/UNI-1977.cfg                              cs/UNI-1977.cs
-10067  cs/UNI-1978.cfg                              cs/UNI-1978.cs
-10075  cs/UNI-2021.cfg                              cs/UNI-2021.cs
-10076  cs/UNI-1343.cfg                              cs/UNI-1343.cs
-10077  cs/U09-Cs.cfg                                cs/UNI-1919.cs
-10078  cs/U10-Cs.cfg                                cs/UNI-3484.cs
-10102  cs/U24-Cpp.cfg                               cs/pp-ignore.mm
-10103  cs/U11-Cs.cfg                                cs/UNI-2506.cs
-10104  common/empty.cfg                             cs/UNI-2505.cs
-11011  cs/620_getset-brace.cfg                      cs/620_getset-brace.cs
-11030  cs/U08-Cpp.cfg                               cs/argtypes.mm
-11031  cs/U09-Cpp.cfg                               cs/casting.mm
-11032  cs/U10-Cpp.cfg                               cs/newlines.mm
-11072  cs/U07-Cs.cfg                                cs/UNI-2007.cs
-11073  cs/U08-Cs.cfg                                cs/UNI-2008.cs
-20010  cs/UNI-32658.cfg                             cs/UNI-32658.cs
-20011  cs/bug_1620.cfg                              cs/bug_1620.cs
-
-60004  cs/UNI-2684.cfg                              cs/UNI-2684.cs
-60005  cs/UNI-2685.cfg                              cs/UNI-2685.cs
-60007  cs/UNI-3083.cfg                              cs/UNI-3083.cs
-60008  cs/U-J.cfg                                   cs/UNI-17253.cs
-60009  cs/UNI-9917.cfg                              cs/UNI-9917.cs
-60011  cs/UNI-11095.cfg                             cs/UNI-11095.mm
-60012  cs/U13-Cs.cfg                                cs/UNI-12303.cs
-60013  cs/UNI-13955.cfg                             cs/UNI-13955.cs
-60015  cs/UNI-14131.cfg                             cs/UNI-14131.cs
-60016  cs/UNI-11662.cfg                             cs/UNI-11662.cs
-60018  common/UNI-18777.cfg                         cs/UNI-18777.cs
-60019  common/empty.cfg                             cs/UNI-18780.cs
-60020  cs/UNI-18829.cfg                             cs/UNI-18829.cs
-60023  cs/UNI-18437.cfg                             cs/UNI-18437.cs
-60024  cs/U15-Cs.cfg                                cs/UNI-19644.cs
-60026  cs/UNI-19895.cfg                             cs/UNI-19895.cs
-60033  cs/UNI-21730.cfg                             cs/UNI-21730.cs
-60036  cs/UNI-11993.cfg                             cs/UNI-11993.cs
-60037  cs/UNI-29933.cfg                             cs/UNI-29933.cs
-60040  cs/UNI-30498_2.cfg                           cs/UNI-30498_2.cs
-60041  cs/squeeze-paren-close-Option.cfg            cs/squeeze-paren-close-Option.cs
-60042  cs/indent-multistring-coulmn1.cfg            cs/indent-multistring-coulmn1.cs
-60044  cs/UNI-37241.cfg                             cs/UNI-37241.cs
-60045  common/nl_before_after.cfg                   cs/add-nl-before-namespace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/c.test b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/c.test
deleted file mode 100644
index eaf30d4e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/c.test
+++ /dev/null
@@ -1,435 +0,0 @@
-#
-# Test cases specifically for the C language.
-#
-# Range: 00000 - 09999
-# test.name  config.file  input.file
-
-
-# little general tests ====================================================
-
-00000  common/indent_columns-3.cfg                c/comment-indent.c
-00001  c/cpp_to_c-1.cfg                           c/comment-indent.c
-00002  c/cpp_to_c-2.cfg                           c/comment-indent.c
-00003  c/cpp_to_c-3.cfg                           c/comment-indent.c
-00004  c/indent-1.cfg                             c/switch.c
-00005  c/ben_047.cfg                              c/cmt-align.c
-00006  common/indent_columns-3.cfg                c/comment-convert.c
-00007  c/cpp_to_c-1.cfg                           c/comment-convert.c
-00008  c/cpp_to_c-2.cfg                           c/comment-convert.c
-00009  c/cpp_to_c-3.cfg                           c/comment-convert.c
-
-
-# brace styles
-
-00010  c/ben_048.cfg                              c/braces.c
-00011  common/brace-allman.cfg                    c/braces.c
-00012! c/brace-banner.cfg                         c/braces.c
-00013  c/brace-gnu.cfg                            c/braces.c
-00014  c/brace-kr.cfg                             c/braces.c
-00015  c/brace-ws.cfg                             c/braces.c
-00016  c/brace-ws2.cfg                            c/braces.c
-
-00020  c/ben_049.cfg                              c/define-if-indent.c
-00050  c/brace-remove-2.cfg                       c/brace-remove.c
-00051  c/brace-remove-all.cfg                     c/brace-remove.c
-00052  c/brace-remove-all.cfg                     c/brace-remove2.c
-00053  c/nl_brace_test.cfg                        c/brace.c
-00054  c/if_chain.cfg                             c/if_chain.c
-00055  c/cgal.cfg                                 c/braces-2.c
-00056  c/brace-remove-all.cfg                     c/brace-remove3.c
-00057  c/if_chain.cfg                             c/brace-remove3.c
-00058  c/brace-kr-nobr.cfg                        c/if_chain.c
-
-00060  c/ben_050.cfg                              c/braces-2.c
-00061  c/ben_051.cfg                              c/braces-3.c
-00062  c/ben_052.cfg                              c/braces-4.c
-00065  c/ben_053.cfg                              c/braces-5.c
-00066  c/ben_054.cfg                              c/vb-while.c
-00067  c/ben_055.cfg                              c/vb-do.c
-
-
-00068  c/ben_056.cfg                              c/bsnl.c
-00069  c/ben_057.cfg                              c/vb-pp.c
-
-00070  c/ben_058.cfg                              c/return-multi.c
-00071  common/ben_042.cfg                         c/include_define.h
-00072  common/star_pos-0.cfg                      c/align-proto.c
-00073  common/empty.cfg                           c/nl_proto_endif.c
-00074  c/clang-has_include.cfg                    c/clang-has_include.h
-00076  c/1225.cfg                                 c/1225.c
-
-00081  c/else-if-1.cfg                            c/else-if.c
-00082  c/else-if-2.cfg                            c/else-if.c
-
-00091  c/cond-1.cfg                               c/cond.c
-00092  common/indent_columns-3.cfg                c/cond.c
-00093  c/sp_cond_colon.cfg                        c/cond.c
-
-00101  c/ben_061.cfg                              c/bugs-1.c
-00102  c/space_indent_columns-3.cfg               c/bugs-2.c
-00103  c/ben_063.cfg                              c/bugs-3.c
-00104  c/ben_064.cfg                              c/bugs-4.c
-00105  c/ben_065.cfg                              c/bugs-5.c
-00106  common/ben_011.cfg                         c/bugs-6.c
-00107  common/ben_011.cfg                         c/bugs-7.c
-00108  common/indent_columns-3.cfg                c/bugs-8.c
-
-00110  c/ben_069.cfg                              c/misc.c
-00111  c/brace-kr-br.cfg                          c/misc.c
-
-00120  c/sp_cmt_cpp_start-r.cfg                   c/sp_cmt_cpp_start.c
-00121  common/sp_cmt_cpp_start-a.cfg              c/sp_cmt_cpp_start.c
-00122  common/sp_cmt_cpp_start_force.cfg          c/sp_cmt_cpp_start.c
-00123  c/cmt_reflow.cfg                           c/cmt_reflow.c
-
-00130  c/ben_070.cfg                              c/minus-minus.c
-00135  c/nepenthes.cfg                            c/br_cmt.c
-
-00140  c/ben_071.cfg                              c/global-vars.c
-00141  c/ben_072.cfg                              c/deref.c
-00142  c/ben_073.cfg                              c/type-cast.c
-00143  c/ben_074.cfg                              c/t3.in.c
-00144  c/ben_075.cfg                              c/align-proto-vars.c
-00145  c/ben_076.cfg                              c/vardefcol.c
-
-
-# casts
-
-00150  c/ben_077.cfg                              c/casts.c
-00151  c/cast-sp-r.cfg                            c/casts.c
-00152  c/cast-sp-a.cfg                            c/casts.c
-00153  c/cast-type.cfg                            c/casts.c
-00154  common/sp_after_cast.cfg                   c/casts.c
-00155  c/ben_078.cfg                              c/cast_brace.c
-
-
-# fcn indents
-
-00160  c/indent_func_param.cfg                    c/fcn_indent.c
-00161  c/indent_func_call_param.cfg               c/fcn_indent.c
-00162  c/indent_func_def_param.cfg                c/fcn_indent.c
-00163  c/indent_func_proto_param.cfg              c/fcn_indent.c
-00164  c/rdan.cfg                                 c/fcn_indent_func_def_col1.c
-00165  c/sp_func_call_user_inside_fparen.cfg      c/sp_func_call_user_inside_fparen.c
-
-00170  common/empty.cfg                           c/beautifier-off.c
-00180  c/sf538.cfg                                c/lvalue.c
-
-
-# switch & case stuff
-
-00201  c/case-1.cfg                               c/case.c
-00202  c/case-2.cfg                               c/case.c
-00203  c/case-3.cfg                               c/case.c
-00204  c/bug_1718.cfg                             c/bug_1718.c
-00205  c/nl_before_return_false.cfg               c/case-nl_before_return.c
-00206  c/nl_before_return_true.cfg                c/case-nl_before_return.c
-00207  common/nl_before_ignore_after_case.cfg     c/nl_before_ignore_after_case.c
-
-
-# structure initializers
-
-00301  c/ben_079.cfg                              c/align-struct-init.c
-00302  c/ben_080.cfg                              c/one-liner-init.c
-00303  c/1liner-split.cfg                         c/one-liner-init.c
-00304  c/1liner-no-split.cfg                      c/one-liner-init.c
-00305  c/ben_081.cfg                              c/one-liner-define.c
-
-00310  common/empty.cfg                           c/sp_embed_comment.c
-
-00320  c/rdan.cfg                                 c/indent_first_bool_expr.c
-
-
-# aligning tresholds
-
-00401  common/align-1.cfg                         c/align-equ.c
-00402  common/align-1.cfg                         c/align-var.c
-00403  c/align-2.cfg                              c/align-var.c
-00404  c/align-3.cfg                              c/align-var.c
-00405  c/align-3.cfg                              c/bits.c
-00406  c/bug_i_771.cfg                            c/bug_i_771.c
-
-00411  c/align_typedef_gap-3_span-5.cfg           c/align-typedef.c
-00412  c/align_typedef_gap-3_span-5.cfg           c/align-typedef.c
-00413  c/align_typedef_func-1.cfg                 c/align-typedef.c
-00414  c/align_typedef_func-2.cfg                 c/align-typedef.c
-00415  c/align_stack.cfg                          c/align_stack.c
-00416  c/align_sf_call_thresh_416.cfg             c/align_sf_call_thresh_416.c
-00417  c/align_sf_call_thresh_417.cfg             c/align_sf_call_thresh_417.c
-00418  c/align_sf_call_span_418.cfg               c/align_sf_call_span_418.c
-00419  c/align_sf_call_span_419.cfg               c/align_sf_call_span_419.c
-00420  c/Issue-2278.cfg                           c/Issue-2278.c
-
-00421  c/nl_ds_struct_enum_cmt-t.cfg              c/nl_ds_struct_enum.c
-00422  c/nl_ds_struct_enum-2.cfg                  c/nl_ds_struct_enum.c
-00423  c/bug_1702.cfg                             c/bug_1702.c
-
-00430  common/empty.cfg                           c/paren-indent.c
-00431  c/indent_paren_close-1.cfg                 c/paren-indent.c
-00432  c/indent_paren_close-2.cfg                 c/paren-indent.c
-
-00440  c/bug_489.cfg                              c/bug_489.c
-
-00451  c/code_width-80.cfg                        c/enum_gallery.c
-00452  c/nl_enum_own_lines-a.cfg                  c/enum_gallery.c
-00453! c/nl_enum_own_lines-3.cfg                  c/enum_gallery.c
-00454  c/nl_enum_own_lines-4.cfg                  c/enum_gallery.c
-
-00461  c/align_func_proto_star_amp-1.cfg          c/align_func_proto_star_amp.h
-00462  c/align_func_proto_star_amp-2.cfg          c/align_func_proto_star_amp.h
-00463  c/align_func_proto_star_amp-3.cfg          c/align_func_proto_star_amp.h
-00464  c/align_func_proto_star_amp-4.cfg          c/align_func_proto_star_amp.h
-00465  c/align_func_proto_star_amp-5.cfg          c/align_func_proto_star_amp.h
-00466  c/align_func_proto_star_amp-6.cfg          c/align_func_proto_star_amp.h
-00467  c/align_func_proto_star_amp-7.cfg          c/align_func_proto_star_amp.h
-00468  c/align_func_proto_star_amp-8.cfg          c/align_func_proto_star_amp.h
-00469  c/align_func_proto_star_amp-9.cfg          c/align_func_proto_star_amp.h
-
-# boolean and comma positioning
-
-00501  c/bool-pos-eol.cfg                         c/bool-pos.c
-00502  c/bool-pos-sol.cfg                         c/bool-pos.c
-00503  c/pos_compare-sol.cfg                      c/pos_compare.c
-00504  c/pos_compare-eol.cfg                      c/pos_compare.c
-00505  c/pos_conditional-l.cfg                    c/pos_conditional.c
-00506  c/pos_conditional-t.cfg                    c/pos_conditional.c
-00510  c/bool-pos-eol-break.cfg                   c/bool-pos.c
-00511  c/bool-pos-sol-break.cfg                   c/bool-pos.c
-00512  common/bool-pos-eol-force.cfg              c/bool-pos.c
-00513  c/bool-pos-sol-force.cfg                   c/bool-pos.c
-00514  c/my_conf.cfg                              c/my_infile.c
-
-00600  common/indent_columns-3.cfg                c/dos.c
-00601  common/indent_columns-3.cfg                c/mac.c
-00611  common/empty.cfg                           c/pp-space.c
-00612  c/pp-indent-2.cfg                          c/pp-space.c
-00613  c/pp_indent-a.cfg                          c/pp-space.c
-00614  c/pp-space.cfg                             c/pp-space.c
-00615  c/pp-indent-2.cfg                          c/pp-nest.c
-00616  c/pp_if_indent-1.cfg                       c/pp-if-indent.c
-00617  c/rdan.cfg                                 c/pp-if-indent.c
-00618  c/pp_if_indent-4.cfg                       c/pp-if-indent.c
-00619  c/Issue_3169.cfg                           c/Issue_3169.c
-
-00620  c/ben_083.cfg                              c/indent-assign.c
-00621  c/nl_endif.cfg                             c/nl_endif.c
-00622  c/indent_assign.cfg                        c/indent-off-after-assign.c
-
-00631  c/nl_assign1.cfg                           c/nl_assign.c
-00632  c/nl_assign2.cfg                           c/nl_assign.c
-00633  c/nl_assign1.cfg                           c/bug_3156.c
-
-# function def newlines
-00701  common/func-def-1.cfg                      c/function-def.c
-00702  common/func-def-2.cfg                      c/function-def.c
-00703  common/func-def-3.cfg                      c/function-def.c
-
-00710  c/add_long_closebrace_comment_1.cfg        c/add_long_comment.c
-
-# nl_after_semicolon and nl_after_open_brace
-
-00721  c/nl_semicolon.cfg                         c/nl-semicolon.c
-
-# function types
-
-00801  c/ben_084.cfg                              c/fcn_type.c
-00802  c/ben_085.cfg                              c/funcfunc.c
-00803  c/sf537.cfg                                c/fcn_type.c
-
-# code width
-
-00901  c/width.cfg                                c/code_width.c
-00902  common/width-2.cfg                         c/code_width.c
-00903  c/width-3.cfg                              c/code_width.c
-
-# pascal ptr_type
-
-00910  c/pascal_ptr.cfg                           c/pascal_ptr.c
-00911  c/empty_body.cfg                           c/pascal_ptr.c
-
-01000  c/mod-paren.cfg                            c/mod-paren.c
-01001  c/nl-comment.cfg                           c/nl-comment.c
-01002  c/mod-paren2.cfg                           c/mod-paren.c
-
-01005  c/mod_case_brace_add.cfg                   c/mod_case_brace.c
-01006  common/mod_case_brace_rm.cfg               c/mod_case_brace.c
-01007  c/mod_move_case_brace.cfg                  c/mod_case_brace.c
-01008  c/mod_case_brace_add.cfg                   c/Issue_3366.c
-
-01011  common/del_semicolon.cfg                   c/semicolons.c
-01012  c/ben_086.cfg                              c/semicolons.c
-
-01015  common/empty.cfg                           c/paren_indent.c
-01016  c/align_attr.cfg                           c/align_attr.c
-
-01020  common/kw_subst.cfg                        c/kw_subst.c
-01021  common/kw_subst3.cfg                       c/hello.c
-01022  common/kw_subst3.cfg                       c/kw_subst.c
-
-01030  c/cmt_indent_multi-f.cfg                   c/multi.h
-
-01035  common/empty.cfg                           c/func_wrap.c
-01036  common/sp_inside_fparen-f.cfg              c/func_wrap.c
-01037  c/type_wrap.cfg                            c/type_wrap.c
-
-01040  c/newline_after_endif.cfg                  c/newline_after_endif.c
-
-01050  c/func_call_user.cfg                       c/func_call_user.c
-
-01060  common/empty.cfg                           c/backslash-newline-lex.c
-
-01070  c/label_colon_nl_1.cfg                     c/various_colons.c
-01071  c/label_colon_nl_2.cfg                     c/various_colons.c
-
-01080  common/empty.cfg                           c/bug_1196.c
-
-# big general tests
-
-02000  c/ben_087.cfg                              c/i2c-core.c
-02001  c/preproc-cleanup.cfg                      c/directfb.h
-02002  common/ben2.cfg                            c/i2c-core.c
-
-# clark's style - blank lines before and after flow control, indented comments
-
-02100  common/clark.cfg                           c/i2c-core.c
-02101  common/clark.cfg                           c/comment-indent.c
-
-02200  c/xml-str.cfg                              c/xml.c
-02201  c/xml-str.cfg                              c/align-string.c
-
-02300  c/ben_088.cfg                              c/preproc-if.c
-02301  common/d.cfg                               c/preproc-if.c
-02302  c/cpp_to_c-1.cfg                           c/nl-cont.c
-02303  c/cpp_to_c-1.cfg                           c/nl-cont2.c
-
-02310  c/ben_089.cfg                              c/empty-for.c
-02311  c/ben_090.cfg                              c/pragma.c
-
-02315  c/pp_ret.cfg                               c/pp_ret.c
-
-02320  c/nl_create_one_liner.cfg                  c/nl_create_one_liner.c
-02325  common/sort_imports.cfg                    c/sort_include.c
-
-02330  c/leave_one_liners.cfg                     c/one_liners.c
-
-# some embedded sql stuff
-
-02400  c/ben_091.cfg                              sql/mysql.sqc                   C
-02401  c/ben_092.cfg                              sql/sta-select.sqc              C
-02402  c/issue_527.cfg                            sql/issue_527.sqc               C
-
-02410  c/pp_if_indent-0.cfg                       c/ifdef-indent.c
-02411  c/pp_if_indent-1.cfg                       c/ifdef-indent.c
-02412  c/pp_if_indent-2.cfg                       c/ifdef-indent.c
-02413  c/pp_if_indent-3.cfg                       c/ifdef-indent.c
-02414  c/nl_whole_file_ifdef.cfg                  c/whole_file_ifdef.c
-02415  c/endif.cfg                                c/endif.c
-02416  c/cmt_nl_end.cfg                           c/cmt_nl_end.c
-
-02421  c/cmt_multi_check_last-f.cfg               c/cmt_multi.c
-02422  common/empty.cfg                           c/cmt_multi.c
-02423  common/empty.cfg                           c/cmt_multi_utf8.c
-
-02431  c/align_right_cmt_gap-1.cfg                c/cmt_right_align.c
-02432  c/space_indent_columns-3.cfg               c/cmt_right_align.c
-
-02440  common/empty.cfg                           c/string_utf8.c
-02441  common/empty.cfg                           c/utf8-identifiers.c
-
-02451  c/return-1.cfg                             c/nl_return_expr.c
-02452  c/return-2.cfg                             c/nl_return_expr.c
-02453  c/return-3.cfg                             c/nl_return_expr.c
-02454  c/return-4.cfg                             c/nl_return_expr.c
-
-02455  common/mod_paren_on_return-a.cfg           c/macro-returns.c
-02456  common/mod_paren_on_return-r.cfg           c/macro-returns.c
-02457  c/nl_before_return_true.cfg                c/nl_before_return.c
-
-02460  c/freebsd.cfg                              c/freebsd.c
-
-02486  c/doxy-comment-no.cfg                      c/doxy-comment.c
-02487  c/doxy-comment-yes.cfg                     c/doxy-comment.c
-
-02501  c/ger.cfg                                  c/custom_types_ssl.c
-02502  c/custom_types_ssl.cfg                     c/custom_types_ssl.c
-#02503  ger.cfg                                    c/pp_concat_asn1.h
-
-02504  c/align_keep_extra.cfg                     c/align_keep_extra.c
-
-02510  c/ben_093.cfg                              c/asm.c
-
-07630  c/indent-vbrace.cfg                        c/indent-vbrace.c
-
-08399  c/ben_095.cfg                              c/gh399.c
-
-09594  common/indent_columns-3.cfg                c/sf594.c
-09588  common/empty.cfg                           c/sf588.c
-
-09601  c/sp_after_sparen.cfg                      c/sp_after_sparen.c
-09602  common/bug_671.cfg                         c/bug_671.c
-09603  c/indent_ternary_operator-1.cfg            c/indent_ternary-1.c
-09604  c/indent_ternary_operator-2.cfg            c/indent_ternary-2.c
-09605  common/sp_arith-f.cfg                      c/negative_value.c
-09606  c/ptr-arith.cfg                            c/extern.c
-09607  c/ptr-arith.cfg                            c/attribute.c
-09608  common/aet-func_call_user.cfg              c/func_call_user2.c
-09609  c/Issue_2279.cfg                           c/Issue_2279.c
-
-09610  c/force_tab_after_define-t.cfg             c/bug_i_876.c
-09611  common/space_indent_columns-4.cfg          c/bug_i_222.c
-09612  common/empty.cfg                           c/bug_1041.c
-09613  common/empty.cfg                           c/i1413.c
-09614  common/empty.cfg                           c/string_prefixes.c
-09615  c/i1564.cfg                                c/i1564.c
-09616  c/enum_comma_ifdef.cfg                     c/enum_comma_ifdef.c
-09617  c/Issue_2360-a.cfg                         c/Issue_2360.c
-09618  c/Issue_2360-b.cfg                         c/Issue_2360.c
-09619  c/Issue_2411.cfg                           c/Issue_2411.c
-
-09620  c/Issue_2640.cfg                           c/Issue_2640.c
-09621  c/preproc-cleanup.cfg                      c/pp-before-func-def.c
-09622  c/Issue_3356.cfg                           c/Issue_3356.c
-
-10004  c/ben_094.cfg                              c/pragma_asm.c
-10005  common/empty.cfg                           c/i1270.c
-10006  c/bug_2331.cfg                             c/bug_2331.c
-10007  c/indent_macro_brace-true.cfg              c/indent-macro-brace.c
-10008  c/indent_macro_brace-false.cfg             c/indent-macro-brace.c
-10009  common/empty.cfg                           c/return-compound-literal.c
-
-10010  c/indent_compound_literal_return-false.cfg c/return-compound-literal.c
-10011  c/indent_compound_literal_return-true.cfg  c/return-compound-literal.c
-10012  c/indent_sparen_extra-8.cfg                c/sparen-indent.c
-10013  common/empty.cfg                           c/sparen-indent.c
-10014  common/indent_continue-8.cfg               c/sparen-indent.c
-10015  common/empty.cfg                           c/Issue_2845.h
-10016  c/Issue_3233.cfg                           c/Issue_3233.c
-10017  c/sp_sparen_paren-a.cfg                    c/double-sparen.c
-10018  c/sp_sparen_paren-i.cfg                    c/double-sparen.c
-10019  c/pp_indent_in_guard.cfg                   c/include-guard.h
-10020  c/indent_single_line_comments_after.cfg    c/single_line_comment_after.c
-10021  common/sp_cparen_oparen-f.cfg              c/parenthesized_indirect_call.c
-10022  c/Issue_3269.cfg                           c/Issue_3269.c
-10023  c/Issue_3272.cfg                           c/Issue_3272.h
-10024  c/Issue_3274.cfg                           c/Issue_3274.c
-10025  c/sp_between_semi_for_empty-r.cfg          c/forever.c
-10026  c/sp_between_semi_for_empty-i.cfg          c/forever.c
-10027  c/Issue_3327.cfg                           c/Issue_3327.c
-10028  c/sp_emb_cmt-i.cfg                         c/Issue_3339.c
-10029  c/sp_emb_cmt-f.cfg                         c/Issue_3339.c
-10030  c/sp_emb_cmt-r.cfg                         c/Issue_3339.c
-10031  c/sp_after_pointer_star-r.cfg              c/Issue_3342.c
-10032  c/sp_after_pointer_star-r.cfg              c/Issue_3345.c
-10033  c/pp_include_at_level-true.cfg             c/Issue_3343.c
-10034  c/pp_include_at_level-false.cfg            c/Issue_3343.c
-10035  c/indent_comment_align_thresh-0.cfg        c/comment-indent.c
-10036  c/Issue_3350.cfg                           c/comment-indent.c
-10037  c/indent_case_comment-true.cfg             c/Issue_3362.c
-10038  c/indent_case_comment-false.cfg            c/Issue_3362.c
-10039  c/Issue_3370.cfg                           c/Issue_3370.c
-10040  c/Issue_3377.cfg                           c/Issue_3377.c
-10041  c/Issue_3351.cfg                           c/Issue_3351.c
-10042  c/sp_ptr_star_func_var-i.cfg               c/Issue_3376.c
-10043  c/sp_ptr_star_func_var-a.cfg               c/Issue_3376.c
-10044  c/sp_ptr_star_func_var-r.cfg               c/Issue_3376.c
-10045  c/sp_ptr_star_func_var-f.cfg               c/Issue_3376.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/I-842.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/I-842.cfg
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/I-842.cfg
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/copyright-header.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/copyright-header.cfg
deleted file mode 100644
index 13d5020b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/copyright-header.cfg
+++ /dev/null
@@ -1 +0,0 @@
-cmt_insert_file_header = copyright-header.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/copyright-header.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/copyright-header.txt
deleted file mode 100644
index f96c1ae8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/copyright-header.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-// Copyright $(year)
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/mini_d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/mini_d.cfg
deleted file mode 100644
index ddd51138..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/config/mini_nd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/mini_nd.cfg
deleted file mode 100644
index 23db4460..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/config/replace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/replace.cfg
deleted file mode 100644
index 16473bf2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/config/tracking_space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/tracking_space.cfg
deleted file mode 100644
index 8b37aa38..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/config/truncate.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/truncate.cfg
deleted file mode 100644
index cc48c57e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/truncate.cfg
+++ /dev/null
@@ -1 +0,0 @@
-debug_truncate = 38
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/unmatched_close_pp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/unmatched_close_pp.cfg
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/unmatched_close_pp.cfg
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/I-3310.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/I-3310.c
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/I-3310.c
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/I-842.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/I-842.cpp
deleted file mode 100644
index 7f7bcaf3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/input/backup.h-save b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/backup.h-save
deleted file mode 100644
index 9a66578c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/input/class_enum_struct_union.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/class_enum_struct_union.cpp
deleted file mode 100644
index 6a72c823..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/input/logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/logger.cs
deleted file mode 100644
index defede8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/input/replace.list b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/replace.list
deleted file mode 100644
index 009e6f33..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/replace.list
+++ /dev/null
@@ -1,2 +0,0 @@
-input/I-3310.c
-input/backup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/testSrc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/testSrc.cpp
deleted file mode 100644
index 1a22f6d9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/input/testSrcP.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/testSrcP.cpp
deleted file mode 100644
index 85e36674..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/input/tracking_space.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/tracking_space.cpp
deleted file mode 100644
index 5b0b8aa1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/input/truncate.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/truncate.cpp
deleted file mode 100644
index 7ef9530d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/input/unmatched_close_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/unmatched_close_pp.cpp
deleted file mode 100644
index b79d12fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/output/21.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/21.txt
deleted file mode 100644
index 7c702d87..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/output/25.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/25.txt
deleted file mode 100644
index 12967a1b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/output/28.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/28.txt
deleted file mode 100644
index f49f675e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/28.txt
+++ /dev/null
@@ -1,428 +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
-parameter_pack_cleanup : orig_line is 1, orig_col is 1, text() is 'struct'
-parameter_pack_cleanup : orig_line is 1, orig_col is 8, text() is 'TelegramIndex'
-parameter_pack_cleanup : orig_line is 1, orig_col is 21, text() is ''
-parameter_pack_cleanup : orig_line is 2, orig_col is 1, text() is '{'
-parameter_pack_cleanup : orig_line is 2, orig_col is 2, text() is ''
-parameter_pack_cleanup : orig_line is 3, orig_col is 1, text() is 'TelegramIndex'
-parameter_pack_cleanup : orig_line is 3, orig_col is 14, text() is '('
-parameter_pack_cleanup : orig_line is 3, orig_col is 15, text() is 'const'
-parameter_pack_cleanup : orig_line is 3, orig_col is 21, text() is 'char'
-parameter_pack_cleanup : orig_line is 3, orig_col is 25, text() is '*'
-parameter_pack_cleanup : orig_line is 3, orig_col is 27, text() is 'pN'
-parameter_pack_cleanup : orig_line is 3, orig_col is 29, text() is ','
-parameter_pack_cleanup : orig_line is 3, orig_col is 31, text() is 'unsigned'
-parameter_pack_cleanup : orig_line is 3, orig_col is 40, text() is 'long'
-parameter_pack_cleanup : orig_line is 3, orig_col is 45, text() is 'nI'
-parameter_pack_cleanup : orig_line is 3, orig_col is 47, text() is ')'
-parameter_pack_cleanup : orig_line is 3, orig_col is 49, text() is ':'
-parameter_pack_cleanup : orig_line is 3, orig_col is 50, text() is ''
-parameter_pack_cleanup : orig_line is 4, orig_col is 1, text() is 'pTelName'
-parameter_pack_cleanup : orig_line is 4, orig_col is 9, text() is '('
-parameter_pack_cleanup : orig_line is 4, orig_col is 10, text() is 'pN'
-parameter_pack_cleanup : orig_line is 4, orig_col is 12, text() is ')'
-parameter_pack_cleanup : orig_line is 4, orig_col is 13, text() is ','
-parameter_pack_cleanup : orig_line is 4, orig_col is 14, text() is ''
-parameter_pack_cleanup : orig_line is 5, orig_col is 1, text() is 'nTelIndex'
-parameter_pack_cleanup : orig_line is 5, orig_col is 10, text() is '('
-parameter_pack_cleanup : orig_line is 5, orig_col is 11, text() is 'n'
-parameter_pack_cleanup : orig_line is 5, orig_col is 12, text() is ')'
-parameter_pack_cleanup : orig_line is 5, orig_col is 13, text() is ''
-parameter_pack_cleanup : orig_line is 6, orig_col is 1, text() is '{'
-parameter_pack_cleanup : orig_line is 6, orig_col is 2, text() is ''
-parameter_pack_cleanup : orig_line is 7, orig_col is 1, text() is '}'
-parameter_pack_cleanup : orig_line is 7, orig_col is 2, text() is ''
-parameter_pack_cleanup : orig_line is 9, orig_col is 1, text() is '~'
-parameter_pack_cleanup : orig_line is 9, orig_col is 2, text() is 'TelegramIndex'
-parameter_pack_cleanup : orig_line is 9, orig_col is 15, text() is '('
-parameter_pack_cleanup : orig_line is 9, orig_col is 16, text() is ')'
-parameter_pack_cleanup : orig_line is 9, orig_col is 17, text() is ''
-parameter_pack_cleanup : orig_line is 10, orig_col is 1, text() is '{'
-parameter_pack_cleanup : orig_line is 10, orig_col is 2, text() is ''
-parameter_pack_cleanup : orig_line is 11, orig_col is 1, text() is '}'
-parameter_pack_cleanup : orig_line is 11, orig_col is 2, text() is ''
-parameter_pack_cleanup : orig_line is 13, orig_col is 1, text() is 'const'
-parameter_pack_cleanup : orig_line is 13, orig_col is 7, text() is 'char'
-parameter_pack_cleanup : orig_line is 13, orig_col is 11, text() is '*'
-parameter_pack_cleanup : orig_line is 13, orig_col is 13, text() is 'const'
-parameter_pack_cleanup : orig_line is 13, orig_col is 19, text() is 'pTelName'
-parameter_pack_cleanup : orig_line is 13, orig_col is 27, text() is ';'
-parameter_pack_cleanup : orig_line is 13, orig_col is 28, text() is ''
-parameter_pack_cleanup : orig_line is 14, orig_col is 1, text() is 'unsigned'
-parameter_pack_cleanup : orig_line is 14, orig_col is 10, text() is 'long'
-parameter_pack_cleanup : orig_line is 14, orig_col is 15, text() is 'nTelIndex'
-parameter_pack_cleanup : orig_line is 14, orig_col is 24, text() is ';'
-parameter_pack_cleanup : orig_line is 14, orig_col is 25, text() is ''
-parameter_pack_cleanup : orig_line is 15, orig_col is 1, text() is '}'
-parameter_pack_cleanup : orig_line is 15, orig_col is 2, text() is ';'
-parameter_pack_cleanup : orig_line is 15, orig_col is 3, text() is ''
-log_rule(enum_cleanup : rule is 'mod_enum_last_comma'
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/31.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/31.txt
deleted file mode 100644
index a890e117..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/output/36.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/36.txt
deleted file mode 100644
index 892f5af5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/output/66.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/66.txt
deleted file mode 100644
index 71b7804d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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 sp_after_ptr_star[ ]
- 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 sp_before_constr_colon[ ]
- 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 sp_after_ptr_star_qualifier[ ]
- 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 sp_after_ptr_star[ ]
-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 sp_before_constr_colon[ ]
-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 sp_after_ptr_star_qualifier[ ]
-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.74.0/tests/cli/output/9.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/9.txt
deleted file mode 100644
index 98afe921..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/9.txt
+++ /dev/null
@@ -1 +0,0 @@
-Using LF line endings
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/92.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/92.txt
deleted file mode 100644
index eb0d7c05..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/output/Debug_tracking_space.html b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/Debug_tracking_space.html
deleted file mode 100644
index b7adc237..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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 title="1,REMOVE"><font color="red">M</font></a>
-   a<a title="2,sp_assign"><font color="red">M</font></a>=<a title="3,86,sp_assign"><font color="red">M</font></a>b<a title="4,87,93,sp_arith"><font color="red">M</font></a>+<a title="5,88,94,99,sp_arith"><font color="red">M</font></a>111<a title="6,89,95,100,104,sp_arith"><font color="red">M</font></a>-<a title="7,90,96,101,105,108,sp_arith"><font color="red">M</font></a>55<a title="8,91,97,102,106,109,111,sp_before_semi"><font color="red">M</font></a>;<a title="9,92,98,103,107,110,112,113,REMOVE"><font color="red">M</font></a>
-}<a title="10,REMOVE"><font color="red">M</font></a>
-template<a title="11,sp_before_angle"><font color="red">M</font></a>&lt;<a title="12,114,sp_inside_angle"><font color="red">M</font></a>typename<a title="13,115,123,ADD from add_space_table"><font color="red">M</font></a>...<a title="14,116,124,131,sp_ellipsis_parameter_pack"><font color="red">M</font></a>A<a title="15,117,125,132,138,sp_before_comma"><font color="red">M</font></a>,<a title="16,118,126,133,139,144,sp_after_comma"><font color="red">M</font></a>int<a title="17,119,127,134,140,145,149,sp_type_ellipsis"><font color="red">M</font></a>...<a title="18,120,128,135,141,146,150,153,FORCE"><font color="red">M</font></a>B<a title="19,121,129,136,142,147,151,154,156,sp_inside_angle"><font color="red">M</font></a>&gt;<a title="20,122,130,137,143,148,152,155,157,158,REMOVE"><font color="red">M</font></a>
-struct<a title="21,ADD from add_space_table"><font color="red">M</font></a>foo1<a title="22,159,sp_after_type"><font color="red">M</font></a>:<a title="23,160,177,ADD from add_space_table"><font color="red">M</font></a>foo1<a title="24,161,178,194,sp_before_angle"><font color="red">M</font></a>&lt;<a title="25,162,179,195,210,sp_inside_angle"><font color="red">M</font></a>A<a title="26,163,180,196,211,225,sp_parameter_pack_ellipsis"><font color="red">M</font></a>...<a title="27,164,181,197,212,226,239,sp_before_comma"><font color="red">M</font></a>,<a title="28,165,182,198,213,227,240,252,sp_after_comma"><font color="red">M</font></a>(<a title="29,166,183,199,214,228,241,253,264,sp_inside_paren"><font color="red">M</font></a>sizeof<a title="30,167,184,200,215,229,242,254,265,275,sp_sizeof_ellipsis"><font color="red">M</font></a>...<a title="31,168,185,201,216,230,243,255,266,276,285,sp_sizeof_ellipsis_paren"><font color="red">M</font></a>(<a title="32,169,186,202,217,231,244,256,267,277,286,294,sp_inside_paren"><font color="red">M</font></a>A<a title="33,170,187,203,218,232,245,257,268,278,287,295,302,sp_inside_paren"><font color="red">M</font></a>)<a title="34,171,188,204,219,233,246,258,269,279,288,296,303,309,sp_arith"><font color="red">M</font></a>+<a title="35,172,189,205,220,234,247,259,270,280,289,297,304,310,315,sp_arith"><font color="red">M</font></a>B<a title="36,173,190,206,221,235,248,260,271,281,290,298,305,311,316,320,sp_inside_paren"><font color="red">M</font></a>)<a title="37,174,191,207,222,236,249,261,272,282,291,299,306,312,317,321,324,sp_paren_ellipsis"><font color="red">M</font></a>...<a title="38,175,192,208,223,237,250,262,273,283,292,300,307,313,318,322,325,327,sp_inside_angle"><font color="red">M</font></a>&gt;<a title="39,176,193,209,224,238,251,263,274,284,293,301,308,314,319,323,326,328,329,REMOVE"><font color="red">M</font></a>
-{<a title="40,REMOVE"><font color="red">M</font></a>
-   foo1<a title="41,64,sp_func_class_paren"><font color="red">M</font></a>(<a title="42,65,330,sp_inside_fparens"><font color="red">M</font></a>)<a title="43,66,331,333,sp_fparen_brace"><font color="red">M</font></a>{<a title="44,67,332,334,335,REMOVE"><font color="red">M</font></a>
-      int<a title="45,68,sp_after_type"><font color="red">M</font></a>x<a title="46,69,336,sp_assign"><font color="red">M</font></a>=<a title="47,70,337,344,sp_assign"><font color="red">M</font></a>sizeof<a title="48,71,338,345,351,sp_sizeof_ellipsis"><font color="red">M</font></a>...<a title="49,72,339,346,352,357,sp_sizeof_ellipsis_paren"><font color="red">M</font></a>(<a title="50,73,340,347,353,358,362,sp_inside_paren"><font color="red">M</font></a>A<a title="51,74,341,348,354,359,363,366,sp_inside_paren"><font color="red">M</font></a>)<a title="52,75,342,349,355,360,364,367,369,sp_before_semi"><font color="red">M</font></a>;<a title="53,76,343,350,356,361,365,368,370,371,REMOVE"><font color="red">M</font></a>
-      bool<a title="54,77,sp_after_type"><font color="red">M</font></a>b<a title="55,78,372,sp_assign"><font color="red">M</font></a>=<a title="56,79,373,378,sp_assign"><font color="red">M</font></a>x<a title="57,80,374,379,383,sp_compare"><font color="red">M</font></a>><a title="58,81,375,380,384,387,sp_compare"><font color="red">M</font></a>1<a title="59,82,376,381,385,388,390,sp_before_semi"><font color="red">M</font></a>;<a title="60,83,377,382,386,389,391,392,REMOVE"><font color="red">M</font></a>
-   }<a title="61,84,REMOVE"><font color="red">M</font></a>
-}<a title="62,sp_before_semi"><font color="red">M</font></a>;<a title="63,393,REMOVE"><font color="red">M</font></a>
-</pre>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/I-842.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/I-842.txt
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/I-842.txt
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/backup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/backup.h
deleted file mode 100644
index 210c6f7c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/output/class_enum_struct_union.csv b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/class_enum_struct_union.csv
deleted file mode 100644
index 3b5c4a4e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/output/class_enum_struct_union.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/class_enum_struct_union.txt
deleted file mode 100644
index 4cf1a681..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/output/copyright-header.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/copyright-header.cpp
deleted file mode 100644
index 348902a5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/copyright-header.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright this year
-
-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.74.0/tests/cli/output/help.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/help.txt
deleted file mode 100644
index ff83f72b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/help.txt
+++ /dev/null
@@ -1,83 +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'
- -ds FILE              : Dump parsing info at various moments of the formatting process.
- --dump-steps FILE       This creates a series of files named 'FILE_nnn.log', each
-                         corresponding to a formatting step in uncrustify.
-                         The file 'FILE_000.log' lists the formatting options in use.
-                         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 -f foo.d -o foo.d -ds dump
-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.74.0/tests/cli/output/logger_cs_L_99.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/logger_cs_L_99.txt
deleted file mode 100644
index e839831f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/output/p.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/p.txt
deleted file mode 100644
index f74c1cb2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/output/pc-.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/pc-.txt
deleted file mode 100644
index 63ed3d2c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/output/replace.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/replace.txt
deleted file mode 100644
index 6addb57b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/replace.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Parsing: input/I-3310.c as language C
-Parsing: input/backup.h as language C-Header
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/tracking_space.html b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/tracking_space.html
deleted file mode 100644
index b0098a0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/output/truncate.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/truncate.txt
deleted file mode 100644
index 8c428d84..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/output/universalindent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/universalindent.cfg
deleted file mode 100644
index bdf8aaba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/universalindent.cfg
+++ /dev/null
@@ -1,7018 +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 '*', as in 'int ***a;'.</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 After Ptr Star Trailing]
-Category=1
-Description="<html>Add or remove space after a pointer star '*' in the trailing return of a<br/>function prototype or function definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_ptr_star_trailing=ignore|sp_after_ptr_star_trailing=add|sp_after_ptr_star_trailing=remove|sp_after_ptr_star_trailing=force|sp_after_ptr_star_trailing=not_defined
-ChoicesReadable="Ignore Sp After Ptr Star Trailing|Add Sp After Ptr Star Trailing|Remove Sp After Ptr Star Trailing|Force Sp After Ptr Star Trailing"
-ValueDefault=ignore
-
-[Sp Ptr Star Func Var]
-Category=1
-Description="<html>Add or remove space between the pointer star '*' and the name of the variable<br/>in a function pointer definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_ptr_star_func_var=ignore|sp_ptr_star_func_var=add|sp_ptr_star_func_var=remove|sp_ptr_star_func_var=force|sp_ptr_star_func_var=not_defined
-ChoicesReadable="Ignore Sp Ptr Star Func Var|Add Sp Ptr Star Func Var|Remove Sp Ptr Star Func Var|Force Sp Ptr Star Func Var"
-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 Ptr Star Trailing]
-Category=1
-Description="<html>Add or remove space before a pointer star '*' in the trailing return of a<br/>function prototype or function definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_ptr_star_trailing=ignore|sp_before_ptr_star_trailing=add|sp_before_ptr_star_trailing=remove|sp_before_ptr_star_trailing=force|sp_before_ptr_star_trailing=not_defined
-ChoicesReadable="Ignore Sp Before Ptr Star Trailing|Add Sp Before Ptr Star Trailing|Remove Sp Before Ptr Star Trailing|Force Sp Before Ptr Star Trailing"
-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 other than<br/>'for'.</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 other than 'for'.<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 other than 'for'.<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 Inside For]
-Category=1
-Description="<html>Add or remove space inside '(' and ')' of 'for' statements.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_for=ignore|sp_inside_for=add|sp_inside_for=remove|sp_inside_for=force|sp_inside_for=not_defined
-ChoicesReadable="Ignore Sp Inside For|Add Sp Inside For|Remove Sp Inside For|Force Sp Inside For"
-ValueDefault=ignore
-
-[Sp Inside For Open]
-Category=1
-Description="<html>Add or remove space after '(' of 'for' statements.<br/><br/>Overrides sp_inside_for.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_for_open=ignore|sp_inside_for_open=add|sp_inside_for_open=remove|sp_inside_for_open=force|sp_inside_for_open=not_defined
-ChoicesReadable="Ignore Sp Inside For Open|Add Sp Inside For Open|Remove Sp Inside For Open|Force Sp Inside For Open"
-ValueDefault=ignore
-
-[Sp Inside For Close]
-Category=1
-Description="<html>Add or remove space before ')' of 'for' statements.<br/><br/>Overrides sp_inside_for.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_for_close=ignore|sp_inside_for_close=add|sp_inside_for_close=remove|sp_inside_for_close=force|sp_inside_for_close=not_defined
-ChoicesReadable="Ignore Sp Inside For Close|Add Sp Inside For Close|Remove Sp Inside For Close|Force Sp Inside For Close"
-ValueDefault=ignore
-
-[Sp Sparen Paren]
-Category=1
-Description="<html>Add or remove space between '((' or '))' of control statements.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_sparen_paren=ignore|sp_sparen_paren=add|sp_sparen_paren=remove|sp_sparen_paren=force|sp_sparen_paren=not_defined
-ChoicesReadable="Ignore Sp Sparen Paren|Add Sp Sparen Paren|Remove Sp Sparen Paren|Force Sp Sparen Paren"
-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 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 left part of a for<br/>statement, as in 'for ( &lt;here&gt; ; ; )'.</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 Between Semi For Empty]
-Category=1
-Description="<html>Add or remove space between the semicolons of an empty middle part of a for<br/>statement, as in 'for ( ; &lt;here&gt; ; )'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_between_semi_for_empty=ignore|sp_between_semi_for_empty=add|sp_between_semi_for_empty=remove|sp_between_semi_for_empty=force|sp_between_semi_for_empty=not_defined
-ChoicesReadable="Ignore Sp Between Semi For Empty|Add Sp Between Semi For Empty|Remove Sp Between Semi For Empty|Force Sp Between 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 ',', i.e. 'a,b' vs. 'a ,b'.<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 After Ellipsis]
-Category=1
-Description="<html>Add or remove space after the variadic '...' when preceded by a<br/>non-punctuator.<br/>The value REMOVE will be overriden with FORCE</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_ellipsis=ignore|sp_after_ellipsis=add|sp_after_ellipsis=remove|sp_after_ellipsis=force|sp_after_ellipsis=not_defined
-ChoicesReadable="Ignore Sp After Ellipsis|Add Sp After Ellipsis|Remove Sp After Ellipsis|Force Sp After Ellipsis"
-ValueDefault=ignore
-
-[Sp Before Ellipsis]
-Category=1
-Description="<html>Add or remove space before the variadic '...' when preceded by a<br/>non-punctuator.<br/>The value REMOVE will be overriden with FORCE</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 Ptr Type Ellipsis]
-Category=1
-Description="<html>Add or remove space between a '*' and '...'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_ptr_type_ellipsis=ignore|sp_ptr_type_ellipsis=add|sp_ptr_type_ellipsis=remove|sp_ptr_type_ellipsis=force|sp_ptr_type_ellipsis=not_defined
-ChoicesReadable="Ignore Sp Ptr Type Ellipsis|Add Sp Ptr Type Ellipsis|Remove Sp Ptr Type Ellipsis|Force Sp Ptr 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 Byref Ellipsis]
-Category=1
-Description="<html>Add or remove space between '&amp;&amp;' and '...'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_byref_ellipsis=ignore|sp_byref_ellipsis=add|sp_byref_ellipsis=remove|sp_byref_ellipsis=force|sp_byref_ellipsis=not_defined
-ChoicesReadable="Ignore Sp Byref Ellipsis|Add Sp Byref Ellipsis|Remove Sp Byref Ellipsis|Force Sp Byref 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 ':'.<br/><br/>Default: add</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=add
-
-[Sp Before Constr Colon]
-Category=1
-Description="<html>Add or remove space before class constructor ':'.<br/><br/>Default: add</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=add
-
-[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 Ellipsis Parameter Pack]
-Category=1
-Description="<html>Add or remove space between '...' and a parameter pack.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_ellipsis_parameter_pack=ignore|sp_ellipsis_parameter_pack=add|sp_ellipsis_parameter_pack=remove|sp_ellipsis_parameter_pack=force|sp_ellipsis_parameter_pack=not_defined
-ChoicesReadable="Ignore Sp Ellipsis Parameter Pack|Add Sp Ellipsis Parameter Pack|Remove Sp Ellipsis Parameter Pack|Force Sp Ellipsis Parameter Pack"
-ValueDefault=ignore
-
-[Sp Parameter Pack Ellipsis]
-Category=1
-Description="<html>Add or remove space between a parameter pack and '...'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_parameter_pack_ellipsis=ignore|sp_parameter_pack_ellipsis=add|sp_parameter_pack_ellipsis=remove|sp_parameter_pack_ellipsis=force|sp_parameter_pack_ellipsis=not_defined
-ChoicesReadable="Ignore Sp Parameter Pack Ellipsis|Add Sp Parameter Pack Ellipsis|Remove Sp Parameter Pack Ellipsis|Force Sp Parameter Pack Ellipsis"
-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<br/>if statement is a brace_init_lst<br/>works only if sp_brace_brace is set to ignore.</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<br/>if statement is a brace_init_lst<br/>works only if sp_brace_brace is set to ignore.</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<br/>if statement is a brace_init_lst<br/>works only if sp_brace_brace is set to ignore<br/>works only if sp_before_type_brace_init_lst_close is set to ignore.</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]
-Category=1
-Description="<html>Add or remove space after 'return'.<br/><br/>Default: force</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_return=ignore|sp_return=add|sp_return=remove|sp_return=force|sp_return=not_defined
-ChoicesReadable="Ignore Sp Return|Add Sp Return|Remove Sp Return|Force Sp Return"
-ValueDefault=force
-
-[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 Cmt]
-Category=1
-Description="<html>Add or remove space before a trailing comment.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_tr_cmt=ignore|sp_before_tr_cmt=add|sp_before_tr_cmt=remove|sp_before_tr_cmt=force|sp_before_tr_cmt=not_defined
-ChoicesReadable="Ignore Sp Before Tr Cmt|Add Sp Before Tr Cmt|Remove Sp Before Tr Cmt|Force Sp Before Tr Cmt"
-ValueDefault=ignore
-
-[Sp Num Before Tr Cmt]
-Category=1
-Description="<html>Number of spaces before a trailing comment.</html>"
-Enabled=false
-EditorType=numeric
-CallName="sp_num_before_tr_cmt="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Sp Before Emb Cmt]
-Category=1
-Description="<html>Add or remove space before an embedded comment.<br/><br/>Default: force</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_emb_cmt=ignore|sp_before_emb_cmt=add|sp_before_emb_cmt=remove|sp_before_emb_cmt=force|sp_before_emb_cmt=not_defined
-ChoicesReadable="Ignore Sp Before Emb Cmt|Add Sp Before Emb Cmt|Remove Sp Before Emb Cmt|Force Sp Before Emb Cmt"
-ValueDefault=force
-
-[Sp Num Before Emb Cmt]
-Category=1
-Description="<html>Number of spaces before an embedded comment.<br/><br/>Default: 1</html>"
-Enabled=false
-EditorType=numeric
-CallName="sp_num_before_emb_cmt="
-MinVal=0
-MaxVal=16
-ValueDefault=1
-
-[Sp After Emb Cmt]
-Category=1
-Description="<html>Add or remove space after an embedded comment.<br/><br/>Default: force</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_emb_cmt=ignore|sp_after_emb_cmt=add|sp_after_emb_cmt=remove|sp_after_emb_cmt=force|sp_after_emb_cmt=not_defined
-ChoicesReadable="Ignore Sp After Emb Cmt|Add Sp After Emb Cmt|Remove Sp After Emb Cmt|Force Sp After Emb Cmt"
-ValueDefault=force
-
-[Sp Num After Emb Cmt]
-Category=1
-Description="<html>Number of spaces after an embedded comment.<br/><br/>Default: 1</html>"
-Enabled=false
-EditorType=numeric
-CallName="sp_num_after_emb_cmt="
-MinVal=0
-MaxVal=16
-ValueDefault=1
-
-[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 leading 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 Following]
-Category=2
-Description="<html>Virtual indent from the ':' for following member initializers.<br/><br/>Default: 2</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_ctor_init_following="
-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 Single Line Comments Before]
-Category=2
-Description="<html>Spaces to indent single line ('//') comments on lines before code.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_single_line_comments_before="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Single Line Comments After]
-Category=2
-Description="<html>Spaces to indent single line ('//') comments on lines after code.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_single_line_comments_after="
-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 be 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 Switch Body]
-Category=2
-Description="<html>Spaces to indent the body of a 'switch' before any 'case'.<br/>Usually the same as indent_columns or indent_switch_case.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_switch_body="
-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 be 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 Case Comment]
-Category=2
-Description="<html>Whether to align comments before 'case' with the 'case'.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_case_comment=true|indent_case_comment=false
-ValueDefault=true
-
-[Indent Comment]
-Category=2
-Description="<html>Whether to indent comments not found in first column.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_comment=true|indent_comment=false
-ValueDefault=true
-
-[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 Comment Align Thresh]
-Category=2
-Description="<html>Align comments on adjacent lines that are this many columns apart or less.<br/><br/>Default: 3</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_comment_align_thresh="
-MinVal=0
-MaxVal=16
-ValueDefault=3
-
-[Indent Ignore Label]
-Category=2
-Description="<html>Whether to ignore indent for goto labels.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_ignore_label=true|indent_ignore_label=false
-ValueDefault=false
-
-[Indent Label]
-Category=2
-Description="<html>How to indent goto labels. Requires indent_ignore_label=false.<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 Before Brace Open]
-Category=3
-Description="<html>Whether to add a newline before '{'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_before_brace_open=true|nl_before_brace_open=false
-ValueDefault=false
-
-[Nl After Brace Open]
-Category=3
-Description="<html>Whether to add a newline after '{'.</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 Ignore After Case]
-Category=3
-Description="<html>Ignore nl_before_{if,for,switch,do,synchronized} if the control<br/>statement is immediately after a case statement.<br/>if nl_before_{if,for,switch,do} is set to remove, this option<br/>does nothing.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_before_ignore_after_case=true|nl_before_ignore_after_case=false
-ValueDefault=false
-
-[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. If true, it also preserves one-liner namespaces.</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 list definitions 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 Before Struct]
-Category=4
-Description="<html>The number of newlines before a struct definition.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_struct="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[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 Star Style]
-Category=7
-Description="<html>How to consider (or treat) the '*' in the alignment of function prototypes.<br/><br/>0: Part of the type     'void *   foo();' (default)<br/>1: Part of the function '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_func_proto_star_style="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Func Proto Amp Style]
-Category=7
-Description="<html>How to consider (or treat) the '&amp;' in the alignment of function prototypes.<br/><br/>0: Part of the type     'long &amp;   foo();' (default)<br/>1: Part of the function '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_func_proto_amp_style="
-MinVal=0
-MaxVal=2
-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 Trailing Single Line C To Cpp]
-Category=8
-Description="<html>Whether to change trailing, single-line c-comments into cpp-comments.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_trailing_single_line_c_to_cpp=true|cmt_trailing_single_line_c_to_cpp=false
-ValueDefault=false
-
-[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 Remove Duplicate Include]
-Category=9
-Description="<html>Whether to remove duplicate include.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_remove_duplicate_include=true|mod_remove_duplicate_include=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 Indent In Guard]
-Category=10
-Description="<html>Whether to indent the body of an #if that encompasses all the code in the file.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_indent_in_guard=true|pp_indent_in_guard=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 Include At Level]
-Category=10
-Description="<html>Whether to indent '#include' at the brace level.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_include_at_level=true|pp_include_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.74.0/tests/cli/output/unmatched_close_pp.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/unmatched_close_pp.txt
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/unmatched_close_pp.txt
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/v-out.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/v-out.txt
deleted file mode 100644
index 129af768..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/v-out.txt
+++ /dev/null
@@ -1 +0,0 @@
-Uncrustify
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/xyz-err.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/xyz-err.txt
deleted file mode 100644
index a16550ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/test_cli_options.py b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/test_cli_options.py
deleted file mode 100755
index 69c1c620..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/test_cli_options.py
+++ /dev/null
@@ -1,853 +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 makedirs, 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
-from datetime import date
-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)
-    makedirs(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)')
-    parser.add_argument('--test',
-                        default=s_path_join(script_dir, '../../build/tests/cli'),
-                        help='specify the location of the test cli build folder')
-
-    parsed_args = parser.parse_args()
-
-    # find the uncrustify binary
-    bin_found = False
-    uncr_bin = ''
-    bd_dir = parsed_args.build
-    test_dir = parsed_args.test
-
-    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(test_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(test_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(test_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(test_dir, 'results/v-out.txt'),
-            out_result_manip=reg_replace(r'Uncrustify.+', 'Uncrustify')
-            ):
-        return_flag = False
-
-    # temporary removed
-    ##
-    ## 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(test_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(test_dir, 'results/truncate.txt'),
-            err_result_manip=[reg_replace(r'\([0-9]+\)', ' '),
-                              reg_replace(RE_DO_SPACE, '')]
-            ):
-        return_flag = False
-
-    # temporary removed
-    ##
-    ## 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(test_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(test_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(test_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(test_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(test_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(test_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(test_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(test_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(test_dir, 'results/p.txt')],
-                gen_expected_path=s_path_join(script_dir, 'output/p.txt'),
-                gen_result_path=s_path_join(test_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(test_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(test_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(test_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(test_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(test_dir, 'results/class_enum_struct_union.csv'),
-            ):
-        return_flag = False
-
-    #
-    # Test --tracking_space FILE
-    #
-    if parsed_args.config == 'Debug':
-        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(test_dir, 'results/Debug_tracking_space.html')],
-                gen_expected_path=s_path_join(script_dir, 'output/Debug_tracking_space.html'),
-                gen_result_path=s_path_join(test_dir, 'results/Debug_tracking_space.html'),
-                ):
-            return_flag = False
-    else:
-        eprint(parsed_args.config)
-        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(test_dir, 'results/tracking_space.html')],
-                gen_expected_path=s_path_join(script_dir, 'output/tracking_space.html'),
-                gen_result_path=s_path_join(test_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', '--no-backup'],
-            gen_expected_path=s_path_join(script_dir, 'output/backup.h'),
-            gen_result_path=s_path_join(script_dir, 'input/backup.h'),
-            err_expected_path=s_path_join(script_dir, 'output/replace.txt'),
-            err_result_path=s_path_join(test_dir, 'results/replace.txt'),
-            ):
-        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(test_dir, 'results/universalindent.cfg'),
-                      '--universalindent'],
-            gen_expected_path=s_path_join(script_dir, 'output/universalindent.cfg'),
-            gen_result_path=s_path_join(test_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(test_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(test_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(test_dir, 'results/%s.txt' % test)
-                ):
-            return_flag = False
-
-    # Test $(year) keyword (issue #3251)
-    if not check_uncrustify_output(
-            uncr_bin,
-            parsed_args,
-            args_arr=['-c', s_path_join(script_dir, 'config/copyright-header.cfg'),
-                      '-f', s_path_join(script_dir, 'input/testSrc.cpp')],
-            out_expected_path=s_path_join(script_dir, 'output/copyright-header.cpp'),
-            out_result_path=s_path_join(test_dir, 'results/copyright-header.cpp'),
-            out_result_manip=string_replace(str(date.today().year), 'this year'),
-            ):
-        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.74.0/tests/config/c/1225.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/1225.cfg
deleted file mode 100644
index cbc83adb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/1liner-no-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/1liner-no-split.cfg
deleted file mode 100644
index 84eba64d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/1liner-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/1liner-split.cfg
deleted file mode 100644
index e666ea24..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/Issue-2278.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue-2278.cfg
deleted file mode 100644
index 80ba4f6f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/Issue_2279.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_2279.cfg
deleted file mode 100644
index 1f646668..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/Issue_2360-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_2360-a.cfg
deleted file mode 100644
index 85052020..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/Issue_2360-b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_2360-b.cfg
deleted file mode 100644
index b61841cc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/Issue_2411.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_2411.cfg
deleted file mode 100644
index a4770ec9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/Issue_2640.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_2640.cfg
deleted file mode 100644
index a4dd2354..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_2640.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_ptr_star = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3169.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3169.cfg
deleted file mode 100644
index 9feaa3d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3169.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_pp_concat       = ignore
-indent_columns     = 2
-align_var_def_span = 1
-align_nl_cont      = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3233.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3233.cfg
deleted file mode 100644
index 71ee918b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3233.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_arith          = force
-sp_after_ptr_star = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3269.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3269.cfg
deleted file mode 100644
index 3a4bb6bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3269.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_inside_sparen = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3272.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3272.cfg
deleted file mode 100644
index 2cda9402..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3272.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_cmt_cpp_start = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3274.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3274.cfg
deleted file mode 100644
index 63aa1d0c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3274.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_func_decl_args_multi_line = true
-nl_func_leave_one_liners = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3327.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3327.cfg
deleted file mode 100644
index 1470c6b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3327.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-pp_define_at_level = true
-pp_if_indent_code  = true
-pp_indent_at_level = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3350.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3350.cfg
deleted file mode 100644
index d53c8094..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3350.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_comment   = false
-cmt_indent_multi = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3351.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3351.cfg
deleted file mode 100644
index 67df4d20..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3351.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-mod_full_brace_while       = force
-nl_while_brace             = force
-mod_remove_extra_semicolon = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3356.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3356.cfg
deleted file mode 100644
index 2791f6c6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3356.cfg
+++ /dev/null
@@ -1 +0,0 @@
-code_width = 80
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3370.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3370.cfg
deleted file mode 100644
index 05f38590..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3370.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_col1_comment = true
-pp_if_indent_code = true
-pp_indent_at_level = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3377.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3377.cfg
deleted file mode 100644
index ca7a07db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3377.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_inside_sparen = add
-sp_inside_for = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/add_long_closebrace_comment_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/add_long_closebrace_comment_1.cfg
deleted file mode 100644
index b8190eb1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/align-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align-2.cfg
deleted file mode 100644
index ea78a8d4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/align-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align-3.cfg
deleted file mode 100644
index 1b46c840..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/align_attr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_attr.cfg
deleted file mode 100644
index 3249cd7b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/align_func_proto_star_amp-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-1.cfg
deleted file mode 100644
index 83874b8b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-1.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-align_var_def_span          = 1
-align_var_def_star_style    = 0
-align_func_proto_span       = 1
-align_func_proto_star_style = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-2.cfg
deleted file mode 100644
index 3afaa70a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-2.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-align_var_def_span          = 1
-align_var_def_star_style    = 0
-align_func_proto_span       = 1
-align_func_proto_star_style = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-3.cfg
deleted file mode 100644
index 1b1e7541..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-3.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-align_var_def_span          = 1
-align_var_def_star_style    = 0
-align_func_proto_span       = 1
-align_func_proto_star_style = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-4.cfg
deleted file mode 100644
index 391526e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-4.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-align_var_def_span          = 1
-align_var_def_star_style    = 1
-align_func_proto_span       = 1
-align_func_proto_star_style = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-5.cfg
deleted file mode 100644
index 7fd9cd6c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-5.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-align_var_def_span          = 1
-align_var_def_star_style    = 1
-align_func_proto_span       = 1
-align_func_proto_star_style = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-6.cfg
deleted file mode 100644
index 00d18433..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-6.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-align_var_def_span          = 1
-align_var_def_star_style    = 1
-align_func_proto_span       = 1
-align_func_proto_star_style = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-7.cfg
deleted file mode 100644
index 64af8258..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-7.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-align_var_def_span          = 1
-align_var_def_star_style    = 2
-align_func_proto_span       = 1
-align_func_proto_star_style = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-8.cfg
deleted file mode 100644
index 4531b895..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-8.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-align_var_def_span          = 1
-align_var_def_star_style    = 2
-align_func_proto_span       = 1
-align_func_proto_star_style = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-9.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-9.cfg
deleted file mode 100644
index 2b2b6b02..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-9.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-align_var_def_span          = 1
-align_var_def_star_style    = 2
-align_func_proto_span       = 1
-align_func_proto_star_style = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_keep_extra.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_keep_extra.cfg
deleted file mode 100644
index fcaab9f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/align_right_cmt_gap-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_right_cmt_gap-1.cfg
deleted file mode 100644
index 46aaf838..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/align_sf_call_span_418.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_sf_call_span_418.cfg
deleted file mode 100644
index cdf7f052..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/align_sf_call_span_419.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_sf_call_span_419.cfg
deleted file mode 100644
index a11c2102..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/align_sf_call_thresh_416.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_sf_call_thresh_416.cfg
deleted file mode 100644
index 6280b856..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/align_sf_call_thresh_417.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_sf_call_thresh_417.cfg
deleted file mode 100644
index 9d09abb2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/align_stack.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_stack.cfg
deleted file mode 100644
index d53a6bb3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/align_typedef_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_typedef_func-1.cfg
deleted file mode 100644
index ea45e4d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/align_typedef_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_typedef_func-2.cfg
deleted file mode 100644
index 252f07ea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/align_typedef_gap-3_span-5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_typedef_gap-3_span-5.cfg
deleted file mode 100644
index 338f078f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_047.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_047.cfg
deleted file mode 100644
index 2af44bb3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_047.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns       = 3
-align_right_cmt_span = 3
-sp_endif_cmt         = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_048.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_048.cfg
deleted file mode 100644
index 81d0ba54..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_049.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_049.cfg
deleted file mode 100644
index b8e6f708..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_050.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_050.cfg
deleted file mode 100644
index 0f0e30ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_051.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_051.cfg
deleted file mode 100644
index 786fb030..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_052.cfg
deleted file mode 100644
index ba150be7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_053.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_053.cfg
deleted file mode 100644
index 7cf1c682..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_054.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_054.cfg
deleted file mode 100644
index 56661763..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_055.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_055.cfg
deleted file mode 100644
index f050b219..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_056.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_056.cfg
deleted file mode 100644
index 43e9f6cc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_057.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_057.cfg
deleted file mode 100644
index fbf24d72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_058.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_058.cfg
deleted file mode 100644
index 7c908d56..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_058.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_inside_paren                 = remove
-sp_before_sparen                = force
-sp_return_paren                 = remove
-indent_columns                  = 3
-indent_switch_body              = 3
-nl_switch_brace                 = add
-eat_blanks_before_close_brace   = true
-align_nl_cont                   = true
-mod_paren_on_return             = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_061.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_061.cfg
deleted file mode 100644
index 89f76fae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_063.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_063.cfg
deleted file mode 100644
index 3c5e88f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_064.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_064.cfg
deleted file mode 100644
index f56efbdf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_065.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_065.cfg
deleted file mode 100644
index 21d55b16..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_069.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_069.cfg
deleted file mode 100644
index d42173e1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_070.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_070.cfg
deleted file mode 100644
index f304ca8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_071.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_071.cfg
deleted file mode 100644
index 869f2a94..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_072.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_072.cfg
deleted file mode 100644
index 973d8c6c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_073.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_073.cfg
deleted file mode 100644
index 49f69643..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_074.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_074.cfg
deleted file mode 100644
index 31a1de44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_074.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_before_ptr_star     = force
-sp_after_ptr_star      = remove
-sp_after_ptr_star_func = remove
-indent_columns         = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_075.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_075.cfg
deleted file mode 100644
index 9eca8a9b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_076.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_076.cfg
deleted file mode 100644
index fb27ba74..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_077.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_077.cfg
deleted file mode 100644
index 4e9760f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_078.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_078.cfg
deleted file mode 100644
index 54fcc628..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_079.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_079.cfg
deleted file mode 100644
index 77a732e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_080.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_080.cfg
deleted file mode 100644
index 45e16a8d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_081.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_081.cfg
deleted file mode 100644
index dc15820d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_083.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_083.cfg
deleted file mode 100644
index 2ccee465..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_084.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_084.cfg
deleted file mode 100644
index bbb0e675..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_085.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_085.cfg
deleted file mode 100644
index b02673d7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_086.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_086.cfg
deleted file mode 100644
index 7ffcd831..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_086.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-sp_compare                      = force
-sp_inside_paren                 = remove
-sp_before_sparen                = force
-sp_inside_sparen                = remove
-sp_before_semi_for_empty        = force
-sp_between_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.74.0/tests/config/c/ben_087.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_087.cfg
deleted file mode 100644
index 2184c985..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_087.cfg
+++ /dev/null
@@ -1,37 +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_after_ptr_star_func          = 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.74.0/tests/config/c/ben_088.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_088.cfg
deleted file mode 100644
index 19cc7dc4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_089.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_089.cfg
deleted file mode 100644
index d3c152df..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_090.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_090.cfg
deleted file mode 100644
index eba1ab79..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_091.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_091.cfg
deleted file mode 100644
index aec90af1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_092.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_092.cfg
deleted file mode 100644
index bb993d75..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_093.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_093.cfg
deleted file mode 100644
index 4e50b52b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_094.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_094.cfg
deleted file mode 100644
index 9ab0c51f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ben_095.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_095.cfg
deleted file mode 100644
index edb10a4f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/bool-pos-eol-break.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bool-pos-eol-break.cfg
deleted file mode 100644
index d2abdeb6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/bool-pos-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bool-pos-eol.cfg
deleted file mode 100644
index f7fe1330..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/bool-pos-sol-break.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bool-pos-sol-break.cfg
deleted file mode 100644
index e07ab7e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/bool-pos-sol-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bool-pos-sol-force.cfg
deleted file mode 100644
index 36f81a26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/bool-pos-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bool-pos-sol.cfg
deleted file mode 100644
index 9dbcbaf2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/brace-banner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-banner.cfg
deleted file mode 100644
index 2fc753a6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/brace-banner.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-banner.rerun.cfg
deleted file mode 100644
index df289545..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/brace-gnu.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-gnu.cfg
deleted file mode 100644
index c5bd1371..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/brace-kr-br.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-kr-br.cfg
deleted file mode 100644
index 59bc4084..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/brace-kr-nobr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-kr-nobr.cfg
deleted file mode 100644
index 970b1ab0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/brace-kr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-kr.cfg
deleted file mode 100644
index 7ef5aa16..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/brace-remove-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-remove-2.cfg
deleted file mode 100644
index 9aa693fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/brace-remove-all.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-remove-all.cfg
deleted file mode 100644
index ca279abd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/brace-ws.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-ws.cfg
deleted file mode 100644
index 76d8908a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/brace-ws2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-ws2.cfg
deleted file mode 100644
index 55eb6ece..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/bug_1702.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_1702.cfg
deleted file mode 100644
index 1c415eec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/bug_1718.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_1718.cfg
deleted file mode 100644
index e55de095..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_1718.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_switch_pp = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_2331.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_2331.cfg
deleted file mode 100644
index 4a4af2f3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/bug_489.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_489.cfg
deleted file mode 100644
index 61d4693c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/bug_i_771.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_i_771.cfg
deleted file mode 100644
index 69b6e1a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/case-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/case-1.cfg
deleted file mode 100644
index 7c65a819..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/case-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/case-2.cfg
deleted file mode 100644
index 07c0566d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/case-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/case-3.cfg
deleted file mode 100644
index 74f16293..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/cast-sp-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cast-sp-a.cfg
deleted file mode 100644
index 488198a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/cast-sp-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cast-sp-r.cfg
deleted file mode 100644
index 1d0138a2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/cast-type.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cast-type.cfg
deleted file mode 100644
index 5900ffd5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/cgal.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cgal.cfg
deleted file mode 100644
index a4ec1fa0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/clang-has_include.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/clang-has_include.cfg
deleted file mode 100644
index 35d668f3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/cmt_indent_multi-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cmt_indent_multi-f.cfg
deleted file mode 100644
index 1bd265a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/cmt_multi_check_last-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cmt_multi_check_last-f.cfg
deleted file mode 100644
index 7fdebde0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/cmt_nl_end.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cmt_nl_end.cfg
deleted file mode 100644
index 1c0b396a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/cmt_reflow.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cmt_reflow.cfg
deleted file mode 100644
index 9b280d18..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/code_width-80.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/code_width-80.cfg
deleted file mode 100644
index 4bdb0ce7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/cond-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cond-1.cfg
deleted file mode 100644
index 61669da9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/cpp_to_c-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cpp_to_c-1.cfg
deleted file mode 100644
index 83e3aa7c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/cpp_to_c-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cpp_to_c-2.cfg
deleted file mode 100644
index 9f0d9e3a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/cpp_to_c-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cpp_to_c-3.cfg
deleted file mode 100644
index 20bbb9e1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/custom_types_ssl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/custom_types_ssl.cfg
deleted file mode 100644
index 4005234e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/doxy-comment-no.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/doxy-comment-no.cfg
deleted file mode 100644
index bd2bd258..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/doxy-comment-yes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/doxy-comment-yes.cfg
deleted file mode 100644
index 74043b68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/else-if-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/else-if-1.cfg
deleted file mode 100644
index b4e4aecb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/else-if-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/else-if-2.cfg
deleted file mode 100644
index 75d7936e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/empty_body.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/empty_body.cfg
deleted file mode 100644
index 4563a84f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/empty_body.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_arith               = force
-sp_before_ptr_star     = remove
-sp_after_ptr_star      = force
-sp_after_ptr_star_func = force
-indent_columns         = 4
-nl_collapse_empty_body = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/endif.cfg
deleted file mode 100644
index ff69251b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/enum_comma_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/enum_comma_ifdef.cfg
deleted file mode 100644
index a2622767..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/enum_comma_ifdef.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-mod_enum_last_comma = force
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/force_tab_after_define-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/force_tab_after_define-t.cfg
deleted file mode 100644
index 67b04e78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/freebsd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/freebsd.cfg
deleted file mode 100644
index 725b00b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/freebsd.cfg
+++ /dev/null
@@ -1,27 +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_between_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.74.0/tests/config/c/func_call_user.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/func_call_user.cfg
deleted file mode 100644
index 504fb3d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/ger.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ger.cfg
deleted file mode 100644
index 976c0c35..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/i1564.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/i1564.cfg
deleted file mode 100644
index 74c53e52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/if_chain.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/if_chain.cfg
deleted file mode 100644
index b59d69f8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent-1.cfg
deleted file mode 100644
index 943d0eb6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/indent-vbrace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent-vbrace.cfg
deleted file mode 100644
index 7e6ca7c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/indent_assign.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_assign.cfg
deleted file mode 100644
index 6bad61f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/indent_case_comment-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_case_comment-false.cfg
deleted file mode 100644
index 15e0e2e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_case_comment-false.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-# test for issue #3362
-indent_case_comment = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_case_comment-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_case_comment-true.cfg
deleted file mode 100644
index abcadd59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_case_comment-true.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-# test for issue #3362
-indent_case_comment = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_comment_align_thresh-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_comment_align_thresh-0.cfg
deleted file mode 100644
index dc730bf8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_comment_align_thresh-0.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_comment_align_thresh = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_compound_literal_return-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_compound_literal_return-false.cfg
deleted file mode 100644
index b686aabe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/indent_compound_literal_return-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_compound_literal_return-true.cfg
deleted file mode 100644
index 9fa1d2ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/indent_func_call_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_func_call_param.cfg
deleted file mode 100644
index 26b4e03a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/indent_func_def_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_func_def_param.cfg
deleted file mode 100644
index c448b21f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/indent_func_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_func_param.cfg
deleted file mode 100644
index 7db464b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/indent_func_proto_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_func_proto_param.cfg
deleted file mode 100644
index 6cfb83ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/indent_macro_brace-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_macro_brace-false.cfg
deleted file mode 100644
index f9e3bdca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_macro_brace-false.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_macro_brace = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_macro_brace-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_macro_brace-true.cfg
deleted file mode 100644
index 62573cad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_macro_brace-true.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_macro_brace = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_paren_close-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_paren_close-1.cfg
deleted file mode 100644
index 309be3e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/indent_paren_close-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_paren_close-2.cfg
deleted file mode 100644
index 2a77fedf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/indent_single_line_comments_after.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_single_line_comments_after.cfg
deleted file mode 100644
index bae9787c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_single_line_comments_after.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# test for issue #3249
-indent_columns = 4
-indent_single_line_comments_after = 4
-indent_with_tabs = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_sparen_extra-8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_sparen_extra-8.cfg
deleted file mode 100644
index 6344ceb2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/indent_ternary_operator-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_ternary_operator-1.cfg
deleted file mode 100644
index 80ea4e7a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/indent_ternary_operator-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_ternary_operator-2.cfg
deleted file mode 100644
index 1d5a91ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/issue_527.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/issue_527.cfg
deleted file mode 100644
index 1ab56eb9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/issue_527.cfg
+++ /dev/null
@@ -1,266 +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_single_line_comments_before = 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_between_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.74.0/tests/config/c/label_colon_nl_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/label_colon_nl_1.cfg
deleted file mode 100644
index 5c394f28..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/label_colon_nl_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/label_colon_nl_2.cfg
deleted file mode 100644
index b1fafca7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/leave_one_liners.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/leave_one_liners.cfg
deleted file mode 100644
index 931e9465..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/mod-paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/mod-paren.cfg
deleted file mode 100644
index 2c0049ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/mod-paren2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/mod-paren2.cfg
deleted file mode 100644
index 113ee868..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/mod_case_brace_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/mod_case_brace_add.cfg
deleted file mode 100644
index bfcca51a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/mod_move_case_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/mod_move_case_brace.cfg
deleted file mode 100644
index acb25734..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/my_conf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/my_conf.cfg
deleted file mode 100644
index 6bfddbb5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/nepenthes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nepenthes.cfg
deleted file mode 100644
index 150294da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/newline_after_endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/newline_after_endif.cfg
deleted file mode 100644
index afd7693d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/nl-comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl-comment.cfg
deleted file mode 100644
index c6ef78f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/nl_assign1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_assign1.cfg
deleted file mode 100644
index 1f4da850..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/nl_assign2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_assign2.cfg
deleted file mode 100644
index b4cfb4d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/nl_before_return_false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_before_return_false.cfg
deleted file mode 100644
index 7636745b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_before_return_false.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_before_return = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_before_return_true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_before_return_true.cfg
deleted file mode 100644
index 1e6976fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_before_return_true.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_before_return = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_brace_test.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_brace_test.cfg
deleted file mode 100644
index c9faeb04..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/nl_create_one_liner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_create_one_liner.cfg
deleted file mode 100644
index ec8b120c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/nl_ds_struct_enum-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_ds_struct_enum-2.cfg
deleted file mode 100644
index 01c60de4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/nl_ds_struct_enum_cmt-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_ds_struct_enum_cmt-t.cfg
deleted file mode 100644
index 1864b51d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/nl_endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_endif.cfg
deleted file mode 100644
index b056153e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/nl_enum_own_lines-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_enum_own_lines-3.cfg
deleted file mode 100644
index b6a28869..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/nl_enum_own_lines-3.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_enum_own_lines-3.rerun.cfg
deleted file mode 100644
index f0d3f7b2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/nl_enum_own_lines-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_enum_own_lines-4.cfg
deleted file mode 100644
index 70973ec8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/nl_enum_own_lines-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_enum_own_lines-a.cfg
deleted file mode 100644
index 66e7dbfa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/nl_semicolon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_semicolon.cfg
deleted file mode 100644
index d099e0c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/nl_whole_file_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_whole_file_ifdef.cfg
deleted file mode 100644
index 1d6a585a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/pascal_ptr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pascal_ptr.cfg
deleted file mode 100644
index 1760abca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pascal_ptr.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_arith               = force
-sp_before_ptr_star     = remove
-sp_after_ptr_star      = force
-sp_after_ptr_star_func = force
-indent_columns         = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pos_compare-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pos_compare-eol.cfg
deleted file mode 100644
index 90267209..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/pos_compare-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pos_compare-sol.cfg
deleted file mode 100644
index a4235d7d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/pos_conditional-l.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pos_conditional-l.cfg
deleted file mode 100644
index 11eb46fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/pos_conditional-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pos_conditional-t.cfg
deleted file mode 100644
index 79bb52d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/pp-indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp-indent-2.cfg
deleted file mode 100644
index 64f53643..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/pp-space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp-space.cfg
deleted file mode 100644
index e91685ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/pp_if_indent-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_if_indent-0.cfg
deleted file mode 100644
index 82f11f27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/pp_if_indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_if_indent-1.cfg
deleted file mode 100644
index 7c01e819..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/pp_if_indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_if_indent-2.cfg
deleted file mode 100644
index 6f912806..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/pp_if_indent-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_if_indent-3.cfg
deleted file mode 100644
index 4b876498..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/pp_if_indent-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_if_indent-4.cfg
deleted file mode 100644
index fe29f734..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/pp_include_at_level-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_include_at_level-false.cfg
deleted file mode 100644
index 6f780147..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_include_at_level-false.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# test for issue #3343
-pp_indent_at_level  = true
-pp_if_indent_code   = true
-pp_include_at_level = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_include_at_level-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_include_at_level-true.cfg
deleted file mode 100644
index bc062b9f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_include_at_level-true.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# test for issue #3343
-pp_indent_at_level  = true
-pp_if_indent_code   = true
-pp_include_at_level = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_indent-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_indent-a.cfg
deleted file mode 100644
index f9f9b3b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/pp_indent_in_guard.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_indent_in_guard.cfg
deleted file mode 100644
index 2c4e2545..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_indent_in_guard.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# test for issue #3246
-pp_if_indent_code = true
-pp_indent = add
-pp_indent_count = 8
-pp_indent_in_guard = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_ret.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_ret.cfg
deleted file mode 100644
index b1fb2000..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/preproc-cleanup.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/preproc-cleanup.cfg
deleted file mode 100644
index 73fc557c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/preproc-cleanup.cfg
+++ /dev/null
@@ -1,37 +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_ptr_star_func          = 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.74.0/tests/config/c/ptr-arith.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ptr-arith.cfg
deleted file mode 100644
index ff1949d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ptr-arith.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_arith                    = add
-sp_before_ptr_star          = force
-sp_after_ptr_star           = remove
-sp_after_ptr_star_qualifier = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/rdan.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/rdan.cfg
deleted file mode 100644
index b000b33d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/return-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/return-1.cfg
deleted file mode 100644
index 996ca632..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/return-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/return-2.cfg
deleted file mode 100644
index 87b361d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/return-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/return-3.cfg
deleted file mode 100644
index 9caf1a7e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/return-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/return-4.cfg
deleted file mode 100644
index 9a885287..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/sf537.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sf537.cfg
deleted file mode 100644
index 400c7e0b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/sf538.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sf538.cfg
deleted file mode 100644
index 8c6d149b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/sp_after_pointer_star-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_after_pointer_star-r.cfg
deleted file mode 100644
index 92a637a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_after_pointer_star-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_ptr_star = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_after_sparen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_after_sparen.cfg
deleted file mode 100644
index c9b9afbf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/sp_between_semi_for_empty-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_between_semi_for_empty-i.cfg
deleted file mode 100644
index 146f6d61..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_between_semi_for_empty-i.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# test for issue #3280
-sp_before_semi_for_empty = remove
-sp_between_semi_for_empty = ignore
-sp_after_semi_for_empty = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_between_semi_for_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_between_semi_for_empty-r.cfg
deleted file mode 100644
index 26dcc001..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_between_semi_for_empty-r.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# test for issue #3280
-sp_before_semi_for_empty = add
-sp_between_semi_for_empty = remove
-sp_after_semi_for_empty = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_cmt_cpp_start-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_cmt_cpp_start-r.cfg
deleted file mode 100644
index 13ceebfc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/sp_cond_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_cond_colon.cfg
deleted file mode 100644
index d39afa14..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/sp_emb_cmt-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_emb_cmt-f.cfg
deleted file mode 100644
index 68a83e91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_emb_cmt-f.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_emb_cmt = force
-sp_after_emb_cmt  = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_emb_cmt-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_emb_cmt-i.cfg
deleted file mode 100644
index 04f49ee7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_emb_cmt-i.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_emb_cmt = ignore
-sp_after_emb_cmt  = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_emb_cmt-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_emb_cmt-r.cfg
deleted file mode 100644
index f45d357b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_emb_cmt-r.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_emb_cmt = remove
-sp_after_emb_cmt  = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_func_call_user_inside_fparen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_func_call_user_inside_fparen.cfg
deleted file mode 100644
index e5650760..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/sp_ptr_star_func_var-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-a.cfg
deleted file mode 100644
index a21ed3da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-a.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_ptr_star_func_var = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-f.cfg
deleted file mode 100644
index 9562f157..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_ptr_star_func_var = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-i.cfg
deleted file mode 100644
index e18cc959..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-i.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_ptr_star_func_var = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-r.cfg
deleted file mode 100644
index ec9bf9c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_ptr_star_func_var = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_sparen_paren-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_sparen_paren-a.cfg
deleted file mode 100644
index 0d477f4d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_sparen_paren-a.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-# test for issue #3209
-sp_sparen_paren = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_sparen_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_sparen_paren-i.cfg
deleted file mode 100644
index 750b77ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_sparen_paren-i.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# test for issue #3209
-sp_sparen_paren = ignore
-sp_paren_paren = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/space_indent_columns-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/space_indent_columns-3.cfg
deleted file mode 100644
index ec130371..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/type_wrap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/type_wrap.cfg
deleted file mode 100644
index eeea5786..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/width-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/width-3.cfg
deleted file mode 100644
index 843f6669..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/width.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/width.cfg
deleted file mode 100644
index 10cb731c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/c/xml-str.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/xml-str.cfg
deleted file mode 100644
index bd667ab4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/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.74.0/tests/config/common/UNI-18777.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/UNI-18777.cfg
deleted file mode 100644
index 7d4c013e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/aet-func_call_user.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/aet-func_call_user.cfg
deleted file mode 100644
index 3219bc4b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/aet-func_def.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/aet-func_def.cfg
deleted file mode 100644
index c4575b88..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/aet-sp_after_oc_msg_receiver.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/aet-sp_after_oc_msg_receiver.cfg
deleted file mode 100644
index 8e25aaed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/aet-sp_inside_braces_oc_dict.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/aet-sp_inside_braces_oc_dict.cfg
deleted file mode 100644
index 57e2463e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/aet.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/aet.cfg
deleted file mode 100644
index a5d95a8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/aet.cfg
+++ /dev/null
@@ -1,508 +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_single_line_comments_before                   = 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_between_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_cmt                                     = ignore
-sp_num_before_tr_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.74.0/tests/config/common/align-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/align-1.cfg
deleted file mode 100644
index 720f003e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/align_same_func_call_params-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/align_same_func_call_params-t.cfg
deleted file mode 100644
index d1496108..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/attribute_specifier_seqs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/attribute_specifier_seqs.cfg
deleted file mode 100644
index 8eec117f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/ben2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/ben2.cfg
deleted file mode 100644
index 8398a6b9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/ben2.cfg
+++ /dev/null
@@ -1,45 +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_after_ptr_star_func          = 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.74.0/tests/config/common/ben_011.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/ben_011.cfg
deleted file mode 100644
index 6ade29ad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/ben_042.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/ben_042.cfg
deleted file mode 100644
index c98cdf54..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/bool-pos-eol-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/bool-pos-eol-force.cfg
deleted file mode 100644
index 51044559..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/brace-allman.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/brace-allman.cfg
deleted file mode 100644
index 0e903302..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/bug_671.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/bug_671.cfg
deleted file mode 100644
index 00c0cf36..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/clark.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/clark.cfg
deleted file mode 100644
index 0ca4890e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/clark.cfg
+++ /dev/null
@@ -1,39 +0,0 @@
-input_tab_size                  = 2
-sp_arith                        = add
-sp_assign                       = add
-sp_compare                      = add
-sp_before_sparen                = add
-sp_inside_sparen                = remove
-sp_inside_for                   = remove
-sp_after_comma                  = add
-sp_inside_braces                = force
-sp_cond_colon                   = add
-sp_cond_question                = add
-indent_columns                  = 2
-indent_switch_body              = 2
-indent_with_tabs                = 0
-indent_braces                   = true
-indent_single_line_comments_before = 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.74.0/tests/config/common/clark.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/clark.rerun.cfg
deleted file mode 100644
index 3b33c7d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/clark.rerun.cfg
+++ /dev/null
@@ -1 +0,0 @@
-include "clark.cfg"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/class-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/class-header.h
deleted file mode 100644
index 32e68a34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/class-header.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * CLASS:  $(class)
- * TODO: DESCRIPTION
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/cmt_insert-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/cmt_insert-0.cfg
deleted file mode 100644
index 86d05f95..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/cmt_insert-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/cmt_insert-1.cfg
deleted file mode 100644
index 91dbf03a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/d.cfg
deleted file mode 100644
index d6261dd9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/d.cfg
+++ /dev/null
@@ -1,49 +0,0 @@
-sp_before_semi_for              = remove
-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_after_ptr_star_func          = remove
-sp_before_sparen                = force
-sp_inside_sparen                = remove
-sp_inside_for                   = 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.74.0/tests/config/common/del_semicolon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/del_semicolon.cfg
deleted file mode 100644
index 13434168..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/empty.cfg
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/empty.cfg
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/file-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/file-header.h
deleted file mode 100644
index 63fb5185..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/file-header.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * @file $(filename)
- * Description
- *
- * $Id$
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/file_footer.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/file_footer.txt
deleted file mode 100644
index 7ce80bad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/file_footer.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-/**

- * CVS History:

- * $Log $

- *

- */

-

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

- *                                                                                  

- *  @file        $(filename)

- *                                                                                 

- *  <Description>                        

- *                                                                                 

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

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-def-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-def-1.cfg
deleted file mode 100644
index 14879a94..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/func-def-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-def-2.cfg
deleted file mode 100644
index f9cf836c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/func-def-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-def-3.cfg
deleted file mode 100644
index c868ae02..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/func-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-header.h
deleted file mode 100644
index e6f83943..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-header.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * $(function)
- * TODO: DESCRIPTION
- * $(javaparam)
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-header2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-header2.h
deleted file mode 100644
index 52bdf970..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/function_header.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/function_header.txt
deleted file mode 100644
index c6508a02..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/function_header.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-/***********************************************************************************

- *  $(function) 

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

- *

- *  <Description>       

- *

- *  $(javaparam) 

- *   

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

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/indent_columns-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/indent_columns-3.cfg
deleted file mode 100644
index 9c9e205f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/indent_continue-8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/indent_continue-8.cfg
deleted file mode 100644
index 9bc69559..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/indent_inside_ternary_operator.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/indent_inside_ternary_operator.cfg
deleted file mode 100644
index ad5f98ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/indent_var_def.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/indent_var_def.cfg
deleted file mode 100644
index 2faffc24..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/issue_672.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/issue_672.cfg
deleted file mode 100644
index fb436753..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/kw_subst.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/kw_subst.cfg
deleted file mode 100644
index 163d6f64..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/kw_subst2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/kw_subst2.cfg
deleted file mode 100644
index 7f531264..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/kw_subst3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/kw_subst3.cfg
deleted file mode 100644
index b96dc493..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/kw_subst3.cfg
+++ /dev/null
@@ -1,71 +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
-sp_after_ptr_star_func          = force
-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.74.0/tests/config/common/kw_subst4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/kw_subst4.cfg
deleted file mode 100644
index a269bdf8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/mod_case_brace_rm.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/mod_case_brace_rm.cfg
deleted file mode 100644
index 51252b69..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/mod_full_brace_if_chain_only-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/mod_full_brace_if_chain_only-t.cfg
deleted file mode 100644
index ec61c84b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/mod_paren_on_return-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/mod_paren_on_return-a.cfg
deleted file mode 100644
index 6e5a38ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/mod_paren_on_return-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/mod_paren_on_return-r.cfg
deleted file mode 100644
index fb547f72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/msg-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/msg-header.h
deleted file mode 100644
index 79a0919f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/msg-header.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * $(scope)[$(class)$(category) $(message)]
- *
- * $(javaparam)
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/nl_before_after.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/nl_before_after.cfg
deleted file mode 100644
index b80dafa0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/nl_before_ignore_after_case.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/nl_before_ignore_after_case.cfg
deleted file mode 100644
index 6d1bbb7d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/nl_before_ignore_after_case.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# We need all these on, to check that nl_before_ignore_after_case
-# overrides them after case CASE_LABEL:
-
-nl_before_if = force
-nl_before_for = force
-nl_before_switch = force
-nl_before_do = force
-nl_before_while = force
-nl_before_synchronized = force
-
-nl_before_ignore_after_case  = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/region-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/region-0.cfg
deleted file mode 100644
index a837d86f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/region-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/region-1.cfg
deleted file mode 100644
index 48ae77f3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/region-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/region-2.cfg
deleted file mode 100644
index 5beed445..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/region-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/region-3.cfg
deleted file mode 100644
index 30a01c96..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/sort_imports.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sort_imports.cfg
deleted file mode 100644
index 655a684f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/sp_after_cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_after_cast.cfg
deleted file mode 100644
index c16cc978..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/sp_after_type-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_after_type-f.cfg
deleted file mode 100644
index b7fa74f4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/sp_after_type-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_after_type-r.cfg
deleted file mode 100644
index 78a64119..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/sp_arith-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_arith-f.cfg
deleted file mode 100644
index 6cd2b6b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/sp_before_byref-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_before_byref-r.cfg
deleted file mode 100644
index 2f5d1eff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_before_byref-r.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_byref      = remove
-sp_before_byref_func = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_cmt_cpp_start-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_cmt_cpp_start-a.cfg
deleted file mode 100644
index d7e6adf1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/sp_cmt_cpp_start_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_cmt_cpp_start_force.cfg
deleted file mode 100644
index e87c9b0d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/sp_cparen_oparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_cparen_oparen-f.cfg
deleted file mode 100644
index c2af4d15..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/sp_inside_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_inside_fparen-f.cfg
deleted file mode 100644
index 2b159a36..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_inside_fparen-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_inside_fparen                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/space_indent_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/space_indent_columns-4.cfg
deleted file mode 100644
index f05c685f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/star_pos-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/star_pos-0.cfg
deleted file mode 100644
index 6798b186..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/width-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/width-2.cfg
deleted file mode 100644
index 6c18a158..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/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.74.0/tests/config/common/width-2.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/width-2.rerun.cfg
deleted file mode 100644
index c74e4020..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/width-2.rerun.cfg
+++ /dev/null
@@ -1 +0,0 @@
-include "width-2.cfg"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/2185.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/2185.cfg
deleted file mode 100644
index fda2290c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/2185.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 2
-indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/2203.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/2203.cfg
deleted file mode 100644
index e9c359cf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/623_caret-spacing.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/623_caret-spacing.cfg
deleted file mode 100644
index 4d60daa9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/623_caret-spacing.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_arith = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/633_decl-in-func-typedef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/633_decl-in-func-typedef.cfg
deleted file mode 100644
index 5ca47821..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/DefaultAndDelete-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/DefaultAndDelete-0.cfg
deleted file mode 100644
index 8aef4713..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/DefaultAndDelete-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/DefaultAndDelete-1.cfg
deleted file mode 100644
index f97e0abe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/DefaultAndDelete-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/DefaultAndDelete-2.cfg
deleted file mode 100644
index 6c39bace..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/I1112-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/I1112-2.cfg
deleted file mode 100644
index 6b1bba41..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/I2103.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/I2103.cfg
deleted file mode 100644
index 5c34ca18..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/I2103.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_before_byref = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1052.cfg
deleted file mode 100644
index 91fe8899..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1052.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_create_list_one_liner = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1167.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1167.cfg
deleted file mode 100644
index feb56c83..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_1184.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1184.cfg
deleted file mode 100644
index 0fdd95de..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_1460.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1460.cfg
deleted file mode 100644
index 7adee60a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_1511.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1511.cfg
deleted file mode 100644
index 71c01f4d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_1692.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1692.cfg
deleted file mode 100644
index db3cbdbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_1703.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1703.cfg
deleted file mode 100644
index f8c889ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_1734.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1734.cfg
deleted file mode 100644
index 37a4c192..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1734.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_after_func_body = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1753.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1753.cfg
deleted file mode 100644
index e0e5ab0b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_1813.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1813.cfg
deleted file mode 100644
index ff1ce9d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_1923.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1923.cfg
deleted file mode 100644
index f242e902..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_1966.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1966.cfg
deleted file mode 100644
index be3a873d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2020.cfg
deleted file mode 100644
index 2104e036..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2045.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2045.cfg
deleted file mode 100644
index 3fb7cfe9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2045.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns  = 4
-indent_continue = 8
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2085.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2085.cfg
deleted file mode 100644
index 2df8ebd8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2091.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2091.cfg
deleted file mode 100644
index 898b035b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2101.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2101.cfg
deleted file mode 100644
index 44e5a0e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2149.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2149.cfg
deleted file mode 100644
index 23a8583a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2150.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2150.cfg
deleted file mode 100644
index 5f518291..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2150.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_with_tabs = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2151.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2151.cfg
deleted file mode 100644
index 0660e498..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2151.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_before_unnamed_byref = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2163.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2163.cfg
deleted file mode 100644
index b7c31fe2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2163.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_before_func_body_def = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2166.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2166.cfg
deleted file mode 100644
index 2b473436..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2170.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2170.cfg
deleted file mode 100644
index f66f0022..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2186.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2186.cfg
deleted file mode 100644
index d694b699..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2195.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2195.cfg
deleted file mode 100644
index 0c70840d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2219.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2219.cfg
deleted file mode 100644
index 865142a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2219.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_full_brace_for = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2224.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2224.cfg
deleted file mode 100644
index 8973a14f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2229.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2229.cfg
deleted file mode 100644
index 8527cbb2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2232.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2232.cfg
deleted file mode 100644
index 06730341..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2232.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_full_brace_if = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2236.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2236.cfg
deleted file mode 100644
index 6d30f256..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2250.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2250.cfg
deleted file mode 100644
index 94a8d306..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2281.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2281.cfg
deleted file mode 100644
index 1d8b164e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2302.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2302.cfg
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2302.cfg
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2305.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2305.cfg
deleted file mode 100644
index 7200d9ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2319.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2319.cfg
deleted file mode 100644
index aeb132b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2343.cfg
deleted file mode 100644
index 955a1f9a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/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.74.0/tests/config/cpp/Issue_2345.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2345.cfg
deleted file mode 100644
index 27213b45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2368.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2368.cfg
deleted file mode 100644
index d1496108..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2368.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_same_func_call_params = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2383.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2383.cfg
deleted file mode 100644
index 313d9efb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2386.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2386.cfg
deleted file mode 100644
index 3a121c2e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2428.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2428.cfg
deleted file mode 100644
index 8af28414..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2437.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2437.cfg
deleted file mode 100644
index b21679ce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2440.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2440.cfg
deleted file mode 100644
index 3da56066..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2440.cfg
+++ /dev/null
@@ -1 +0,0 @@
-pp_region_indent_code = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2440_nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2440_nl.cfg
deleted file mode 100644
index 3da56066..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2440_nl.cfg
+++ /dev/null
@@ -1 +0,0 @@
-pp_region_indent_code = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2478.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2478.cfg
deleted file mode 100644
index bb4425d9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2561.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2561.cfg
deleted file mode 100644
index 03a40504..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2570.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2570.cfg
deleted file mode 100644
index 6a9f2d25..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2570.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_remove_extra_semicolon = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2574.cfg
deleted file mode 100644
index d96f0980..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2582.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2582.cfg
deleted file mode 100644
index f634b12e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2591.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2591.cfg
deleted file mode 100644
index 6ca8934c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2594.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2594.cfg
deleted file mode 100644
index 6d847dfc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2596.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2596.cfg
deleted file mode 100644
index b6338859..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2604.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2604.cfg
deleted file mode 100644
index daeb9bc6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2668.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2668.cfg
deleted file mode 100644
index 7649b34c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2668.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_var_def_blk_end = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2688.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2688.cfg
deleted file mode 100644
index 4baf4b3f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2689.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2689.cfg
deleted file mode 100644
index e498e830..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2692.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2692.cfg
deleted file mode 100644
index bce2060e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2692.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_var_def_blk_start = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2703.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2703.cfg
deleted file mode 100644
index 80c42da9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2734.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2734.cfg
deleted file mode 100644
index 83fdd868..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2734.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_balance_nested_parens        = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2735.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2735.cfg
deleted file mode 100644
index 32a72aa2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2742.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2742.cfg
deleted file mode 100644
index eba0468c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2742.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_var_def_span = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2752.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2752.cfg
deleted file mode 100644
index e15e7702..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2752.cfg
+++ /dev/null
@@ -1 +0,0 @@
-cmt_insert_file_footer = "footer.txt"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2757.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2757.cfg
deleted file mode 100644
index e2118df5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2758.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2758.cfg
deleted file mode 100644
index dd2d0f6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2759.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2759.cfg
deleted file mode 100644
index abdc53f4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2771.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2771.cfg
deleted file mode 100644
index b34e82a7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2794.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2794.cfg
deleted file mode 100644
index c193054f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2795.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2795.cfg
deleted file mode 100644
index 353cafa8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2823.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2823.cfg
deleted file mode 100644
index de58e056..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2831.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2831.cfg
deleted file mode 100644
index e7271af0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2836.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2836.cfg
deleted file mode 100644
index 41151a57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2873.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2873.cfg
deleted file mode 100644
index be881c98..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2879.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2879.cfg
deleted file mode 100644
index ba98f974..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2886.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2886.cfg
deleted file mode 100644
index eb4b5ca2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2886.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_compare = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2890.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2890.cfg
deleted file mode 100644
index 81ba72ca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2902.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2902.cfg
deleted file mode 100644
index 5806b371..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2902.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_enum_last_comma = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2907.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2907.cfg
deleted file mode 100644
index fa5b3018..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2914.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2914.cfg
deleted file mode 100644
index 98d4511c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2921.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2921.cfg
deleted file mode 100644
index 142dc8dc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2921.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_func_params_span = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2930.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2930.cfg
deleted file mode 100644
index bd8cb9b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2942.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2942.cfg
deleted file mode 100644
index e72ddc77..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_2949.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2949.cfg
deleted file mode 100644
index b5ea1ffb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2949.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_columns = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3010.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3010.cfg
deleted file mode 100644
index 5f518291..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3010.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_with_tabs = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3025.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3025.cfg
deleted file mode 100644
index 5e545c50..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3025.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_cmt_cpp_start = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3034.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3034.cfg
deleted file mode 100644
index 77557ac3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_3040.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3040.cfg
deleted file mode 100644
index 12c8ebaf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_3044.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3044.cfg
deleted file mode 100644
index c2f9ade5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_3048.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3048.cfg
deleted file mode 100644
index fb4171d7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_3052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3052.cfg
deleted file mode 100644
index f7c29b8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_3054-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3054-2.cfg
deleted file mode 100644
index a41640f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_3054.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3054.cfg
deleted file mode 100644
index a88303ba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_3055.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3055.cfg
deleted file mode 100644
index 307e5d93..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_3058.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3058.cfg
deleted file mode 100644
index 1619b851..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_3061_0nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3061_0nl.cfg
deleted file mode 100644
index 53a71184..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_3061_1nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3061_1nl.cfg
deleted file mode 100644
index ad1c0bbc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_3061_2nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3061_2nl.cfg
deleted file mode 100644
index 27325b31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_3061_3nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3061_3nl.cfg
deleted file mode 100644
index 276c7d72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_3080.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3080.cfg
deleted file mode 100644
index 748a6dad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3080.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_decltype = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3097.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3097.cfg
deleted file mode 100644
index bce2060e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3097.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_var_def_blk_start = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3164.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3164.cfg
deleted file mode 100644
index 10cf639b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3164.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_remove_duplicate_include = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3197.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3197.cfg
deleted file mode 100644
index 2177bfff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3197.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_before_byref      = ignore
-sp_before_byref_func = ignore
-sp_after_byref       = ignore
-sp_after_byref_func  = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3198.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3198.cfg
deleted file mode 100644
index 28852f24..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3198.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns = 4
-sp_before_dc   = remove
-sp_after_dc    = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3203.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3203.cfg
deleted file mode 100644
index 69cd5054..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3203.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-indent_with_tabs = 0
-newlines         = crlf
-output_tab_size  = 4
-indent_columns   = 4
-indent_class     = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-f.cfg
deleted file mode 100644
index fffa496d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-f.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-indent_with_tabs            = 0
-sp_after_ptr_star           = force
-sp_after_ptr_star_func      = force
-sp_after_ptr_star_trailing  = force
-sp_after_ptr_star_qualifier = force
-sp_before_ptr_star          = force
-sp_before_ptr_star_func     = force
-sp_before_ptr_star_trailing = force
-sp_before_unnamed_ptr_star  = force
-sp_between_ptr_star         = force
-sp_ptr_star_paren           = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-i.cfg
deleted file mode 100644
index 52060d80..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-i.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-indent_with_tabs            = 0
-sp_after_ptr_star           = ignore
-sp_after_ptr_star_func      = ignore
-sp_after_ptr_star_trailing  = ignore
-sp_after_ptr_star_qualifier = ignore
-sp_before_ptr_star          = ignore
-sp_before_ptr_star_func     = ignore
-sp_before_ptr_star_trailing = ignore
-sp_before_unnamed_ptr_star  = ignore
-sp_between_ptr_star         = ignore
-sp_ptr_star_paren           = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-ir.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-ir.cfg
deleted file mode 100644
index 17d298b2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-ir.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-indent_with_tabs            = 0
-sp_after_ptr_star           = ignore
-sp_after_ptr_star_func      = ignore
-sp_after_ptr_star_trailing  = ignore
-sp_after_ptr_star_qualifier = ignore
-sp_before_ptr_star          = remove
-sp_before_ptr_star_func     = ignore
-sp_before_ptr_star_trailing = ignore
-sp_before_unnamed_ptr_star  = ignore
-sp_between_ptr_star         = ignore
-sp_ptr_star_paren           = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-r.cfg
deleted file mode 100644
index c62cb16e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-r.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-indent_with_tabs            = 0
-sp_after_ptr_star           = remove
-sp_after_ptr_star_func      = remove
-sp_after_ptr_star_trailing  = remove
-sp_after_ptr_star_qualifier = remove
-sp_before_ptr_star          = remove
-sp_before_ptr_star_func     = remove
-sp_before_ptr_star_trailing = remove
-sp_before_unnamed_ptr_star  = remove
-sp_between_ptr_star         = remove
-sp_ptr_star_paren           = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3237.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3237.cfg
deleted file mode 100644
index 5c47913d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3237.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_before_ptr_star = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3252.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3252.cfg
deleted file mode 100644
index db7fe8f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3252.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_tparen_close = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3309-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3309-f.cfg
deleted file mode 100644
index e74d7570..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3309-f.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_ellipsis_parameter_pack = force
-nl_collapse_empty_body     = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3309-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3309-i.cfg
deleted file mode 100644
index dd286b9d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3309-i.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_ellipsis_parameter_pack = ignore
-nl_collapse_empty_body     = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3309-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3309-r.cfg
deleted file mode 100644
index 771903f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3309-r.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_ellipsis_parameter_pack = remove
-nl_collapse_empty_body     = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_931.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_931.cfg
deleted file mode 100644
index 45879950..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/Issue_995-do.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_995-do.cfg
deleted file mode 100644
index ba4e6387..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/NewLine-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/NewLine-f.cfg
deleted file mode 100644
index 8da1e530..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/NewLine-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/NewLine-r.cfg
deleted file mode 100644
index 329f5112..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/STUCK_macro-difficulties.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/STUCK_macro-difficulties.cfg
deleted file mode 100644
index c7ce0fd8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/U02-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U02-Cpp.cfg
deleted file mode 100644
index e8b4846a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/U03-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U03-Cpp.cfg
deleted file mode 100644
index d0f33089..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/U04-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U04-Cpp.cfg
deleted file mode 100644
index 75f78b42..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U04-Cpp.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_columns                  = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U05-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U05-Cpp.cfg
deleted file mode 100644
index ac01c51c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/U06-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U06-Cpp.cfg
deleted file mode 100644
index 55fcc716..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/U07-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U07-Cpp.cfg
deleted file mode 100644
index 9cee7fef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/U16-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U16-Cpp.cfg
deleted file mode 100644
index 425ee375..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/U18-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U18-Cpp.cfg
deleted file mode 100644
index 75f78b42..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U18-Cpp.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_columns                  = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U21-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U21-Cpp.cfg
deleted file mode 100644
index fd27114f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/U23-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U23-Cpp.cfg
deleted file mode 100644
index 04863187..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/U25-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U25-Cpp.cfg
deleted file mode 100644
index 75f78b42..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U25-Cpp.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_columns                  = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U26-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U26-Cpp.cfg
deleted file mode 100644
index 39c58934..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U26-Cpp.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_func_call_paren          = remove
-indent_columns              = 4
-indent_with_tabs            = 0
-indent_off_after_return_new = true
-sp_func_def_paren           = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U27-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U27-Cpp.cfg
deleted file mode 100644
index e8b4846a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/U28-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U28-Cpp.cfg
deleted file mode 100644
index ac01c51c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/U29-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U29-Cpp.cfg
deleted file mode 100644
index d65f6b27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/U30-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U30-Cpp.cfg
deleted file mode 100644
index 75f78b42..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U30-Cpp.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_columns                  = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U31-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U31-Cpp.cfg
deleted file mode 100644
index bd45658a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U31-Cpp.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_type                   = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U33-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U33-Cpp.cfg
deleted file mode 100644
index 0d78de45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/U36-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U36-Cpp.cfg
deleted file mode 100644
index b655be2c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U36-Cpp.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns                  = 4
-indent_class                    = true
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-10496.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-10496.cfg
deleted file mode 100644
index 42f6ee64..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/UNI-12046.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-12046.cfg
deleted file mode 100644
index 4dcd62eb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/UNI-1340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1340.cfg
deleted file mode 100644
index 8a43dca1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1340.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_namespace_two_to_one_liner   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1344.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1344.cfg
deleted file mode 100644
index 9e9937d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/UNI-1346.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1346.cfg
deleted file mode 100644
index 4074ff52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/UNI-1347.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1347.cfg
deleted file mode 100644
index ee4173ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/UNI-1350.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1350.cfg
deleted file mode 100644
index 082a647f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1350.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_inside_braces_struct = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1356.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1356.cfg
deleted file mode 100644
index 948f20b6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/UNI-1358.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1358.cfg
deleted file mode 100644
index 0d78de45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/UNI-2049.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-2049.cfg
deleted file mode 100644
index f075ea03..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/UNI-2650.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-2650.cfg
deleted file mode 100644
index 46279443..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/UNI-2680.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-2680.cfg
deleted file mode 100644
index 99790699..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/UNI-29935.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-29935.cfg
deleted file mode 100644
index 28d338ee..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-29935.cfg
+++ /dev/null
@@ -1,148 +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_between_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.74.0/tests/config/cpp/UNI-30088.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-30088.cfg
deleted file mode 100644
index 4abe03e1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/UNI-32657.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-32657.cfg
deleted file mode 100644
index cfc6c300..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-32657.cfg
+++ /dev/null
@@ -1,316 +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_between_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.74.0/tests/config/cpp/Uncrustify.Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Uncrustify.Cpp.cfg
deleted file mode 100644
index 89855c3c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/al.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/al.cfg
deleted file mode 100644
index 669cef45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align-330.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align-330.cfg
deleted file mode 100644
index 7a2ce116..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_assign_decl_func-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_assign_decl_func-0.cfg
deleted file mode 100644
index fee6fea1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_assign_decl_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_assign_decl_func-1.cfg
deleted file mode 100644
index 2175c1e2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_assign_decl_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_assign_decl_func-2.cfg
deleted file mode 100644
index 9e3a2779..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_assign_func_proto_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_assign_func_proto_1.cfg
deleted file mode 100644
index 378039a7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_assign_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_assign_span-1.cfg
deleted file mode 100644
index fda177f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_asterisk_after_type_cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_asterisk_after_type_cast.cfg
deleted file mode 100644
index 4a781152..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_class-constr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_class-constr.cfg
deleted file mode 100644
index 8824d97a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_continuation_left_shift.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_continuation_left_shift.cfg
deleted file mode 100644
index 767f2adc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_default_after_override.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_default_after_override.cfg
deleted file mode 100644
index 7373e8d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_default_after_override.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_assign_span               = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_eigen_comma_init.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_eigen_comma_init.cfg
deleted file mode 100644
index a798cc5f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_fcall-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_fcall-2.cfg
deleted file mode 100644
index 795a16e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_fcall.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_fcall.cfg
deleted file mode 100644
index 2df9b2e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_func_params-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params-t.cfg
deleted file mode 100644
index 6072ca53..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_func_params_gap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_gap.cfg
deleted file mode 100644
index 314c2e1b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_func_params_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_span-1.cfg
deleted file mode 100644
index 5695e5a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_func_params_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_thresh_1.cfg
deleted file mode 100644
index acae1cc7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_func_params_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_thresh_2.cfg
deleted file mode 100644
index 355705f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_func_params_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_thresh_3.cfg
deleted file mode 100644
index 48912fce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_func_params_thresh_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_thresh_4.cfg
deleted file mode 100644
index 284a5ee8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_func_proto_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_proto_thresh_1.cfg
deleted file mode 100644
index b6a93b5b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_func_proto_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_proto_thresh_2.cfg
deleted file mode 100644
index 363ea06c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_func_proto_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_proto_thresh_3.cfg
deleted file mode 100644
index 3a5ac106..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_func_proto_thresh_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_proto_thresh_4.cfg
deleted file mode 100644
index 6b084d86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_func_proto_thresh_5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_proto_thresh_5.cfg
deleted file mode 100644
index 8a8dff6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_right_comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_right_comment.cfg
deleted file mode 100644
index 1551b394..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_right_comment.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_right_cmt_span = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_var_class_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_var_class_span-1.cfg
deleted file mode 100644
index a1b4122c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_var_def_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_var_def_thresh_1.cfg
deleted file mode 100644
index 5cadc402..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_var_def_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_var_def_thresh_2.cfg
deleted file mode 100644
index bb9be8ad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/align_var_def_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_var_def_thresh_3.cfg
deleted file mode 100644
index edb77f43..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/anonymous_enum.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/anonymous_enum.cfg
deleted file mode 100644
index 503a2cb5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/arith-vs-ptr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/arith-vs-ptr.cfg
deleted file mode 100644
index 60c8d23c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/avalon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/avalon.cfg
deleted file mode 100644
index aef9ed44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/avalon.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-sp_before_byref               = remove
-sp_before_byref_func          = remove
-sp_before_square              = force
-sp_func_proto_paren           = remove
-sp_func_def_paren             = remove
-sp_before_vardef_square       = force
-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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/avalon2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/avalon2.cfg
deleted file mode 100644
index 97783b66..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/avalon3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/avalon3.cfg
deleted file mode 100644
index 30f50cb7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/avalon4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/avalon4.cfg
deleted file mode 100644
index 1577d2b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/avalon4.cfg
+++ /dev/null
@@ -1,13 +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
-sp_after_ptr_star_qualifier = 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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_001.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_001.cfg
deleted file mode 100644
index e1bce1fa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_003.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_003.cfg
deleted file mode 100644
index b6dffc7c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_004.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_004.cfg
deleted file mode 100644
index fa3c13c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_005.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_005.cfg
deleted file mode 100644
index 6784d5f8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_006.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_006.cfg
deleted file mode 100644
index 2767d063..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_008.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_008.cfg
deleted file mode 100644
index 432f7093..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_009.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_009.cfg
deleted file mode 100644
index 314bb848..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_010.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_010.cfg
deleted file mode 100644
index c4536db3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_012.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_012.cfg
deleted file mode 100644
index 805f96ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_012.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-sp_arith             = force
-sp_before_ptr_star   = force
-sp_after_ptr_star    = remove
-sp_before_byref      = remove
-sp_before_byref_func = remove
-sp_inside_angle      = remove
-sp_after_angle       = force
-sp_angle_word        = 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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_013.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_013.cfg
deleted file mode 100644
index be76962d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_014.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_014.cfg
deleted file mode 100644
index 33c1e6e4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_014.cfg
+++ /dev/null
@@ -1,43 +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_ptr_star_func_var            = 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_cparen_oparen                = 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.74.0/tests/config/cpp/ben_015.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_015.cfg
deleted file mode 100644
index 0e139678..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_016.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_016.cfg
deleted file mode 100644
index 9b863f1d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_017.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_017.cfg
deleted file mode 100644
index a4acecc3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_018.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_018.cfg
deleted file mode 100644
index c8dd1ab6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_018.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_before_ptr_star          = force
-sp_after_ptr_star           = remove
-sp_after_ptr_star_qualifier = remove
-indent_columns              = 3
-align_var_struct_span       = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_020.cfg
deleted file mode 100644
index 8cd270ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_021.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_021.cfg
deleted file mode 100644
index e8024afb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_021.cfg
+++ /dev/null
@@ -1,13 +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
-sp_cpp_lambda_square_paren      = remove
-sp_cpp_lambda_square_brace      = force
-sp_cpp_lambda_paren_brace       = force
-indent_columns                  = 3
-indent_with_tabs                = 0
-nl_after_semicolon              = true
-mod_paren_on_return             = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_022.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_022.cfg
deleted file mode 100644
index e258b9a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_022.cfg
+++ /dev/null
@@ -1,13 +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
-sp_after_ptr_star_trailing  = remove
-sp_before_ptr_star_trailing = force
-sp_after_ptr_star_qualifier = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_023.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_023.cfg
deleted file mode 100644
index acb9b682..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_024.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_024.cfg
deleted file mode 100644
index 37954be0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_026.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_026.cfg
deleted file mode 100644
index f7008ee3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_027.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_027.cfg
deleted file mode 100644
index fbbdb06a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_028.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_028.cfg
deleted file mode 100644
index 62848095..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_029.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_029.cfg
deleted file mode 100644
index a0c2e18c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_030.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_030.cfg
deleted file mode 100644
index 8663afd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ben_031.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_031.cfg
deleted file mode 100644
index fe2182c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1001.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1001.cfg
deleted file mode 100644
index d8255ca7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1003.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1003.cfg
deleted file mode 100644
index 242b3a13..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1004.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1004.cfg
deleted file mode 100644
index f479bada..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1020.cfg
deleted file mode 100644
index 51643e87..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1108.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1108.cfg
deleted file mode 100644
index 741ba79d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1160.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1160.cfg
deleted file mode 100644
index afc7030d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1161.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1161.cfg
deleted file mode 100644
index c7977cf0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1169.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1169.cfg
deleted file mode 100644
index 0615b330..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1170.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1170.cfg
deleted file mode 100644
index 9171180b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1236.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1236.cfg
deleted file mode 100644
index 0c60d5be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1296.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1296.cfg
deleted file mode 100644
index 82a970ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1315.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1315.cfg
deleted file mode 100644
index 49a716d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1324.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1324.cfg
deleted file mode 100644
index 289ca9d5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1340.cfg
deleted file mode 100644
index 6ec6568e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1349.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1349.cfg
deleted file mode 100644
index abe4253c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1395.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1395.cfg
deleted file mode 100644
index c2bed595..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1402.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1402.cfg
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1402.cfg
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1403.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1403.cfg
deleted file mode 100644
index 8e10acd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1403.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_arith = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1432.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1432.cfg
deleted file mode 100644
index 4ae27492..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1439.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1439.cfg
deleted file mode 100644
index f625249d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1439.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_after_struct = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1452.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1452.cfg
deleted file mode 100755
index dbd0e9b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1649.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1649.cfg
deleted file mode 100644
index 472975ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1649.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_noexcept = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1689.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1689.cfg
deleted file mode 100644
index 7c1462f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1689.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_unnamed_byref = remove
-sp_before_byref         = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1691.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1691.cfg
deleted file mode 100644
index 03600f80..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_1717.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1717.cfg
deleted file mode 100644
index a6c7322f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1717.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_assign_span = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1758-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1758-f.cfg
deleted file mode 100644
index 90d17ebd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1758-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_full_brace_for              = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1854.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1854.cfg
deleted file mode 100644
index ebc5c5e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1854.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_before_semi = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1862.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1862.cfg
deleted file mode 100644
index c23b9027..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_2285.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2285.cfg
deleted file mode 100644
index fa3b437b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_2322.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2322.cfg
deleted file mode 100644
index 9743a828..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_2371.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2371.cfg
deleted file mode 100644
index 1f207beb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_2402.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2402.cfg
deleted file mode 100644
index 85c3a458..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_2433_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2433_1.cfg
deleted file mode 100644
index 17fd04a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_2433_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2433_2.cfg
deleted file mode 100644
index 89f0b916..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_472.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_472.cfg
deleted file mode 100644
index 68d6f99b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_488.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_488.cfg
deleted file mode 100644
index 0319ef54..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_633.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_633.cfg
deleted file mode 100644
index 61833884..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_657.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_657.cfg
deleted file mode 100644
index 109e3750..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_664.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_664.cfg
deleted file mode 100644
index 3799bd89..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_670.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_670.cfg
deleted file mode 100644
index fe57c0af..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_858-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_858-f.cfg
deleted file mode 100644
index 1f03334a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_858-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_858-r.cfg
deleted file mode 100644
index 82e3cb22..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_i_322.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_322.cfg
deleted file mode 100644
index e49770be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_i_359.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_359.cfg
deleted file mode 100644
index ab9c63fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_i_405.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_405.cfg
deleted file mode 100644
index 0bdfce99..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_i_409-create.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_409-create.cfg
deleted file mode 100644
index ec0f6ca4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_i_409-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_409-split.cfg
deleted file mode 100644
index 9e272905..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_i_478.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_478.cfg
deleted file mode 100644
index 18db9a6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_i_663.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_663.cfg
deleted file mode 100644
index 9d780855..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_i_666.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_666.cfg
deleted file mode 100644
index 6acabd49..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/bug_i_752.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_752.cfg
deleted file mode 100644
index 93191dc0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_752.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_before_tr_cmt                = force
-sp_num_before_tr_cmt            = 4
-indent_columns                  = 4
-indent_with_tabs                = 0
-nl_end_of_file                  = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-center.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-center.cfg
deleted file mode 100644
index 5d370736..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-center.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Places the byref as follows: "int & foo"
-sp_after_byref_func  = force
-sp_before_byref_func = force
-sp_after_byref       = force
-sp_before_byref      = force
-indent_columns       = 3
-indent_class         = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-f.cfg
deleted file mode 100644
index a50d0c1a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-f.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_before_byref_func    = force
-sp_after_byref_func     = force
-sp_before_byref         = force
-sp_after_byref          = force
-sp_before_unnamed_byref = force
-sp_addr                 = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-i.cfg
deleted file mode 100644
index 9d15782c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-i.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_before_byref_func    = ignore
-sp_after_byref_func     = ignore
-sp_before_byref         = ignore
-sp_after_byref          = ignore
-sp_before_unnamed_byref = ignore
-sp_type_func            = ignore
-sp_addr                 = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-ir.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-ir.cfg
deleted file mode 100644
index df89f6e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-ir.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_before_byref_func    = ignore
-sp_after_byref_func     = ignore
-sp_before_byref         = ignore
-sp_after_byref          = remove
-sp_before_unnamed_byref = ignore
-sp_type_func            = ignore
-sp_addr                 = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-left.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-left.cfg
deleted file mode 100644
index d28c4e5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-left.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-# Places the byref as follows: "int &foo"
-sp_before_byref      = force
-sp_before_byref_func = 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.74.0/tests/config/cpp/byref-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-r.cfg
deleted file mode 100644
index 505f9dc0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-r.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_before_byref_func    = remove
-sp_after_byref_func     = remove
-sp_before_byref         = remove
-sp_after_byref          = remove
-sp_before_unnamed_byref = remove
-sp_type_func            = remove
-sp_addr                 = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-right.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-right.cfg
deleted file mode 100644
index 82fb7287..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-right.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Places the byref as follows: "int& foo"
-sp_before_byref      = remove
-sp_before_byref_func = remove
-indent_columns       = 3
-indent_class         = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cast.cfg
deleted file mode 100644
index feac5350..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/class-colon-pos-eol-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-colon-pos-eol-add.cfg
deleted file mode 100644
index fb14545e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/class-colon-pos-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-colon-pos-eol.cfg
deleted file mode 100644
index ddb0e11b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/class-colon-pos-sol-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-colon-pos-sol-add.cfg
deleted file mode 100644
index 960dade0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/class-colon-pos-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-colon-pos-sol.cfg
deleted file mode 100644
index a57e30d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/class-nl_func-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-nl_func-add.cfg
deleted file mode 100644
index d60ffa9b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/class-nl_func-add2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-nl_func-add2.cfg
deleted file mode 100644
index f8a35e0d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/class-nl_func-del.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-nl_func-del.cfg
deleted file mode 100644
index b90f2f75..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/class-on-colon-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-on-colon-indent.cfg
deleted file mode 100644
index 86fec34f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/cmt_convert_tab_to_spaces-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_convert_tab_to_spaces-t.cfg
deleted file mode 100644
index 98b3bcf3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/cmt_cpp_to_c-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_cpp_to_c-t.cfg
deleted file mode 100644
index 85c3fec8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/cmt_indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_indent-1.cfg
deleted file mode 100644
index 8d0a8a16..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/cmt_indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_indent-2.cfg
deleted file mode 100644
index fd9b9d25..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/cmt_indent-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_indent-3.cfg
deleted file mode 100644
index c8e6ce41..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/cmt_multi_first_len_minimum-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_multi_first_len_minimum-1.cfg
deleted file mode 100644
index e7d99a98..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/cmt_trailing_single_line_c_to_cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_trailing_single_line_c_to_cpp.cfg
deleted file mode 100644
index 0754b419..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_trailing_single_line_c_to_cpp.cfg
+++ /dev/null
@@ -1 +0,0 @@
-cmt_trailing_single_line_c_to_cpp = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/code_width-70.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/code_width-70.cfg
deleted file mode 100644
index 07c25e5c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/comma-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/comma-f.cfg
deleted file mode 100644
index 29eb50b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/comma-f.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_paren_comma  = force
-sp_after_comma  = force
-sp_before_comma = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/comma-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/comma-i.cfg
deleted file mode 100644
index 2dad1026..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/comma-i.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_paren_comma  = ignore
-sp_after_comma  = ignore
-sp_before_comma = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/comma-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/comma-r.cfg
deleted file mode 100644
index 5194e6da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/comma-r.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_paren_comma  = remove
-sp_after_comma  = remove
-sp_before_comma = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/const_throw.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/const_throw.cfg
deleted file mode 100644
index 41b3ecef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/constr_colon.cfg
deleted file mode 100644
index 3397573a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/cpp17.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cpp17.cfg
deleted file mode 100644
index 1865e0c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cpp17.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_cpp_before_struct_binding    = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cu.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cu.cfg
deleted file mode 100644
index 40dff3e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/custom-open.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/custom-open.cfg
deleted file mode 100644
index 5b4539e2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/custom-open2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/custom-open2.cfg
deleted file mode 100644
index 38e507b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/disable_nl_cont.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/disable_nl_cont.cfg
deleted file mode 100644
index 9ea9350f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/dont-detab-strings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/dont-detab-strings.cfg
deleted file mode 100644
index 9e36729d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/dont-detab-strings.cfg
+++ /dev/null
@@ -1 +0,0 @@
-string_replace_tab_chars = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/dont-process-defines.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/dont-process-defines.cfg
deleted file mode 100644
index bfb66ec8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/eat_blanks_after_codewidth.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/eat_blanks_after_codewidth.cfg
deleted file mode 100644
index 1b24a7ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ellipsis-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ellipsis-i.cfg
deleted file mode 100644
index 3b4d8ec6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ellipsis-i.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_after_ellipsis  = ignore
-sp_before_ellipsis = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/enum.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/enum.cfg
deleted file mode 100644
index b39c0840..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/enum_comma-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/enum_comma-3.cfg
deleted file mode 100644
index 7fe548e2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/enum_comma-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/enum_comma-4.cfg
deleted file mode 100644
index d42e6b1e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/enum_comma-6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/enum_comma-6.cfg
deleted file mode 100644
index 6d4279ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/enum_comment_wrap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/enum_comment_wrap.cfg
deleted file mode 100644
index e42e00a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/extern_func.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/extern_func.cfg
deleted file mode 100644
index a6135e8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/footer.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/footer.txt
deleted file mode 100644
index 1d2f941f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/footer.txt
+++ /dev/null
@@ -1 +0,0 @@
-// @filename $(filename) as input file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/func_class.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/func_class.cfg
deleted file mode 100644
index 7f01b7be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/func_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/func_param.cfg
deleted file mode 100644
index 81ce43a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/func_param.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-sp_paren_paren                  = remove
-sp_after_ptr_star               = remove
-sp_ptr_star_func_var            = remove
-sp_func_proto_paren             = remove
-sp_inside_fparen                = remove
-sp_after_tparen_close           = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/functype_param-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/functype_param-f.cfg
deleted file mode 100644
index 746b15f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/functype_param-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/functype_param-r.cfg
deleted file mode 100644
index 1576135f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/i1516.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i1516.cfg
deleted file mode 100644
index 8c03f30e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/i1536.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i1536.cfg
deleted file mode 100644
index 5506f68c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i1536.cfg
+++ /dev/null
@@ -1 +0,0 @@
-cmt_insert_func_header = "i1536.txt"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i1536.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i1536.txt
deleted file mode 100644
index d34c497d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i1536.txt
+++ /dev/null
@@ -1 +0,0 @@
-// $(function)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i1768.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i1768.cfg
deleted file mode 100644
index 9174483a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/i683.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i683.cfg
deleted file mode 100644
index 2b6edefe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/if_chain_braces_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/if_chain_braces_2.cfg
deleted file mode 100644
index aa9251c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_braces_no.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_braces_no.cfg
deleted file mode 100644
index 24ca060b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_class-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_class-t.cfg
deleted file mode 100644
index 78320e8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_class-t_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_class-t_columns-4.cfg
deleted file mode 100644
index 5184fc9a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_columns-11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_columns-11.cfg
deleted file mode 100644
index 15cef67e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_columns-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_columns-2.cfg
deleted file mode 100644
index f33cb665..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_columns-4.cfg
deleted file mode 100644
index f4f5183a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_comma_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_comma_brace.cfg
deleted file mode 100644
index 635c6cdf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_comment_align_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_comment_align_thresh_2.cfg
deleted file mode 100644
index 2f5d5cab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_ctor_init.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_ctor_init.cfg
deleted file mode 100644
index cb1cef12..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_ctor_init_following.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_ctor_init_following.cfg
deleted file mode 100644
index 140e8f17..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_ctor_init_following.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_following      = 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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_ctor_init_leading.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_ctor_init_leading.cfg
deleted file mode 100644
index ce8fb22f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_ctor_members_twice.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_ctor_members_twice.cfg
deleted file mode 100644
index 82c708d4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_else_if-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_else_if-t.cfg
deleted file mode 100644
index 2dcd9a57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_first_for_expr-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_first_for_expr-t.cfg
deleted file mode 100644
index ff68e85c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_namespace-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_namespace-t.cfg
deleted file mode 100644
index 90bbdaec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_namespace_single_indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_namespace_single_indent.cfg
deleted file mode 100644
index 9f66fea4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_off_after_return.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_off_after_return.cfg
deleted file mode 100644
index 077c5f94..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_once.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_once.cfg
deleted file mode 100644
index 013985b9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_param.cfg
deleted file mode 100644
index 07d98897..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_paren_after_func_call-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_paren_after_func_call-t.cfg
deleted file mode 100644
index eafffebc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_paren_after_func_decl-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_paren_after_func_decl-t.cfg
deleted file mode 100644
index c4db2ffe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_paren_after_func_def-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_paren_after_func_def-t.cfg
deleted file mode 100644
index 5d2895e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_semicolon_for_paren-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_semicolon_for_paren-t.cfg
deleted file mode 100644
index 6b49dbd6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_shift.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_shift.cfg
deleted file mode 100644
index 8a848c34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_var_def_cont-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_var_def_cont-t.cfg
deleted file mode 100644
index f439a00b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/indent_with_tabs-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_with_tabs-0.cfg
deleted file mode 100644
index bd2c3a08..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_with_tabs-0.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_with_tabs      = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/initlist_leading_commas.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/initlist_leading_commas.cfg
deleted file mode 100644
index ebd35547..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/interface-keyword-in-cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/interface-keyword-in-cpp.cfg
deleted file mode 100644
index cbbf215b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/issue_1778.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1778.cfg
deleted file mode 100644
index 2f4bd642..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/issue_1782.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1782.cfg
deleted file mode 100644
index 6d50bfeb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/issue_1804.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1804.cfg
deleted file mode 100644
index 4c424b89..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/issue_1887.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1887.cfg
deleted file mode 100644
index 956ea6a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/issue_1916.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1916.cfg
deleted file mode 100644
index 414a4a96..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/issue_1985.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1985.cfg
deleted file mode 100644
index 3be58c29..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/issue_1997.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1997.cfg
deleted file mode 100644
index 1f79d36e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/issue_2124-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2124-1.cfg
deleted file mode 100644
index e69de29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2124-1.cfg
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2124-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2124-2.cfg
deleted file mode 100644
index 34866fe3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/issue_2209.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2209.cfg
deleted file mode 100644
index 414a7273..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/issue_2623_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2623_1.cfg
deleted file mode 100644
index 56ab3a56..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/issue_2623_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2623_2.cfg
deleted file mode 100644
index 2848fb59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/issue_2623_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2623_3.cfg
deleted file mode 100644
index 52d17555..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/issue_3116-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_3116-2.cfg
deleted file mode 100644
index f26ef61e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_3116-2.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_cpp_lambda_body = true
-indent_align_assign = true
-indent_columns = 4
-indent_with_tabs = 0
-indent_continue = 0
-indent_paren_close = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_3116.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_3116.cfg
deleted file mode 100644
index 034f2697..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_3116.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-indent_cpp_lambda_body = true
-indent_align_assign = false
-indent_columns = 4
-indent_with_tabs = 0
-indent_continue = 4
-indent_paren_close = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_3378.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_3378.cfg
deleted file mode 100644
index 8ecc9f2f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_3378.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_class = true
-indent_ignore_label = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_564.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_564.cfg
deleted file mode 100644
index d1496108..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_564.cfg
+++ /dev/null
@@ -1 +0,0 @@
-align_same_func_call_params = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_574-i-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_574-i-a.cfg
deleted file mode 100644
index 24a1a182..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/issue_574-i-b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_574-i-b.cfg
deleted file mode 100644
index b61ac3e2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/issue_574-i-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_574-i-i.cfg
deleted file mode 100644
index c0177cb1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_574-i-i.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                = ignore
-sp_assign                       = ignore
-sp_assign_default               = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_574.cfg
deleted file mode 100644
index 925ee5fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/kdepim2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/kdepim2.cfg
deleted file mode 100644
index 18b12bbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/kdepim3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/kdepim3.cfg
deleted file mode 100644
index 0fe42133..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/kdepim5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/kdepim5.cfg
deleted file mode 100644
index 56a1b3da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/lambda1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lambda1.cfg
deleted file mode 100644
index c0fbc795..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lambda1.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
-sp_cpp_lambda_square_brace      = force
-sp_cpp_lambda_paren_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.74.0/tests/config/cpp/lambda2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lambda2.cfg
deleted file mode 100644
index 9f698209..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/lambda3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lambda3.cfg
deleted file mode 100644
index ffed35eb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/lambda_in_one_liner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lambda_in_one_liner.cfg
deleted file mode 100644
index 7b61e767..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/lineEndings-to-Mac.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lineEndings-to-Mac.cfg
deleted file mode 100644
index d8b41944..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/lineEndings-to-Unix.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lineEndings-to-Unix.cfg
deleted file mode 100644
index e6cf9411..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/lineEndings-to-Win.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lineEndings-to-Win.cfg
deleted file mode 100644
index cb40d365..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/long_br_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/long_br_cmt.cfg
deleted file mode 100644
index f66ee7c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/long_namespace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/long_namespace.cfg
deleted file mode 100644
index 74f99a18..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/mod_add_long_namespace_closebrace_comment-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/mod_add_long_namespace_closebrace_comment-1.cfg
deleted file mode 100644
index a94f5a62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/mod_full_brace_if_chain-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/mod_full_brace_if_chain-t.cfg
deleted file mode 100644
index 32a552ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/mod_remove_empty_return-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/mod_remove_empty_return-t.cfg
deleted file mode 100644
index 3e1bcd1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/mod_remove_extra_semicolon-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/mod_remove_extra_semicolon-t.cfg
deleted file mode 100644
index 0f2d5246..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/multi_line_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_1.cfg
deleted file mode 100644
index fe15ff0a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/multi_line_10.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_10.cfg
deleted file mode 100644
index e5b917e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/multi_line_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_2.cfg
deleted file mode 100644
index b4063fd3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/multi_line_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_3.cfg
deleted file mode 100644
index d1c40d07..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/multi_line_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_4.cfg
deleted file mode 100644
index 651b4823..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/multi_line_5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_5.cfg
deleted file mode 100644
index 94140b21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/multi_line_6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_6.cfg
deleted file mode 100644
index 4fd7a077..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/multi_line_7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_7.cfg
deleted file mode 100644
index 4ee5733c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/multi_line_8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_8.cfg
deleted file mode 100644
index 5d6d9c63..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/multi_line_9.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_9.cfg
deleted file mode 100644
index be9a43e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nSolve.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nSolve.cfg
deleted file mode 100644
index 6cc6fc27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/negative_indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/negative_indent.cfg
deleted file mode 100644
index 39b1b007..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/new_op_a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/new_op_a.cfg
deleted file mode 100644
index d7501092..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/new_op_f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/new_op_f.cfg
deleted file mode 100644
index 16784899..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/new_op_paren_open_close.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/new_op_paren_open_close.cfg
deleted file mode 100644
index 789c7abe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/new_op_r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/new_op_r.cfg
deleted file mode 100644
index b72cd2ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl-brAfter-fcallParen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl-brAfter-fcallParen.cfg
deleted file mode 100644
index 6a83f800..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_access_spec.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_access_spec.cfg
deleted file mode 100644
index a5d98c44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_after_func_body-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_after_func_body-2.cfg
deleted file mode 100644
index 9c9e7d57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_after_func_body.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_after_func_body.cfg
deleted file mode 100644
index 68633b6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_after_func_class_proto-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_after_func_class_proto-3.cfg
deleted file mode 100644
index 87b84e91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_after_func_proto-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_after_func_proto-3.cfg
deleted file mode 100644
index c9bc1f45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_after_func_proto_group-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_after_func_proto_group-3.cfg
deleted file mode 100644
index 63fa256a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_assign_leave_one_liners.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_assign_leave_one_liners.cfg
deleted file mode 100644
index 6914813b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_before_brace_open_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_brace_open_1.cfg
deleted file mode 100644
index 4146c6fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_brace_open_1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_before_brace_open = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_brace_open_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_brace_open_2.cfg
deleted file mode 100644
index bc1aaf83..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_brace_open_2.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-nl_before_brace_open            = 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_cs_property_leave_one_liners = true
-nl_func_leave_one_liners        = true
-nl_cpp_lambda_leave_one_liners  = true
-nl_if_leave_one_liners          = true
-nl_while_leave_one_liners       = true
-nl_for_leave_one_liners         = true
-nl_oc_msg_leave_one_liner       = true
-nl_namespace_two_to_one_liner   = true
-nl_create_if_one_liner          = true
-nl_create_for_one_liner         = true
-nl_create_while_one_liner       = true
-nl_create_func_def_one_liner    = true
-nl_create_list_one_liner        = true
-nl_split_if_one_liner           = true
-nl_split_for_one_liner          = true
-nl_split_while_one_liner        = true
-nl_class_leave_one_liner_groups = true
-nl_after_func_body_one_liner    = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_brace_open_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_brace_open_3.cfg
deleted file mode 100644
index 02daa843..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_brace_open_3.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-nl_before_brace_open            = 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_cs_property_leave_one_liners = true
-nl_func_leave_one_liners        = true
-nl_cpp_lambda_leave_one_liners  = true
-nl_if_leave_one_liners          = true
-nl_while_leave_one_liners       = true
-nl_for_leave_one_liners         = true
-nl_oc_msg_leave_one_liner       = true
-nl_namespace_two_to_one_liner   = false
-nl_create_if_one_liner          = true
-nl_create_for_one_liner         = true
-nl_create_while_one_liner       = true
-nl_create_func_def_one_liner    = true
-nl_create_list_one_liner        = true
-nl_split_if_one_liner           = true
-nl_split_for_one_liner          = true
-nl_split_while_one_liner        = true
-nl_class_leave_one_liner_groups = true
-nl_after_func_body_one_liner    = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_func_body_def-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_func_body_def-1.cfg
deleted file mode 100644
index 03ee374a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_before_func_body_def-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_func_body_def-2.cfg
deleted file mode 100644
index 2f3ba945..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_before_if_closing_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_if_closing_paren-f.cfg
deleted file mode 100644
index 39539a4e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_before_if_closing_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_if_closing_paren-r.cfg
deleted file mode 100644
index d3ab2d68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_before_struct.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_struct.cfg
deleted file mode 100644
index ab325b19..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_struct.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_before_struct = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_brace_brace-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_brace_brace-a.cfg
deleted file mode 100644
index 25d3c271..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_brace_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_brace_fparen-f.cfg
deleted file mode 100644
index 0a731344..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_brace_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_brace_fparen-r.cfg
deleted file mode 100644
index 5a749682..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_class-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_class-a.cfg
deleted file mode 100644
index 8c1eb70e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_class-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_class-r.cfg
deleted file mode 100644
index 29cc4dc6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg
deleted file mode 100644
index 7aac9635..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_fdef_brace_cond-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_fdef_brace_cond-f.cfg
deleted file mode 100644
index 7f08f9e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_fdef_brace_cond-fr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_fdef_brace_cond-fr.cfg
deleted file mode 100644
index affe7156..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_fdef_brace_cond-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_fdef_brace_cond-r.cfg
deleted file mode 100644
index e64f7f0c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_fdef_brace_cond-rf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_fdef_brace_cond-rf.cfg
deleted file mode 100644
index 9b12913e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_for_leave_one_liners-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_for_leave_one_liners-f.cfg
deleted file mode 100644
index bdcceefd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_for_leave_one_liners-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_for_leave_one_liners-t.cfg
deleted file mode 100644
index 4d11891e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_func_call_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_call_empty-r.cfg
deleted file mode 100644
index da04d6fa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_func_call_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_call_paren-f.cfg
deleted file mode 100644
index 480ce89f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_func_call_paren_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_call_paren_empty-r.cfg
deleted file mode 100644
index 48612eb5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_func_class_scope-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_class_scope-a.cfg
deleted file mode 100644
index dc9b2ec5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_func_decl_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_decl_1.cfg
deleted file mode 100644
index 438afe8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_func_decl_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_decl_2.cfg
deleted file mode 100644
index c0495a4b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_func_def_paren_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_def_paren_empty-r.cfg
deleted file mode 100644
index ddc5e5d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_func_paren_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_paren_empty.cfg
deleted file mode 100644
index 63f0b8ad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_func_scope_name-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_scope_name-a.cfg
deleted file mode 100644
index c814477d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_func_type_name-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_type_name-r.cfg
deleted file mode 100644
index 9cc10873..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_func_type_name_class.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_type_name_class.cfg
deleted file mode 100644
index fcb08501..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_func_type_name_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_type_name_force.cfg
deleted file mode 100644
index ef8b317e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_func_type_name_mixed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_type_name_mixed.cfg
deleted file mode 100644
index 515400f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_func_type_name_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_type_name_remove.cfg
deleted file mode 100644
index ee38dd7e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_func_var_def_blk-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_var_def_blk-1.cfg
deleted file mode 100644
index 2fc79eb3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_inside_namespace_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_inside_namespace_1.cfg
deleted file mode 100644
index c84309ca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_inside_namespace_1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_inside_namespace             = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_inside_namespace_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_inside_namespace_2.cfg
deleted file mode 100644
index 9edefd02..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_max_blank_in_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_max_blank_in_func-1.cfg
deleted file mode 100644
index 9aa3416c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_max_blank_in_func-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_max_blank_in_func-4.cfg
deleted file mode 100644
index 8d0bdf67..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_namespace-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_namespace-a.cfg
deleted file mode 100644
index bc5d6469..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_namespace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_namespace-r.cfg
deleted file mode 100644
index ca9c198d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_remove_extra_newlines-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_remove_extra_newlines-1.cfg
deleted file mode 100644
index 2d0c48b2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_template-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_template-f.cfg
deleted file mode 100644
index a90d1500..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_template-f.cfg
+++ /dev/null
@@ -1,17 +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
-sp_angle_word                   = force
-indent_columns                  = 3
-indent_class                    = true
-nl_template_class               = force
-nl_template_func                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_template-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_template-r.cfg
deleted file mode 100644
index 443693e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_template-r.cfg
+++ /dev/null
@@ -1,21 +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
-sp_angle_word                   = force
-sp_angle_word                   = force
-indent_columns                  = 3
-indent_class                    = true
-nl_template_class               = remove
-nl_template_func                = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_try-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_try-a.cfg
deleted file mode 100644
index b85fcb08..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst-f.cfg
deleted file mode 100644
index 1b29c5cd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst-r.cfg
deleted file mode 100644
index ef8d1de1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_type_brace_init_lst_close-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst_close-f.cfg
deleted file mode 100644
index 4e070657..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_type_brace_init_lst_close-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst_close-r.cfg
deleted file mode 100644
index d4834efd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_type_brace_init_lst_open-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst_open-f.cfg
deleted file mode 100644
index 1e9289e4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/nl_type_brace_init_lst_open-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst_open-r.cfg
deleted file mode 100644
index 7d493c8b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/no_squeeze_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/no_squeeze_ifdef.cfg
deleted file mode 100644
index af4a3020..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/op-space-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-force.cfg
deleted file mode 100644
index 4feac69a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-force.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-# Forces a space after an operator
-sp_before_byref       = remove
-sp_before_byref_func  = 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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-remove-align-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-remove-align-1.cfg
deleted file mode 100644
index 5be45718..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-remove-align-1.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# Removes a space after an operator
-sp_before_byref       = remove
-sp_before_byref_func  = 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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-remove-align-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-remove-align-2.cfg
deleted file mode 100644
index 32b7687a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-remove-align-2.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Removes a space after an operator
-sp_before_byref       = remove
-sp_before_byref_func  = 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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-remove.cfg
deleted file mode 100644
index 5424ede9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-remove.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Removes a space after an operator
-sp_before_byref       = remove
-sp_before_byref_func  = remove
-sp_after_byref        = force
-sp_after_operator     = remove
-sp_after_operator_sym = remove
-indent_columns        = 3
-indent_class          = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op_sym_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op_sym_empty.cfg
deleted file mode 100644
index d9a57ce1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/out-668-F.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/out-668-F.cfg
deleted file mode 100644
index 77d9e08c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/out-668-T.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/out-668-T.cfg
deleted file mode 100644
index a48c3ebb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/pos_assign.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_assign.cfg
deleted file mode 100644
index 3b9c3700..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_assign.cfg
+++ /dev/null
@@ -1 +0,0 @@
-pos_assign = join
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_comma-lf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_comma-lf.cfg
deleted file mode 100644
index 9f2daab6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/pos_comma-tb.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_comma-tb.cfg
deleted file mode 100644
index 3530982a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/pos_enum_comma-tf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_enum_comma-tf.cfg
deleted file mode 100644
index 26cf3dff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/pos_shift-join.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_shift-join.cfg
deleted file mode 100644
index 69ce2c94..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/pos_shift-lead.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_shift-lead.cfg
deleted file mode 100644
index 08e7d5de..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/pos_shift-trail.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_shift-trail.cfg
deleted file mode 100644
index a6b45298..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/pp-pragma.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pp-pragma.cfg
deleted file mode 100644
index e143a69c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/pp_define_at_level-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pp_define_at_level-1.cfg
deleted file mode 100644
index 12d12161..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/pp_multi_comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pp_multi_comment.cfg
deleted file mode 100644
index 0c23b380..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/ptr_star-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ptr_star-1.cfg
deleted file mode 100644
index 34a504be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ptr_star-1.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_before_ptr_star          = remove
-sp_after_ptr_star           = force
-sp_after_ptr_star_func      = force
-sp_after_ptr_star_qualifier = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ptr_star-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ptr_star-2.cfg
deleted file mode 100644
index 6af95864..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ptr_star-2.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-sp_before_ptr_star          = force
-sp_between_ptr_star         = remove
-sp_after_ptr_star           = remove
-sp_after_ptr_star_func      = remove
-sp_before_byref             = force
-sp_after_byref              = remove
-sp_after_ptr_star_trailing  = remove
-sp_before_ptr_star_trailing = force
-sp_after_ptr_star_qualifier = remove
-
-macro-close NS_SWIFT_NAME
-macro-close VIEW_CONTROLLER_MACRO
-macro-close MACRO_FUNCTION
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ptr_star-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ptr_star-3.cfg
deleted file mode 100644
index 3a5ed163..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ptr_star-3.cfg
+++ /dev/null
@@ -1,8 +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
-sp_after_ptr_star_trailing  = force
-sp_before_ptr_star_trailing = remove
-sp_after_ptr_star_qualifier = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/qt-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/qt-1.cfg
deleted file mode 100644
index b15663f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sef.cfg
deleted file mode 100644
index ee467d79..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/semi-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/semi-f.cfg
deleted file mode 100644
index 0ffadc4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/semi-f.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-indent_with_tabs          = 0
-sp_after_semi             = force
-sp_after_semi_for         = force
-sp_after_semi_for_empty   = force
-sp_before_semi            = force
-sp_before_semi_for        = force
-sp_before_semi_for_empty  = force
-sp_between_semi_for_empty = force
-sp_special_semi           = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/semi-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/semi-i.cfg
deleted file mode 100644
index b4260607..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/semi-i.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-indent_with_tabs          = 0
-sp_after_semi             = ignore
-sp_after_semi_for         = ignore
-sp_after_semi_for_empty   = ignore
-sp_before_semi            = ignore
-sp_before_semi_for        = ignore
-sp_before_semi_for_empty  = ignore
-sp_between_semi_for_empty = ignore
-sp_special_semi           = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/semi-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/semi-r.cfg
deleted file mode 100644
index a8465b8c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/semi-r.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-indent_with_tabs          = 0
-sp_after_semi             = remove
-sp_after_semi_for         = remove
-sp_after_semi_for_empty   = remove
-sp_before_semi            = remove
-sp_before_semi_for        = remove
-sp_before_semi_for_empty  = remove
-sp_between_semi_for_empty = remove
-sp_special_semi           = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sf.2886991-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sf.2886991-f.cfg
deleted file mode 100644
index 46a15bac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sf.2886991-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sf.2886991-r.cfg
deleted file mode 100644
index 8f6c0f6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sf.3315874.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sf.3315874.cfg
deleted file mode 100644
index 99da8446..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sf.3315874.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-sp_before_byref            = force
-sp_before_byref_func       = force
-sp_before_unnamed_byref    = force
-sp_after_byref             = remove
-sp_after_byref_func        = 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_amp_style = 1
-align_func_proto_gap       = 5
-align_on_operator          = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sf574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sf574.cfg
deleted file mode 100644
index 8fc266f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sim.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sim.cfg
deleted file mode 100644
index a772734b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sim.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-sp_ptr_star_func_var            = force
-sp_before_angle                 = remove
-sp_after_angle                  = remove
-sp_angle_word                   = 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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_angle-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_angle-1.cfg
deleted file mode 100644
index cae5bbb7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_after_angle-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_angle-2.cfg
deleted file mode 100644
index c14d7901..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_after_angle-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_angle-3.cfg
deleted file mode 100644
index d0428a10..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_after_cast-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_cast-f.cfg
deleted file mode 100644
index d92ffb0d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_cast-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_cast                   = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_cast-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_cast-r.cfg
deleted file mode 100644
index 130602eb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_after_constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_constr_colon.cfg
deleted file mode 100644
index aa1189dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_after_decltype-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_decltype-f.cfg
deleted file mode 100644
index 077c5f94..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_after_decltype-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_decltype-r.cfg
deleted file mode 100644
index 64a318a0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_decltype-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_decltype               = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_ellipsis-f.cfg
deleted file mode 100644
index e30e169a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_ellipsis-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_ellipsis = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_ptr_star_qualifier-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_ptr_star_qualifier-f.cfg
deleted file mode 100644
index 7e26046f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_after_type-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_type-i.cfg
deleted file mode 100644
index bd45658a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_type-i.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_type                   = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_type_brace_init_lst_open-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_type_brace_init_lst_open-f.cfg
deleted file mode 100644
index d3b744b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_after_type_brace_init_lst_open-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_type_brace_init_lst_open-r.cfg
deleted file mode 100644
index f370b82e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_angle_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_angle_colon.cfg
deleted file mode 100644
index e247bbbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_angle_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_angle_paren-f.cfg
deleted file mode 100644
index 0b3d2f92..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_angle_paren_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_angle_paren_empty.cfg
deleted file mode 100644
index 1e3c592b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_arith-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_arith-a.cfg
deleted file mode 100644
index 4d60daa9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_arith-a.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_arith = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_arith_additive-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_arith_additive-f.cfg
deleted file mode 100644
index 8e6f0585..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_arith_additive-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_arith_additive-r.cfg
deleted file mode 100644
index e01e86f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_assign_default.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_assign_default.cfg
deleted file mode 100644
index 29411834..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_assign_default.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_assign_default = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_balance_nested_parens.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_balance_nested_parens.cfg
deleted file mode 100644
index 8e9dbb6f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_before_byref_func.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_byref_func.cfg
deleted file mode 100644
index 6f5e2783..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_before_case_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_case_colon.cfg
deleted file mode 100644
index d0bef793..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_case_colon.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_before_case_colon = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_comma-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_comma-f.cfg
deleted file mode 100644
index dc25e313..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_before_constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_constr_colon.cfg
deleted file mode 100644
index 9d0ec317..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_before_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_ellipsis-f.cfg
deleted file mode 100644
index ed701425..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_ellipsis-f.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_before_ellipsis         = force
-
-# Add or remove space between '...' and a parameter pack.
-sp_ellipsis_parameter_pack = force
-
-sp_before_byref            = force
-sp_byref_ellipsis          = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_ellipsis-r.cfg
deleted file mode 100644
index e2163788..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_ellipsis-r.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_before_ellipsis         = remove
-
-# Add or remove space between '...' and a parameter pack.
-sp_ellipsis_parameter_pack = force
-
-sp_before_byref            = force
-sp_byref_ellipsis          = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_ptr_star-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_ptr_star-f.cfg
deleted file mode 100644
index 7653ec0b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_before_ptr_star-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_ptr_star-r.cfg
deleted file mode 100644
index 55f99c73..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_before_tr_emb_cmt-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_tr_emb_cmt-a.cfg
deleted file mode 100644
index 834fd302..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_tr_emb_cmt-a.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_before_tr_cmt                = add
-sp_num_before_tr_cmt            = 2
-sp_before_emb_cmt               = add
-sp_num_before_emb_cmt           = 2
-indent_columns                  = 2
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_tr_emb_cmt-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_tr_emb_cmt-f.cfg
deleted file mode 100644
index 54720c71..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_tr_emb_cmt-f.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_before_tr_cmt                = force
-sp_num_before_tr_cmt            = 2
-sp_before_emb_cmt               = force
-sp_num_before_emb_cmt           = 2
-indent_columns                  = 2
-nl_end_of_file                  = force
-nl_end_of_file_min              = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_type_brace_init_lst_close-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_type_brace_init_lst_close-f.cfg
deleted file mode 100644
index 3dda0281..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_before_type_brace_init_lst_close-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_type_brace_init_lst_close-r.cfg
deleted file mode 100644
index 5fb0bf36..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_bool-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_bool-f.cfg
deleted file mode 100644
index b5a9e09f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_bool-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_bool = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_bool-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_bool-i.cfg
deleted file mode 100644
index ae79b0a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_bool-i.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_bool = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_bool-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_bool-r.cfg
deleted file mode 100644
index 3baee576..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_bool-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_bool = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_brace_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_brace_brace-f.cfg
deleted file mode 100644
index 090c2858..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_brace_brace-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_brace_brace = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_brace_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_brace_brace-r.cfg
deleted file mode 100644
index c652b3cd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_brace_brace-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_brace_brace = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_brace_catch.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_brace_catch.cfg
deleted file mode 100644
index 7ee0209d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_brace_catch.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_brace_catch = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_catch_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_catch_brace.cfg
deleted file mode 100644
index d2da6d91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_catch_brace.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_catch_brace = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cmt.cfg
deleted file mode 100644
index fb7f6ef1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_cmt_cpp_region-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cmt_cpp_region-f.cfg
deleted file mode 100644
index 1c626401..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_cmt_cpp_region-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cmt_cpp_region-r.cfg
deleted file mode 100644
index 67a0ff11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_cond_question-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-f.cfg
deleted file mode 100644
index dd6f0faf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-f.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-#Config file
-sp_cond_question_before = force
-sp_cond_question_after  = force
-
-sp_cond_colon_before    = force
-sp_cond_colon_after     = force
-
-sp_cond_ternary_short   = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-i.cfg
deleted file mode 100644
index d671d519..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-i.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-#Config file
-sp_cond_question_before = ignore
-sp_cond_question_after  = ignore
-
-sp_cond_colon_before    = ignore
-sp_cond_colon_after     = ignore
-
-sp_cond_ternary_short   = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-ir.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-ir.cfg
deleted file mode 100644
index 4a557554..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-ir.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-#Config file
-sp_cond_question_before = ignore
-sp_cond_question_after  = ignore
-
-sp_cond_colon_before    = ignore
-sp_cond_colon_after     = ignore
-
-sp_cond_colon           = remove
-sp_cond_question        = remove
-
-sp_cond_ternary_short   = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-r.cfg
deleted file mode 100644
index 0d013cf7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-r.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-#Config file
-sp_cond_question_before = remove
-sp_cond_question_after  = remove
-
-sp_cond_colon_before    = remove
-sp_cond_colon_after     = remove
-
-sp_cond_ternary_short   = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_constr_colon-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_constr_colon-i.cfg
deleted file mode 100644
index c5cd823a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_constr_colon-i.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_class = true
-sp_before_constr_colon = ignore
-sp_after_constr_colon = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cparen_oparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cparen_oparen-r.cfg
deleted file mode 100644
index f584c02d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_cpp_lambda_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_fparen-f.cfg
deleted file mode 100644
index f45270e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_cpp_lambda_fparen-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_fparen-i.cfg
deleted file mode 100644
index cda81b02..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_fparen-i.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_cpp_lambda_square_paren      = ignore
-sp_cpp_lambda_square_brace      = ignore
-sp_cpp_lambda_fparen            = ignore
-nl_cpp_lambda_leave_one_liners  = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_fparen-r.cfg
deleted file mode 100644
index c64da54c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_cpp_lambda_paren_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_paren_brace-f.cfg
deleted file mode 100644
index f632d9d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_paren_brace-f.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_cpp_lambda_assign       = remove
-sp_cpp_lambda_paren_brace  = force
-sp_cpp_lambda_square_paren = remove
-sp_cpp_lambda_square_brace = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_paren_brace-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_paren_brace-i.cfg
deleted file mode 100644
index 9c8e2748..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_paren_brace-i.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_cpp_lambda_paren_brace = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_paren_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_paren_brace-r.cfg
deleted file mode 100644
index 492af499..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_paren_brace-r.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_cpp_lambda_assign       = remove
-sp_cpp_lambda_paren_brace = remove
-sp_cpp_lambda_square_paren = remove
-sp_cpp_lambda_square_brace = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_brace-f.cfg
deleted file mode 100644
index cc067763..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_brace-f.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_cpp_lambda_assign       = remove
-sp_cpp_lambda_paren_brace  = remove
-sp_cpp_lambda_square_paren = remove
-sp_cpp_lambda_square_brace = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_brace-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_brace-i.cfg
deleted file mode 100644
index a035f41e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_brace-i.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_cpp_lambda_square_brace = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_brace-r.cfg
deleted file mode 100644
index cf703b2f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_brace-r.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_cpp_lambda_assign       = remove
-sp_cpp_lambda_paren_brace  = remove
-sp_cpp_lambda_square_paren = remove
-sp_cpp_lambda_square_brace = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_paren-f.cfg
deleted file mode 100644
index 55ac955d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_paren-f.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_cpp_lambda_assign       = remove
-sp_cpp_lambda_paren_brace  = force
-sp_cpp_lambda_square_paren = force
-sp_cpp_lambda_square_brace = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_paren-i.cfg
deleted file mode 100644
index e8525fe5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_paren-i.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_cpp_lambda_square_paren = ignore
-sp_type_brace_init_lst     = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_paren-r.cfg
deleted file mode 100644
index bcb937c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_paren-r.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-sp_cpp_lambda_assign       = force
-sp_cpp_lambda_paren_brace  = force
-sp_cpp_lambda_square_paren = remove
-sp_cpp_lambda_square_brace = force
-sp_type_brace_init_lst     = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_dc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_dc.cfg
deleted file mode 100644
index c9b14cc2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_decltype_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_decltype_paren-f.cfg
deleted file mode 100644
index 3636cd02..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_decltype_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_decltype_paren-r.cfg
deleted file mode 100644
index b11add96..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_endif_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_endif_cmt.cfg
deleted file mode 100644
index 13ddf4fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_endif_cmt.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_endif_cmt = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_assign-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_assign-f.cfg
deleted file mode 100644
index 37928822..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_assign-f.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_with_tabs      = 0
-sp_enum_after_assign  = ignore
-sp_enum_before_assign = ignore
-sp_enum_assign        = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_assign-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_assign-i.cfg
deleted file mode 100644
index c30b6525..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_assign-i.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_with_tabs      = 0
-sp_enum_after_assign  = ignore
-sp_enum_before_assign = ignore
-sp_enum_assign        = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_colon-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_colon-i.cfg
deleted file mode 100644
index d154830c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_colon-i.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_enum_colon = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_colon-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_colon-r.cfg
deleted file mode 100644
index 87f44474..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_colon-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_enum_colon = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_colon.cfg
deleted file mode 100644
index 27716eca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_colon.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_enum_colon = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_func_call_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_func_call_empty.cfg
deleted file mode 100644
index e6d960bb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_func_call_empty.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-sp_before_byref          = remove
-sp_before_byref_func     = 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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_func_call_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_func_call_paren.cfg
deleted file mode 100644
index c5f8927b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_func_class_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_func_class_empty.cfg
deleted file mode 100644
index eb4aa154..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_func_class_empty.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-sp_before_byref           = remove
-sp_before_byref_func      = 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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_func_def_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_func_def_empty.cfg
deleted file mode 100644
index bb1260ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_func_def_empty.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-sp_before_byref          = remove
-sp_before_byref_func     = 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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_func_proto_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_func_proto_empty.cfg
deleted file mode 100644
index e6da9e5f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_func_proto_empty.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-sp_before_byref           = remove
-sp_before_byref_func      = 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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_empty-r.cfg
deleted file mode 100644
index f7b1b239..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_inside_braces_enum-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_enum-f.cfg
deleted file mode 100644
index bd854828..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_enum-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_inside_braces_enum = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_enum-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_enum-i.cfg
deleted file mode 100644
index a56a9ecb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_enum-i.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_inside_braces_enum = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_enum-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_enum-r.cfg
deleted file mode 100644
index ca8a03a0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_enum-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_inside_braces_enum = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_fparen-r.cfg
deleted file mode 100644
index 98f867f4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_fparen-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_inside_fparen                = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_fparens-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_fparens-f.cfg
deleted file mode 100644
index b56756d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_fparens-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_inside_fparens               = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-f.cfg
deleted file mode 100644
index 72db534b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-f.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_brace_brace                = ignore
-sp_inside_type_brace_init_lst = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-iif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-iif.cfg
deleted file mode 100644
index c42436bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-iif.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_brace_brace                      = ignore 
-sp_before_type_brace_init_lst_close = ignore
-sp_inside_type_brace_init_lst       = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-iii.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-iii.cfg
deleted file mode 100644
index e352ee6c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-iii.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_brace_brace                      = ignore 
-sp_before_type_brace_init_lst_close = ignore
-sp_inside_type_brace_init_lst       = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-irf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-irf.cfg
deleted file mode 100644
index ed72df5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-irf.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_brace_brace                      = ignore 
-sp_before_type_brace_init_lst_close = remove
-sp_inside_type_brace_init_lst       = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-r.cfg
deleted file mode 100644
index b0881eaf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-rf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-rf.cfg
deleted file mode 100644
index cafaab52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-rf.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_brace_brace                = remove 
-sp_inside_type_brace_init_lst = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_brace-f.cfg
deleted file mode 100644
index 8f9206ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_brace-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_paren_brace = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_brace-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_brace-i.cfg
deleted file mode 100644
index f3d0f22d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_brace-i.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_paren_brace = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_brace-r.cfg
deleted file mode 100644
index 7e2fce85..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_brace-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_paren_brace = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_ellipsis-f.cfg
deleted file mode 100644
index 3cc88128..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_ellipsis-f.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Add or remove space between ')' and '...'.
-sp_paren_ellipsis = force
-
-# Add or remove space between '...' and a parameter pack.
-sp_ellipsis_parameter_pack = force
-
-sp_before_byref            = force
-sp_byref_ellipsis          = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_ellipsis-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_ellipsis-i.cfg
deleted file mode 100644
index 093de258..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_ellipsis-i.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Add or remove space between ')' and '...'.
-sp_paren_ellipsis          = ignore
-
-# Add or remove space between '...' and a parameter pack.
-sp_ellipsis_parameter_pack = force
-
-sp_before_byref            = force
-sp_byref_ellipsis          = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_ellipsis-r.cfg
deleted file mode 100644
index 5971dfa8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_ellipsis-r.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Add or remove space between ')' and '...'.
-sp_paren_ellipsis = remove
-
-# Add or remove space between '...' and a parameter pack.
-sp_ellipsis_parameter_pack = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_noexcept-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_noexcept-f.cfg
deleted file mode 100644
index 35e76a33..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_noexcept-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_paren_noexcept = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_qualifier-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_qualifier-f.cfg
deleted file mode 100644
index f91f2aee..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_qualifier-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_paren_qualifier = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-a.cfg
deleted file mode 100644
index 16e78850..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-a.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_return                       = add
-sp_before_emb_cmt               = ignore
-sp_after_emb_cmt                = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-f.cfg
deleted file mode 100644
index b37d9b03..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-f.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_return                       = force
-sp_before_emb_cmt               = ignore
-sp_after_emb_cmt                = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-i.cfg
deleted file mode 100644
index 80d2d26d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-i.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_return                       = ignore
-sp_before_emb_cmt               = ignore
-sp_after_emb_cmt                = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-r.cfg
deleted file mode 100644
index b3d64b3f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-r.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_return                       = remove
-sp_before_emb_cmt               = ignore
-sp_after_emb_cmt                = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_brace-f.cfg
deleted file mode 100644
index bdea1673..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_brace-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_return_brace                 = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_brace-r.cfg
deleted file mode 100644
index a2541527..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_brace-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_return_brace                 = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_paren-f.cfg
deleted file mode 100644
index 11637ca1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_paren-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_return_paren                 = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_paren-r.cfg
deleted file mode 100644
index 8fbef0b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_paren-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_return_paren                 = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis-f.cfg
deleted file mode 100644
index 853db73a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis-f.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_sizeof_ellipsis = force
-
-# Add or remove space between '...' and a parameter pack.
-sp_ellipsis_parameter_pack = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis-i.cfg
deleted file mode 100644
index 48871cc9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis-i.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_sizeof_ellipsis = ignore
-
-# Add or remove space between '...' and a parameter pack.
-sp_ellipsis_parameter_pack = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis-r.cfg
deleted file mode 100644
index 7d1c2068..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis-r.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_sizeof_ellipsis = remove
-
-# Add or remove space between '...' and a parameter pack.
-sp_ellipsis_parameter_pack = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis_paren-f.cfg
deleted file mode 100644
index 46dfb49d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis_paren-f.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_sizeof_ellipsis_paren = force
-
-# Add or remove space between '...' and a parameter pack.
-sp_ellipsis_parameter_pack = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis_paren-i.cfg
deleted file mode 100644
index 2b7d0b44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis_paren-i.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_sizeof_ellipsis_paren = ignore
-
-# Add or remove space between '...' and a parameter pack.
-sp_ellipsis_parameter_pack = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis_paren-r.cfg
deleted file mode 100644
index 27953868..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis_paren-r.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_sizeof_ellipsis_paren = remove
-
-# Add or remove space between '...' and a parameter pack.
-sp_ellipsis_parameter_pack = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_skip_vbrace_tokens.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_skip_vbrace_tokens.cfg
deleted file mode 100644
index d5ce739d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_throw_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_throw_paren-f.cfg
deleted file mode 100644
index 611cd750..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_throw_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_throw_paren-r.cfg
deleted file mode 100644
index 893c8782..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_trailing_return-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_trailing_return-f.cfg
deleted file mode 100644
index 9e1fe074..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_trailing_return-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_trailing_return = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_trailing_return-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_trailing_return-r.cfg
deleted file mode 100644
index b26929ba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_trailing_return-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_trailing_return = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_brace_init_lst-f.cfg
deleted file mode 100644
index 2f0d5258..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_brace_init_lst-r.cfg
deleted file mode 100644
index 199dc1eb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_type_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_ellipsis-f.cfg
deleted file mode 100644
index 888a68b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_ellipsis-f.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_type_ellipsis           = force
-
-# Add or remove space between '...' and a parameter pack.
-sp_ellipsis_parameter_pack = force
-
-sp_parameter_pack_ellipsis = force
-sp_before_byref            = force
-sp_byref_ellipsis          = force
-sp_ptr_type_ellipsis       = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_ellipsis-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_ellipsis-i.cfg
deleted file mode 100644
index f6cb6d0c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_ellipsis-i.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_type_ellipsis = ignore
-
-# Add or remove space between '...' and a parameter pack.
-sp_ellipsis_parameter_pack = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_ellipsis-r.cfg
deleted file mode 100644
index bf831e30..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_ellipsis-r.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_type_ellipsis           = remove
-
-# Add or remove space between '...' and a parameter pack.
-sp_ellipsis_parameter_pack = force
-
-sp_parameter_pack_ellipsis = force
-sp_before_byref            = force
-sp_byref_ellipsis          = force
-sp_ptr_type_ellipsis       = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_func-1.cfg
deleted file mode 100644
index 010876e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_type_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_func-2.cfg
deleted file mode 100644
index de86218b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_type_func-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_func-f.cfg
deleted file mode 100644
index e8e5f08a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_func-f.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_type_func           = force
-sp_after_byref_func    = force
-sp_after_ptr_star_func = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_func-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_func-r.cfg
deleted file mode 100644
index 62324f98..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_func-r.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_type_func           = remove
-sp_after_byref_func    = remove
-sp_after_ptr_star_func = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_word_brace_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_word_brace_force.cfg
deleted file mode 100644
index d9c53345..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/sp_word_brace_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_word_brace_remove.cfg
deleted file mode 100644
index 3fd1fa26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/space_indent_class-t_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/space_indent_class-t_columns-4.cfg
deleted file mode 100644
index a454237c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/squeeze_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/squeeze_ifdef.cfg
deleted file mode 100644
index fa3f980c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/squeeze_ifdef_top.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/squeeze_ifdef_top.cfg
deleted file mode 100644
index 6b45f49a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/star_pos-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/star_pos-1.cfg
deleted file mode 100644
index 6c9f5806..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/star_pos-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/star_pos-2.cfg
deleted file mode 100644
index dc1f45fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/string_replace_tab_chars-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/string_replace_tab_chars-t.cfg
deleted file mode 100644
index 9e36729d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/tab-0-11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/tab-0-11.cfg
deleted file mode 100644
index 96f745a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/template_sp-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/template_sp-force.cfg
deleted file mode 100644
index 852277ca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/template_sp-force.cfg
+++ /dev/null
@@ -1,20 +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
-sp_angle_word                   = force
-indent_columns                  = 3
-indent_class                    = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/template_sp-ignore.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/template_sp-ignore.cfg
deleted file mode 100644
index b5bbb248..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/template_sp-ignore.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_template_angle = ignore
-sp_before_angle   = ignore
-sp_inside_angle   = ignore
-sp_after_angle    = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/template_sp-remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/template_sp-remove.cfg
deleted file mode 100644
index 5e20f3b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/template_sp-remove.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-tok_split_gte           = true
-sp_arith                = force
-sp_compare              = force
-sp_before_byref         = remove
-sp_after_byref          = force
-sp_inside_angle_empty   = 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
-sp_cparen_oparen        = remove
-sp_angle_word           = remove
-indent_columns          = 3
-indent_class            = true
-
-sp_template_angle       = remove
-sp_before_angle         = remove
-sp_inside_angle         = remove
-sp_after_angle          = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/templates-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/templates-i.cfg
deleted file mode 100644
index 25622a57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/templates-i.cfg
+++ /dev/null
@@ -1,20 +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                  = ignore
-sp_angle_paren_empty            = force
-sp_after_operator               = force
-sp_inside_braces_struct         = force
-sp_inside_braces                = force
-sp_func_proto_paren             = remove
-sp_angle_word                   = force
-indent_columns                  = 3
-indent_class                    = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/templates-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/templates-r.cfg
deleted file mode 100644
index 7efd2a7d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/templates-r.cfg
+++ /dev/null
@@ -1,20 +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                  = remove
-sp_angle_paren_empty            = force
-sp_after_operator               = force
-sp_inside_braces_struct         = force
-sp_inside_braces                = force
-sp_func_proto_paren             = remove
-sp_angle_word                   = force
-indent_columns                  = 3
-indent_class                    = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/toggle_processing_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/toggle_processing_cmt.cfg
deleted file mode 100644
index 08ef987e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/toggle_processing_cmt2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/toggle_processing_cmt2.cfg
deleted file mode 100644
index 0b9be532..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/toggle_processing_cmt3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/toggle_processing_cmt3.cfg
deleted file mode 100644
index d7f1f675..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/toggle_processing_cmt4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/toggle_processing_cmt4.cfg
deleted file mode 100644
index ccd7bb03..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/var_def_gap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/var_def_gap.cfg
deleted file mode 100644
index 3d77d117..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cpp/wessex.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/wessex.cfg
deleted file mode 100644
index 77fc3303..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/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.74.0/tests/config/cs/615_nested_usings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/615_nested_usings.cfg
deleted file mode 100644
index ae152fd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/615_nested_usings.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_using_block = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/620_getset-brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/620_getset-brace.cfg
deleted file mode 100644
index 8e5510d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/625_where-constraints.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/625_where-constraints.cfg
deleted file mode 100644
index a6fa8175..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/Issue_2705.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/Issue_2705.cfg
deleted file mode 100644
index 0a3ecb71..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/Issue_2705.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_remove_empty_return         = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U-J.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U-J.cfg
deleted file mode 100644
index 21e55d74..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/U01-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U01-Cs.cfg
deleted file mode 100644
index 4edc0426..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U01-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_between_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.74.0/tests/config/cs/U02-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U02-Cs.cfg
deleted file mode 100644
index c7d6aeda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/U03-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U03-Cs.cfg
deleted file mode 100644
index 24961370..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/U04-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U04-Cs.cfg
deleted file mode 100644
index b331f6f8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/U06-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U06-Cs.cfg
deleted file mode 100644
index 03c2c765..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/U07-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U07-Cs.cfg
deleted file mode 100644
index 62ee120e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U07-Cs.cfg
+++ /dev/null
@@ -1,283 +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_between_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.74.0/tests/config/cs/U08-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U08-Cpp.cfg
deleted file mode 100644
index 1a8d9ead..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U08-Cpp.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_func_proto_paren = remove
-sp_before_byref     = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U08-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U08-Cs.cfg
deleted file mode 100644
index 2378cb43..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U08-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=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_between_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.74.0/tests/config/cs/U09-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U09-Cpp.cfg
deleted file mode 100644
index e8b4846a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/U09-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U09-Cs.cfg
deleted file mode 100644
index d74080d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/U10-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U10-Cpp.cfg
deleted file mode 100644
index 76c1c8c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/U10-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U10-Cs.cfg
deleted file mode 100644
index 42254ddb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/U11-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U11-Cpp.cfg
deleted file mode 100644
index 07ba9e26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/U11-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U11-Cs.cfg
deleted file mode 100644
index 70557c46..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/U12-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U12-Cpp.cfg
deleted file mode 100644
index 581594ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/U13-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U13-Cpp.cfg
deleted file mode 100644
index 162b13d4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/U13-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U13-Cs.cfg
deleted file mode 100644
index 75f78b42..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U13-Cs.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_columns                  = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U14-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U14-Cpp.cfg
deleted file mode 100644
index 967ea74d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U14-Cpp.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_func_proto_paren             = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U15-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U15-Cpp.cfg
deleted file mode 100644
index 0d78de45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/U15-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U15-Cs.cfg
deleted file mode 100644
index 5a700342..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/U24-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U24-Cpp.cfg
deleted file mode 100644
index bc46ae54..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-11095.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-11095.cfg
deleted file mode 100644
index f5cc4ceb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-11095.cfg
+++ /dev/null
@@ -1,319 +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_between_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.74.0/tests/config/cs/UNI-11662.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-11662.cfg
deleted file mode 100644
index 24cf86a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-11993.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-11993.cfg
deleted file mode 100644
index 79b2e445..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-11993.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_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_between_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.74.0/tests/config/cs/UNI-1288.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1288.cfg
deleted file mode 100644
index 3b6cf1b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-1338.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1338.cfg
deleted file mode 100644
index 0eef21b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-1343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1343.cfg
deleted file mode 100644
index f5276e1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-13955.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-13955.cfg
deleted file mode 100644
index d1c7c955..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-14131.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-14131.cfg
deleted file mode 100644
index 7c5535ea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-18437.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-18437.cfg
deleted file mode 100644
index a40e16a6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-18437.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_between_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.74.0/tests/config/cs/UNI-18829.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-18829.cfg
deleted file mode 100644
index d65f6b27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-1975.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1975.cfg
deleted file mode 100644
index 80528dc6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-1977.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1977.cfg
deleted file mode 100644
index 4563bfde..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-1978.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1978.cfg
deleted file mode 100644
index 2cf794e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-19895.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-19895.cfg
deleted file mode 100644
index ac4012d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-2020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-2020.cfg
deleted file mode 100644
index 0d78de45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-2021.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-2021.cfg
deleted file mode 100644
index 827d33e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-21730.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-21730.cfg
deleted file mode 100644
index 5443f32f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-2684.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-2684.cfg
deleted file mode 100644
index c048c827..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-2685.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-2685.cfg
deleted file mode 100644
index 3f25a1fa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-29933.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-29933.cfg
deleted file mode 100644
index 2f136516..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-30498_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-30498_2.cfg
deleted file mode 100644
index 8f635e72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-3083.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-3083.cfg
deleted file mode 100644
index 80528dc6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/UNI-32658.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-32658.cfg
deleted file mode 100644
index 9333a9c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-32658.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_between_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.74.0/tests/config/cs/UNI-37241.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-37241.cfg
deleted file mode 100644
index ad1ac1cc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-37241.cfg
+++ /dev/null
@@ -1,287 +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_between_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.74.0/tests/config/cs/UNI-9917.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-9917.cfg
deleted file mode 100644
index f1fd0af3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/ben_032.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_032.cfg
deleted file mode 100644
index e99f12ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/ben_033.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_033.cfg
deleted file mode 100644
index 3f1ffc6c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/ben_034.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_034.cfg
deleted file mode 100644
index 0681b1b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/ben_036.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_036.cfg
deleted file mode 100644
index 5a5f216b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/ben_037.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_037.cfg
deleted file mode 100644
index 97daab41..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/ben_038.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_038.cfg
deleted file mode 100644
index 4384cfbd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/ben_043.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_043.cfg
deleted file mode 100644
index fcbc9ddc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/ben_044.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_044.cfg
deleted file mode 100644
index 6815087d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/ben_045.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_045.cfg
deleted file mode 100644
index 3ff68ef5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/bug_1620.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/bug_1620.cfg
deleted file mode 100644
index 6b14154d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/bug_1620.cfg
+++ /dev/null
@@ -1,289 +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_between_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.74.0/tests/config/cs/bug_1637.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/bug_1637.cfg
deleted file mode 100644
index d083d613..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/bug_1637.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_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_between_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.74.0/tests/config/cs/bug_1650.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/bug_1650.cfg
deleted file mode 100644
index 730c4250..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/bug_1650.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_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_between_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.74.0/tests/config/cs/bug_620.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/bug_620.cfg
deleted file mode 100644
index 4486cd45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/comma-cs-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/comma-cs-f.cfg
deleted file mode 100644
index 6ea5a2af..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/comma-cs-f.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_after_comma            = force
-sp_after_mdatype_commas   = force
-sp_before_mdatype_commas  = force
-sp_between_mdatype_commas = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/comma-cs-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/comma-cs-i.cfg
deleted file mode 100644
index f78c61b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/comma-cs-i.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_after_comma            = ignore
-sp_after_mdatype_commas   = ignore
-sp_before_mdatype_commas  = ignore
-sp_between_mdatype_commas = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/comma-cs-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/comma-cs-r.cfg
deleted file mode 100644
index 626b6ff1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/comma-cs-r.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-sp_after_comma            = remove
-sp_after_mdatype_commas   = remove
-sp_before_mdatype_commas  = remove
-sp_between_mdatype_commas = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/cs_generics.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/cs_generics.cfg
deleted file mode 100644
index e4320a80..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/getset.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/getset.cfg
deleted file mode 100644
index 1e1ab8e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/indent-multistring-coulmn1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/indent-multistring-coulmn1.cfg
deleted file mode 100644
index 8ce9a4ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/indent-multistring-coulmn1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-indent_col1_multi_string_literal = True
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/indent_cs_delegate_brace-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/indent_cs_delegate_brace-t.cfg
deleted file mode 100644
index 9a4e6382..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/indent_using_block-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/indent_using_block-f.cfg
deleted file mode 100644
index 2bfca802..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/mda_space_a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mda_space_a.cfg
deleted file mode 100644
index b05558b7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/mda_space_c.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mda_space_c.cfg
deleted file mode 100644
index 9bfcef37..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/misc-failures.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/misc-failures.cfg
deleted file mode 100644
index 36b9e694..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-0.cfg
deleted file mode 100644
index c187d46a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-1.cfg
deleted file mode 100644
index 800ba158..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/mod_full_paren_if_bool.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mod_full_paren_if_bool.cfg
deleted file mode 100644
index f75f8801..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/mod_sort_using-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mod_sort_using-t.cfg
deleted file mode 100644
index 805fc734..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/mono.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mono.cfg
deleted file mode 100644
index 726b1eda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/new-constraint-paren-space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/new-constraint-paren-space.cfg
deleted file mode 100644
index f96e03b6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/new-constraint-paren-space.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_new=force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/sf607.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/sf607.cfg
deleted file mode 100644
index ac5c0069..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/sort_using_categ.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/sort_using_categ.cfg
deleted file mode 100644
index bf7f26e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/sp_after_comma-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/sp_after_comma-a.cfg
deleted file mode 100644
index 3f67ae0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/sp_assign-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/sp_assign-a.cfg
deleted file mode 100644
index 78ee09f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/sp_between_new_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/sp_between_new_paren.cfg
deleted file mode 100644
index 0a338bd2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/squeeze-paren-close-Option.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/squeeze-paren-close-Option.cfg
deleted file mode 100644
index 9d4a4f70..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/tcf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/tcf.cfg
deleted file mode 100644
index dd7fa193..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/cs/verbatim_strings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/verbatim_strings.cfg
deleted file mode 100644
index 65e1756d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/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.74.0/tests/config/d/1438.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/1438.cfg
deleted file mode 100644
index 6973c22f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/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.74.0/tests/config/d/d-tst2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d-tst2.cfg
deleted file mode 100644
index db15aa59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/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.74.0/tests/config/d/d2-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d2-i.cfg
deleted file mode 100644
index b2f0f87a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d2-i.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_template_paren = ignore
-indent_columns           = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d2-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d2-r.cfg
deleted file mode 100644
index 888247f8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d2-r.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_template_paren = remove
-indent_columns           = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d2.cfg
deleted file mode 100644
index e7a7bca1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d2.cfg
+++ /dev/null
@@ -1,49 +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_inside_for                   = 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.74.0/tests/config/d/d3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d3.cfg
deleted file mode 100644
index 53a311b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/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.74.0/tests/config/d/d3a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d3a.cfg
deleted file mode 100644
index f3cf7bb8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/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.74.0/tests/config/d/d_sp_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d_sp_paren.cfg
deleted file mode 100644
index 5b3443e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/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.74.0/tests/config/d/invariant.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/invariant.cfg
deleted file mode 100644
index a462b4d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/invariant.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_invariant_paren = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/libd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/libd.cfg
deleted file mode 100644
index a29c77a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/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.74.0/tests/config/d/sp_after_type-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/sp_after_type-a.cfg
deleted file mode 100644
index da7a3edb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/sp_after_type-a.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_type                   = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/ecma/ben_098.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/ecma/ben_098.cfg
deleted file mode 100644
index 9dddd073..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/ecma/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.74.0/tests/config/java/Issue_1122.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_1122.cfg
deleted file mode 100644
index 8a152eda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_1122.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_before_throw = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_1124-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_1124-f.cfg
deleted file mode 100644
index bec692b6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/Issue_1124-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_1124-r.cfg
deleted file mode 100644
index 1c610373..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/Issue_1845.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_1845.cfg
deleted file mode 100644
index 5d339f68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_1845.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_after_annotation = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_670.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_670.cfg
deleted file mode 100644
index 504b1d7d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/annotation.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/annotation.cfg
deleted file mode 100644
index 0d800a82..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/ben_099.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/ben_099.cfg
deleted file mode 100644
index 6cd10860..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/doxy-javadoc-alignment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/doxy-javadoc-alignment.cfg
deleted file mode 100644
index 786a9ac7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/java_foreach.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/java_foreach.cfg
deleted file mode 100644
index 56ec94cd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/java_synchronized_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/java_synchronized_1.cfg
deleted file mode 100644
index e57bba91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/java_synchronized_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/java_synchronized_2.cfg
deleted file mode 100644
index 3512cdc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/jdbi-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/jdbi-f.cfg
deleted file mode 100644
index fde00f38..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/jdbi-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/jdbi-r.cfg
deleted file mode 100644
index ed2a6942..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/leading-tabs-for-java-lambda.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/leading-tabs-for-java-lambda.cfg
deleted file mode 100644
index ba1f063e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/mod_add_long_class_closebrace_comment-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/mod_add_long_class_closebrace_comment-1.cfg
deleted file mode 100644
index c1e8e0ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/nl_after_annotation-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/nl_after_annotation-f.cfg
deleted file mode 100644
index 405f8ef4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/nl_between_annotation-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/nl_between_annotation-f.cfg
deleted file mode 100644
index 6a67c354..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/reflow_fold_regex.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/reflow_fold_regex.txt
deleted file mode 100644
index 9a24626f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/sp_after_for_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/sp_after_for_colon.cfg
deleted file mode 100644
index 70b19e50..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/sp_after_for_colon.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_for_colon = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/sp_this_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/sp_this_paren.cfg
deleted file mode 100644
index fc80bb28..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/java/template_angles.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/template_angles.cfg
deleted file mode 100644
index 14680e53..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/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.74.0/tests/config/oc/1927.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/1927.cfg
deleted file mode 100644
index 3734f63d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/Issue_2172.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/Issue_2172.cfg
deleted file mode 100644
index a4da88d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/Issue_681.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/Issue_681.cfg
deleted file mode 100644
index 901b0c8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/align-objc-like-xcode.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/align-objc-like-xcode.cfg
deleted file mode 100644
index 3b321b11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/align_oc_msg_colon_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/align_oc_msg_colon_span-1.cfg
deleted file mode 100644
index 9681d152..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/block_pointer.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/block_pointer.cfg
deleted file mode 100644
index 70c21bbd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/blocks.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/blocks.cfg
deleted file mode 100644
index 74ed7e4f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/bug_167.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/bug_167.cfg
deleted file mode 100644
index 6ed02f2e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/bug_340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/bug_340.cfg
deleted file mode 100644
index f56e7a43..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/bug_841.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/bug_841.cfg
deleted file mode 100644
index 2ab54cc1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/bug_i_125-412.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/bug_i_125-412.cfg
deleted file mode 100644
index 2498ac1b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/delete-space-oc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/delete-space-oc.cfg
deleted file mode 100644
index 4d8a15cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/delete-space-oc.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_oc_colon = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/double-indent-objc-dict.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/double-indent-objc-dict.cfg
deleted file mode 100644
index d4e9a1ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/double_angle_space_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/double_angle_space_1.cfg
deleted file mode 100644
index 73319da9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/double_angle_space_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/double_angle_space_2.cfg
deleted file mode 100644
index 8d12b193..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/double_angle_space_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/double_angle_space_3.cfg
deleted file mode 100644
index da6a41c2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/gh137.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/gh137.cfg
deleted file mode 100644
index 83da02ee..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/gh293.a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/gh293.a.cfg
deleted file mode 100644
index e875a54b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/gh293.b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/gh293.b.cfg
deleted file mode 100644
index 1dc357ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/indent-objc-block.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/indent-objc-block.cfg
deleted file mode 100644
index aee5aace..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/indent_boxed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/indent_boxed.cfg
deleted file mode 100644
index e20f0820..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/indent_oc_inside_msg_sel.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/indent_oc_inside_msg_sel.cfg
deleted file mode 100644
index b140f071..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/indent_single_newline.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/indent_single_newline.cfg
deleted file mode 100644
index 1496b522..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/issue_2643.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/issue_2643.cfg
deleted file mode 100644
index 7f188f21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/issue_2656.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/issue_2656.cfg
deleted file mode 100644
index 3b020c33..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/issue_2675.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/issue_2675.cfg
deleted file mode 100644
index 0eab0244..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/issue_3031.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/issue_3031.cfg
deleted file mode 100644
index 8234c643..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/mod_sort_incl_import_grouping_enabled.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/mod_sort_incl_import_grouping_enabled.cfg
deleted file mode 100644
index d88bf262..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/mod_sort_incl_import_ignore_extension.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/mod_sort_incl_import_ignore_extension.cfg
deleted file mode 100644
index d49491cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/mod_sort_incl_import_prioritize_angle_over_quotes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/mod_sort_incl_import_prioritize_angle_over_quotes.cfg
deleted file mode 100644
index 475ab734..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/mod_sort_incl_import_prioritize_extensionless.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/mod_sort_incl_import_prioritize_extensionless.cfg
deleted file mode 100644
index aa9eb1db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/mod_sort_incl_import_prioritize_filename.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/mod_sort_incl_import_prioritize_filename.cfg
deleted file mode 100644
index 2661a68a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/nl_after_func_body-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/nl_after_func_body-3.cfg
deleted file mode 100644
index 65f1fa5a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/nl_brace_square.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/nl_brace_square.cfg
deleted file mode 100644
index e0f11f90..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/nl_func_call_args_multi_line_ignore_closures.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/nl_func_call_args_multi_line_ignore_closures.cfg
deleted file mode 100644
index e480140e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/nl_oc_block_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/nl_oc_block_brace-f.cfg
deleted file mode 100644
index 824fc747..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/obj-c-available.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/obj-c-available.cfg
deleted file mode 100644
index f77790fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/obj-c-properties.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/obj-c-properties.cfg
deleted file mode 100644
index 98241779..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/objc_bug_497.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/objc_bug_497.cfg
deleted file mode 100644
index 0015f97d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/objc_complex_method.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/objc_complex_method.cfg
deleted file mode 100644
index 3e713117..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc1.cfg
deleted file mode 100644
index 659131cf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc10.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc10.cfg
deleted file mode 100644
index d50a20d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc11.cfg
deleted file mode 100644
index e355d765..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc12.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc12.cfg
deleted file mode 100644
index 4f069fed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc13.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc13.cfg
deleted file mode 100644
index 925a2739..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc14.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc14.cfg
deleted file mode 100644
index a44950db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc16.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc16.cfg
deleted file mode 100644
index 5eec46e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc17.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc17.cfg
deleted file mode 100644
index 18b27823..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc18.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc18.cfg
deleted file mode 100644
index 96003cf5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc19.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc19.cfg
deleted file mode 100644
index d68c95f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc2.cfg
deleted file mode 100644
index 43d02a66..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc4.cfg
deleted file mode 100644
index f2de050e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc5.cfg
deleted file mode 100644
index 77a7a7af..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc6.cfg
deleted file mode 100644
index c1bcd8d4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc7.cfg
deleted file mode 100644
index 972ab19a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc8.cfg
deleted file mode 100644
index 3f577ab8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc9.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc9.cfg
deleted file mode 100644
index 92ed39d4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc_bug_1674.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc_bug_1674.cfg
deleted file mode 100644
index 31e4537c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc_bug_1683.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc_bug_1683.cfg
deleted file mode 100644
index b5d4249d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/oc_cond_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc_cond_colon.cfg
deleted file mode 100644
index b86516e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_after_oc_at_sel_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_at_sel_add.cfg
deleted file mode 100644
index 817ec7c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_after_oc_at_sel_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_at_sel_force.cfg
deleted file mode 100644
index b2a79b8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_after_oc_at_sel_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_at_sel_remove.cfg
deleted file mode 100644
index 98b6de42..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_after_oc_block_caret_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_block_caret_add.cfg
deleted file mode 100644
index 56e22330..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_after_oc_block_caret_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_block_caret_force.cfg
deleted file mode 100644
index 516271f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_after_oc_return_type_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_return_type_add.cfg
deleted file mode 100644
index b321b9aa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_after_oc_return_type_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_return_type_force.cfg
deleted file mode 100644
index fb8b9a1b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_after_oc_return_type_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_return_type_remove.cfg
deleted file mode 100644
index 1110a1eb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_after_send_oc_colon-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_send_oc_colon-f.cfg
deleted file mode 100644
index 2a54dd6f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_after_throw_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_throw_remove.cfg
deleted file mode 100644
index 6b6bc0ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_before_oc_block_caret_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_before_oc_block_caret_force.cfg
deleted file mode 100644
index 727fcf06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_before_oc_block_caret_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_before_oc_block_caret_remove.cfg
deleted file mode 100644
index 37c6104a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_before_oc_proto_list_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_before_oc_proto_list_add.cfg
deleted file mode 100644
index 3374e228..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_before_oc_proto_list_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_before_oc_proto_list_force.cfg
deleted file mode 100644
index 5be78fac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_before_oc_proto_list_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_before_oc_proto_list_remove.cfg
deleted file mode 100644
index 9f93f4a5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_block_as_argument.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_block_as_argument.cfg
deleted file mode 100644
index 60c651fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_block_as_argument2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_block_as_argument2.cfg
deleted file mode 100644
index 8f297d7d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_block_as_argument3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_block_as_argument3.cfg
deleted file mode 100644
index 17059e47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_block_as_argument4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_block_as_argument4.cfg
deleted file mode 100644
index 8caf60bc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_block_as_argument5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_block_as_argument5.cfg
deleted file mode 100644
index 42e8c380..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_cond_ternary_short.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_cond_ternary_short.cfg
deleted file mode 100644
index 564b2dcf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_cond_ternary_short.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_cond_ternary_short = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_enum_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_enum_paren-i.cfg
deleted file mode 100644
index 5bb98ec2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_enum_paren-i.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_enum_paren = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_enum_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_enum_paren-r.cfg
deleted file mode 100644
index f155e201..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_oc_boxed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_boxed.cfg
deleted file mode 100644
index 73939de1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_oc_catch-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_catch-i.cfg
deleted file mode 100644
index 98e8f829..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_catch-i.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-sp_oc_catch_paren = ignore
-sp_catch_paren    = add
-sp_oc_catch_brace = add
-sp_catch_brace    = force
-sp_oc_brace_catch = add
-sp_brace_catch    = force
-nl_oc_catch_brace = remove
-nl_catch_brace    = remove
-nl_oc_brace_catch = add
-nl_brace_catch    = remove
-sp_finally_brace  = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_catch-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_catch-r.cfg
deleted file mode 100644
index 789e2872..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_catch-r.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-sp_oc_catch_paren = remove
-sp_catch_paren    = add
-sp_oc_catch_brace = add
-sp_catch_brace    = force
-sp_oc_brace_catch = add
-sp_brace_catch    = force
-nl_oc_catch_brace = remove
-nl_catch_brace    = remove
-nl_oc_brace_catch = add
-nl_brace_catch    = remove
-sp_finally_brace  = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_catch.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_catch.cfg
deleted file mode 100644
index 7367541a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_oc_classname_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_classname_paren-r.cfg
deleted file mode 100644
index ba92279e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/sp_oc_synchronized.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_synchronized.cfg
deleted file mode 100644
index 5056f70f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/oc/ternary_short.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/ternary_short.cfg
deleted file mode 100644
index 55e708cf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/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.74.0/tests/config/pawn/Issue_2586.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/Issue_2586.cfg
deleted file mode 100644
index ff46f80d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/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.74.0/tests/config/pawn/Issue_2665.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/Issue_2665.cfg
deleted file mode 100644
index 763864c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/Issue_2665.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_end_of_file    = remove
-sp_func_def_paren = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/amxmodx.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/amxmodx.cfg
deleted file mode 100644
index 2c87c362..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/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.74.0/tests/config/pawn/mod_full_brace_function-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/mod_full_brace_function-f.cfg
deleted file mode 100644
index 8d44cc3b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/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.74.0/tests/config/pawn/pawn-escape.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/pawn-escape.cfg
deleted file mode 100644
index 8d10ec23..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/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.74.0/tests/config/pawn/pawn.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/pawn.cfg
deleted file mode 100644
index 7859328a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/pawn.cfg
+++ /dev/null
@@ -1,16 +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
-sp_func_call_paren              = remove
-#sp_func_call_paren              = 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.74.0/tests/config/staging/UNI-58354.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/staging/UNI-58354.cfg
deleted file mode 100644
index fb9ca61b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/staging/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.74.0/tests/config/staging/UNI-64325.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/staging/UNI-64325.cfg
deleted file mode 100644
index 44ee8b48..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/staging/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.74.0/tests/config/vala/Issue_2090.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/Issue_2090.cfg
deleted file mode 100644
index f6e8529b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/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.74.0/tests/config/vala/Issue_2270.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/Issue_2270.cfg
deleted file mode 100644
index 43cc3757..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/Issue_2270.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_vala_after_translation = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_100.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_100.cfg
deleted file mode 100644
index 81cd4430..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_100.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-sp_inside_sparen                = remove
-sp_inside_for                   = 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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_101.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_101.cfg
deleted file mode 100644
index 50078f96..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/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.74.0/tests/config/vala/ben_102.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_102.cfg
deleted file mode 100644
index 82fa033c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/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.74.0/tests/config/vala/ben_103.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_103.cfg
deleted file mode 100644
index 3d212ad4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/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.74.0/tests/config/vala/ben_104.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_104.cfg
deleted file mode 100644
index 80870cfe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/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.74.0/tests/config/vala/ben_105.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_105.cfg
deleted file mode 100644
index 23452bfd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_105.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-sp_inside_paren                 = remove
-sp_after_cast                   = remove
-sp_func_def_paren               = remove
-sp_func_call_paren              = remove
-indent_columns                  = 3
-indent_switch_body              = 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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cpp.test b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cpp.test
deleted file mode 100644
index 87620719..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cpp.test
+++ /dev/null
@@ -1,1047 +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  common/clark.cfg                                     cpp/indent-c.cpp
-02103  common/clark.cfg                                     cpp/output.cpp
-
-30000  cpp/ben_001.cfg                                      cpp/cout.cpp
-30001  cpp/sp_angle_colon.cfg                               cpp/alt_tokens.cpp
-30002  cpp/ben_003.cfg                                      cpp/constructor.cpp
-30003  cpp/ben_004.cfg                                      cpp/strings.cpp
-
-30010  cpp/ben_005.cfg                                      cpp/class.h
-30011  cpp/ben_006.cfg                                      cpp/misc.cpp
-30012  cpp/avalon2.cfg                                      cpp/misc2.cpp
-30013  cpp/sim.cfg                                          cpp/sim.h
-30014  common/indent_columns-3.cfg                          cpp/ctor-var.cpp
-30015  cpp/ben_008.cfg                                      cpp/exception.cpp
-30016  cpp/custom-open.cfg                                  cpp/custom-open.cpp
-30017  cpp/custom-open2.cfg                                 cpp/custom-open.cpp
-30018  cpp/ben_009.cfg                                      cpp/class-addr.h
-30019  cpp/ben_010.cfg                                      cpp/wacky-template.cpp
-
-30020  common/ben_011.cfg                                   cpp/bool.cpp
-30021  cpp/ben_012.cfg                                      cpp/byref.cpp
-30022  cpp/ben_013.cfg                                      cpp/extern_c.h
-30023  cpp/ben_014.cfg                                      cpp/templates.cpp
-30024  cpp/class-nl_func-add.cfg                            cpp/class-init.cpp
-30025  cpp/class-nl_func-del.cfg                            cpp/class-init.cpp
-30026  cpp/byref-left.cfg                                   cpp/byref.cpp
-30027  cpp/byref-right.cfg                                  cpp/byref.cpp
-30028  cpp/byref-center.cfg                                 cpp/byref.cpp
-30029  cpp/ben_015.cfg                                      cpp/init_align.h
-
-30030  cpp/avalon.cfg                                       cpp/Timestamp.h
-30031  cpp/avalon.cfg                                       cpp/operator.cpp
-30032  cpp/op-space-force.cfg                               cpp/operator.cpp
-30033  cpp/op-space-remove.cfg                              cpp/operator.cpp
-30034  cpp/op-space-force.cfg                               cpp/operator_proto.cpp
-30035  cpp/op-space-remove.cfg                              cpp/operator_proto.cpp
-30036  cpp/op-space-remove-align-1.cfg                      cpp/operator.cpp
-30037  cpp/op-space-remove-align-1.cfg                      cpp/operator_proto.cpp
-30038  cpp/op-space-remove-align-2.cfg                      cpp/operator.cpp
-30039  cpp/op-space-remove-align-2.cfg                      cpp/operator_proto.cpp
-
-30040  cpp/nl_class-r.cfg                                   cpp/nl-class.h
-30041  cpp/nl_class-a.cfg                                   cpp/nl-class.h
-30042  cpp/Issue_2020.cfg                                   cpp/Issue_2020.cpp
-30043  cpp/nl_func_call_empty-r.cfg                         cpp/nl_func_call_empty.cpp
-30044  cpp/nl_func_call_paren_empty-r.cfg                   cpp/nl_func_call_paren_empty.cpp
-30045  cpp/nl_func_decl_1.cfg                               cpp/nl_func_decl.cpp
-30046  cpp/nl_func_decl_2.cfg                               cpp/nl_func_decl.cpp
-30047  cpp/nl_func_paren_empty.cfg                          cpp/nl_func_paren_empty.cpp
-30048  cpp/nl_func_def_paren_empty-r.cfg                    cpp/nl_func_def_paren_empty.cpp
-30049  cpp/nl_func_call_paren-f.cfg                         cpp/nl_func_call_paren.cpp
-
-30050  cpp/nl_namespace-r.cfg                               cpp/nl-namespace.h
-30051  cpp/nl_namespace-a.cfg                               cpp/nl-namespace.h
-30052  cpp/nl_try-a.cfg                                     cpp/try-catch-nl.cpp
-30053  cpp/sp_catch_brace.cfg                               cpp/exception.cpp
-30054  cpp/Issue_2091.cfg                                   cpp/Issue_2091.cpp
-30055  cpp/nl_after_func_body.cfg                           cpp/nl_func.cpp
-30056  cpp/nl_after_func_body-2.cfg                         cpp/nl_func.cpp
-30057  cpp/nl_inside_namespace_1.cfg                        cpp/nl_inside_namespace.cpp
-30058  cpp/nl_inside_namespace_2.cfg                        cpp/nl_inside_namespace.cpp
-30059  cpp/Issue_2186.cfg                                   cpp/Issue_2186.cpp
-
-30060  cpp/Issue_1734.cfg                                   cpp/Issue_1734.cpp
-
-# Class colon positioning
-30061  cpp/class-colon-pos-eol.cfg                          cpp/class-init.cpp
-30062  cpp/class-colon-pos-sol.cfg                          cpp/class-init.cpp
-30063  cpp/class-colon-pos-eol-add.cfg                      cpp/class-init.cpp
-30064  cpp/class-colon-pos-sol-add.cfg                      cpp/class-init.cpp
-30065  cpp/class-colon-pos-sol.cfg                          cpp/Example.h
-30066  cpp/class-on-colon-indent.cfg                        cpp/class-init.cpp
-30067  cpp/nl_func_class_scope-a.cfg                        cpp/nl_func_type_name.cpp
-30068  cpp/nl_func_class_scope-a.cfg                        cpp/nl_func_scope_name.cpp
-30069  cpp/nl_func_class_scope-a.cfg                        cpp/class-implementation.cpp
-
-30070  cpp/nl_func_scope_name-a.cfg                         cpp/nl_func_scope_name.cpp
-30071  cpp/lineEndings-to-Win.cfg                           cpp/lineEndings-Mac.cpp
-30072  cpp/lineEndings-to-Unix.cfg                          cpp/lineEndings-Win.cpp
-30073  cpp/lineEndings-to-Mac.cfg                           cpp/lineEndings-Unix.cpp
-30074  common/empty.cfg                                     cpp/bom.cpp
-30075  common/empty.cfg                                     cpp/goto.cpp
-30076  cpp/Issue_2594.cfg                                   cpp/Issue_2594.cpp
-30077  cpp/Issue_2596.cfg                                   cpp/Issue_2596.cpp
-30078  common/empty.cfg                                     cpp/Issue_2672-a.cpp
-30079  common/empty.cfg                                     cpp/Issue_2672-b.cpp
-
-30080  cpp/nl_brace_brace-a.cfg                             cpp/nl_brace_brace.cpp
-30081  cpp/Issue_2383.cfg                                   cpp/Issue_2383.cpp
-30082  cpp/Issue_931.cfg                                    cpp/Issue_931.cpp
-30083  cpp/Issue_995-do.cfg                                 cpp/Issue_995-do.cpp
-30084  cpp/Issue_1184.cfg                                   cpp/Issue_1184.cpp
-30085  cpp/nSolve.cfg                                       cpp/align_class.cpp
-30086  cpp/align_class-constr.cfg                           cpp/align_class-constr.cpp
-30087  cpp/Issue_1511.cfg                                   cpp/Issue_1511.cpp
-30088  cpp/Issue_2561.cfg                                   cpp/Issue_2561.cpp
-30089  cpp/Issue_2281.cfg                                   cpp/Issue_2281.cpp
-
-30090  cpp/bug_488.cfg                                      cpp/bug_488.cpp
-30091  cpp/bug_472.cfg                                      cpp/bug_472.cpp
-30092  cpp/ben_016.cfg                                      cpp/bug_481.cpp
-30093  common/sp_after_cast.cfg                             cpp/bug_484.cpp
-30094  common/align-1.cfg                                   cpp/bug_495.cpp
-30095  cpp/ben_017.cfg                                      cpp/bug_485.cpp
-30096  cpp/bug_1854.cfg                                     cpp/bug_1854.cpp
-30097  common/align-1.cfg                                   cpp/issue_1946.cpp
-30098  cpp/Issue_2692.cfg                                   cpp/Issue_2692.cpp
-30099  common/sp_arith-f.cfg                                cpp/bug_1127.cpp
-
-30100  cpp/nl_template-f.cfg                                cpp/templates.cpp
-30101  cpp/nl_template-r.cfg                                cpp/templates.cpp
-30102  cpp/template_sp-force.cfg                            cpp/templates.cpp
-30103  cpp/template_sp-remove.cfg                           cpp/templates.cpp
-30104  cpp/avalon3.cfg                                      cpp/templ_class.h
-30105  cpp/avalon4.cfg                                      cpp/av.h
-30106  cpp/nl_template-f.cfg                                cpp/templates2.cpp
-30107  cpp/nl_template-r.cfg                                cpp/templates2.cpp
-30108  cpp/nl_template-r.cfg                                cpp/templates3.cpp
-30109  common/empty.cfg                                     cpp/templates4.cpp
-
-30110  cpp/class-nl_func-add2.cfg                           cpp/class-init.cpp
-30111  cpp/indent_columns-4.cfg                             cpp/bug_1346.h
-30112  cpp/bug_1432.cfg                                     cpp/bug_1432.cpp
-30113  cpp/bug_1452.cfg                                     cpp/bug_1452.cpp
-30114  cpp/template_sp-remove.cfg                           cpp/bug_1462.cpp
-30115  common/empty.cfg                                     cpp/Issue_1704.cpp
-30116  cpp/Issue_1052.cfg                                   cpp/Issue_1052.cpp
-30117  cpp/Issue_2343.cfg                                   cpp/Issue_2343.cpp
-30118  cpp/Issue_2758.cfg                                   cpp/Issue_2758.cpp
-30119  cpp/Issue_2879.cfg                                   cpp/Issue_2879.cpp
-
-30120  cpp/template_sp-force.cfg                            cpp/sp_after_angle.cpp
-30121  cpp/template_sp-remove.cfg                           cpp/sp_after_angle.cpp
-30122  common/sp_inside_fparen-f.cfg                        cpp/sp_after_angle.cpp
-30123  cpp/sp_inside_fparen-r.cfg                           cpp/sp_after_angle.cpp
-30124  cpp/sp_after_angle-1.cfg                             cpp/sp_after_angle.cpp
-30125  cpp/sp_after_angle-2.cfg                             cpp/sp_after_angle.cpp
-30126  cpp/sp_after_angle-3.cfg                             cpp/sp_after_angle.cpp
-30127  common/empty.cfg                                     cpp/Issue_2565.cpp
-30128  cpp/Issue_2873.cfg                                   cpp/Issue_2873.cpp
-30129  cpp/Issue_2890.cfg                                   cpp/Issue_2890.cpp
-
-30130  common/brace-allman.cfg                              cpp/if-constexpr.cpp
-30131  cpp/Issue_3010.cfg                                   cpp/Issue_3010.cpp
-30132  cpp/sp_brace_catch.cfg                               cpp/sp_brace_catch.cpp
-30133  cpp/Issue_3252.cfg                                   cpp/Issue_3252.cpp
-
-30200  cpp/bug_1862.cfg                                     cpp/bug_1862.cpp
-30201  cpp/cmt_indent-1.cfg                                 cpp/cmt_indent.cpp
-30202  cpp/cmt_indent-2.cfg                                 cpp/cmt_indent.cpp
-30203  cpp/cmt_indent-3.cfg                                 cpp/cmt_indent.cpp
-30204  cpp/indent_columns-4.cfg                             cpp/comment-align.cpp
-30205  cpp/indent_columns-4.cfg                             cpp/cmt_right.cpp
-30206  common/empty.cfg                                     cpp/cmt_backslash_eol.cpp
-30207  cpp/indent_class-t_columns-4.cfg                     cpp/cmt_indent_pp.h
-30208  cpp/bug_1108.cfg                                     cpp/bug_1108.cpp
-30209  common/empty.cfg                                     cpp/bug_1134.cpp
-
-30210  common/empty.cfg                                     cpp/bug_1338.cpp
-30211  cpp/space_indent_class-t_columns-4.cfg               cpp/indent_comment_align_thresh.cpp
-30212  cpp/indent_comment_align_thresh_2.cfg                cpp/indent_comment_align_thresh.cpp
-30213  cpp/align_right_comment.cfg                          cpp/align_right_comment.cpp
-30214  cpp/issue_1887.cfg                                   cpp/align_across_braces.cpp
-30215  common/empty.cfg                                     cpp/Issue_2099.cpp
-30216  cpp/Issue_2302.cfg                                   cpp/Issue_2302.cpp
-30217  common/empty.cfg                                     cpp/2138.cpp
-30218  cpp/sp_trailing_return-f.cfg                         cpp/trailing_return.cpp
-30219  cpp/sp_trailing_return-r.cfg                         cpp/trailing_return.cpp
-
-30220  cpp/bug_1340.cfg                                     cpp/bug_1340.cpp
-30221  cpp/Issue_2914.cfg                                   cpp/Issue_2914.cpp
-30222  cpp/sp_assign_default.cfg                            cpp/trailing_return.cpp
-30223  cpp/sp_enum_colon.cfg                                cpp/sp_enum_colon.cpp
-30224  cpp/sp_enum_colon-r.cfg                              cpp/sp_enum_colon.cpp
-30225  common/empty.cfg                                     cpp/Issue_3176.cpp
-30226  cpp/sp_enum_colon-i.cfg                              cpp/sp_enum_colon.cpp
-30227  cpp/sp_inside_braces_enum-i.cfg                      cpp/sp_inside_braces_enum.cpp
-30228  cpp/sp_inside_braces_enum-f.cfg                      cpp/sp_inside_braces_enum.cpp
-30229  cpp/sp_inside_braces_enum-r.cfg                      cpp/sp_inside_braces_enum.cpp
-
-30230  cpp/sp_type_func-r.cfg                               cpp/sp_type_func.cpp
-30231  cpp/sp_type_func-f.cfg                               cpp/sp_type_func.cpp
-30232  cpp/sp_type_func-1.cfg                               cpp/sp_type_func.cpp
-30233  cpp/sp_type_func-2.cfg                               cpp/sp_type_func.cpp
-30234  cpp/functype_param-r.cfg                             cpp/functype_param.cpp
-30235  cpp/functype_param-f.cfg                             cpp/functype_param.cpp
-
-30240  cpp/align_func_params-t.cfg                          cpp/align_func_params.cpp
-30241  cpp/align_func_params_span-1.cfg                     cpp/align_func_params.cpp
-30242  cpp/align_func_params_gap.cfg                        cpp/align_func_params.cpp
-30243  cpp/align_func_params_thresh_1.cfg                   cpp/align_func_params.cpp
-30244  cpp/align_func_params_thresh_2.cfg                   cpp/align_func_params.cpp
-30245  cpp/align_func_params_thresh_3.cfg                   cpp/align_func_params.cpp
-30246  cpp/align_func_params_thresh_4.cfg                   cpp/align_func_params.cpp
-30247  common/empty.cfg                                     cpp/Issue_2332.cpp
-30248  cpp/Issue_2831.cfg                                   cpp/Issue_2831.cpp
-30249  cpp/align-330.cfg                                    cpp/align-330.cpp
-
-30250  cpp/align_fcall.cfg                                  cpp/align_fcall.cpp
-30251  cpp/align_fcall-2.cfg                                cpp/align_fcall.cpp
-30253  common/empty.cfg                                     cpp/align_left_shift.cpp
-30254  common/empty.cfg                                     cpp/align_left_shift2.cpp
-30255  cpp/ben_018.cfg                                      cpp/align_constr.cpp
-30256  common/empty.cfg                                     cpp/func_call.cpp
-30257  cpp/indent_columns-4.cfg                             cpp/func_call_chain.cpp
-30258  common/indent_columns-3.cfg                          cpp/casts.cpp
-30259  cpp/sp_after_constr_colon.cfg                        cpp/sp_after_constr_colon.cpp
-
-30260  cpp/var_def_gap.cfg                                  cpp/var_def_gap.cpp
-30261  cpp/align_var_def_thresh_1.cfg                       cpp/align_var_def_thresh.cpp
-30262  cpp/align_var_def_thresh_2.cfg                       cpp/align_var_def_thresh.cpp
-30263  cpp/align_var_def_thresh_3.cfg                       cpp/align_var_def_thresh.cpp
-30264  cpp/Issue_2668.cfg                                   cpp/Issue_2668.cpp
-30265  cpp/long_br_cmt.cfg                                  cpp/long_br_cmt.cpp
-30266  cpp/Issue_2921.cfg                                   cpp/Issue_2921.cpp
-30267  cpp/Issue_2930.cfg                                   cpp/Issue_2930.cpp
-30268  cpp/Issue_2692.cfg                                   cpp/Issue_3018.cpp
-
-30270  cpp/const_throw.cfg                                  cpp/const_throw.cpp
-30271  cpp/sp_throw_paren-r.cfg                             cpp/sp_throw_paren.cpp
-30272  cpp/sp_throw_paren-f.cfg                             cpp/sp_throw_paren.cpp
-30273  common/sp_cparen_oparen-f.cfg                        cpp/sp_cparen_oparen.cpp
-30274  cpp/sp_cparen_oparen-r.cfg                           cpp/sp_cparen_oparen.cpp
-30275  common/empty.cfg                                     cpp/bug_1321.cpp
-30278  cpp/bug_1439.cfg                                     cpp/bug_1439.cpp
-30279  common/indent_inside_ternary_operator.cfg            cpp/indent-inside-ternary-operator.cpp
-
-30280  cpp/sp_dc.cfg                                        cpp/sf557.cpp
-30281  cpp/Issue_2478.cfg                                   cpp/Issue_2478.cpp
-30282  cpp/Issue_2703.cfg                                   cpp/Issue_2703.cpp
-30283  common/empty.cfg                                     cpp/Issue_3321.h
-
-30290  cpp/indent_shift.cfg                                 cpp/align_left_shift.cpp
-30291  cpp/indent_shift.cfg                                 cpp/indent_shift.cpp
-30292  cpp/align_eigen_comma_init.cfg                       cpp/eigen.cpp
-30293  cpp/pos_shift-lead.cfg                               cpp/pos_shift.cpp
-30294  cpp/pos_shift-trail.cfg                              cpp/pos_shift.cpp
-30295  cpp/pos_shift-join.cfg                               cpp/pos_shift.cpp
-
-30300  cpp/ben_020.cfg                                      cpp/enum_shr.cpp
-30301  cpp/al.cfg                                           cpp/enum_class.h
-30302  cpp/bug_1315.cfg                                     cpp/bug_1315.cpp
-30303  cpp/Issue_2902.cfg                                   cpp/Issue_2902.cpp
-
-# TODO: Make a tests for a braced_init_list. See also 34153-34166.
-30310  cpp/sp_word_brace_force.cfg                          cpp/braced_init_list.cpp
-30311  cpp/sp_word_brace_remove.cfg                         cpp/uniform_initialization.cpp
-30312  cpp/sp_inside_type_brace_init_lst-f.cfg              cpp/return_init_list.cpp
-30313  cpp/sp_brace_brace-r.cfg                             cpp/sp_brace_brace.cpp
-30314  cpp/sp_brace_brace-f.cfg                             cpp/sp_brace_brace.cpp
-30315  cpp/issue_1997.cfg                                   cpp/return_braced_init.cpp
-30316  cpp/Issue_2428.cfg                                   cpp/Issue_2428.cpp
-30317  cpp/pos_comma-tb.cfg                                 cpp/braced_init_template_decltype.cpp
-30318  cpp/Issue_2949.cfg                                   cpp/Issue_2949.cpp
-30319  cpp/Issue_2886.cfg                                   cpp/Issue_2886.cpp
-
-30320  cpp/sp_return_paren-r.cfg                            cpp/returns.cpp
-30321  cpp/sp_return_paren-f.cfg                            cpp/returns.cpp
-30322  cpp/sp_return_brace-r.cfg                            cpp/returns.cpp
-30323  cpp/sp_return_brace-f.cfg                            cpp/returns.cpp
-30324  common/mod_paren_on_return-a.cfg                     cpp/returns.cpp
-30325  common/mod_paren_on_return-r.cfg                     cpp/returns.cpp
-30326  cpp/indent_off_after_return.cfg                      cpp/indent_off_after_return.cpp
-30327  cpp/indent_off_after_return.cfg                      cpp/indent_off_after_return.cpp
-30328  cpp/nl_type_brace_init_lst-f.cfg                     cpp/call_brace_init_lst.cpp
-30329  cpp/nl_type_brace_init_lst-r.cfg                     cpp/call_brace_init_lst.cpp
-
-30330  cpp/Issue_3080.cfg                                   cpp/Issue_3080.cpp
-
-30400  common/attribute_specifier_seqs.cfg                  cpp/attribute_specifier_seqs.cpp
-30401  cpp/Issue_2570.cfg                                   cpp/Issue_2570.cpp
-
-# function def newlines
-30701  common/func-def-1.cfg                                cpp/function-def.cpp
-30702  common/func-def-2.cfg                                cpp/function-def.cpp
-30703  common/func-def-3.cfg                                cpp/function-def.cpp
-
-30705  cpp/func_param.cfg                                   cpp/func_param.cpp
-30706  cpp/bug_1020.cfg                                     cpp/bug_1020.cpp
-
-30711  common/del_semicolon.cfg                             cpp/semicolons.cpp
-30712  common/empty.cfg                                     cpp/bug_1158.cpp
-30713  common/empty.cfg                                     cpp/fix_for_relational_operators.cpp
-30714  common/empty.cfg                                     cpp/Issue_1733.cpp
-30715  cpp/Issue_2942.cfg                                   cpp/Issue_2942.cpp
-
-30720  cpp/wessex.cfg                                       cpp/custom-open-2.cpp
-30721  cpp/Issue_2386.cfg                                   cpp/Issue_2386.cpp
-
-30730  cpp/qt-1.cfg                                         cpp/qt-1.cpp
-30731  cpp/nl_access_spec.cfg                               cpp/qt-1.cpp
-30732  cpp/Issue_2734.cfg                                   cpp/Issue_2734.cpp
-
-30740  cpp/sef.cfg                                          cpp/sef.cpp
-30741  cpp/al.cfg                                           cpp/al.cpp
-30742  cpp/indent_columns-2.cfg                             cpp/delete.cpp
-
-30745  cpp/Issue_2170.cfg                                   cpp/Issue_2170.cpp
-30746  cpp/DefaultAndDelete-0.cfg                           cpp/DefaultAndDelete.cpp
-30747  cpp/DefaultAndDelete-1.cfg                           cpp/DefaultAndDelete.cpp
-30748  cpp/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  cpp/ben_021.cfg                                      cpp/lambda.cpp
-30751  cpp/lambda1.cfg                                      cpp/lambda.cpp
-30752  cpp/lambda2.cfg                                      cpp/lambda.cpp
-30753  cpp/lambda3.cfg                                      cpp/lambda2.cpp
-30754  cpp/indent_with_tabs-0.cfg                           cpp/bug_i_682.h
-30755  common/empty.cfg                                     cpp/bug_i_938.h
-30756  cpp/bug_1296.cfg                                     cpp/bug_1296.cpp
-30757  cpp/Issue_3054.cfg                                   cpp/Issue_3054.cpp
-30758  cpp/Issue_3054-2.cfg                                 cpp/Issue_3054-2.cpp
-
-30761  cpp/out-668-F.cfg                                    cpp/out-668.cpp
-30762  cpp/out-668-T.cfg                                    cpp/out-668.cpp
-30763  cpp/Issue_2166.cfg                                   cpp/Issue_2166.cpp
-30764  cpp/Issue_2591.cfg                                   cpp/Issue_2591.cpp
-30765  cpp/sp_cpp_lambda_square_paren-i.cfg                 cpp/lambda.cpp
-30766  cpp/sp_cpp_lambda_square_brace-i.cfg                 cpp/lambda.cpp
-30767  cpp/sp_cpp_lambda_paren_brace-i.cfg                  cpp/lambda.cpp
-30768  cpp/sp_cpp_lambda_fparen-i.cfg                       cpp/sp_cpp_lambda_fparen.cpp
-
-30770  cpp/sp_cpp_lambda_square_paren-r.cfg                 cpp/lambda.cpp
-30771  cpp/sp_cpp_lambda_square_paren-f.cfg                 cpp/lambda.cpp
-30772  cpp/sp_cpp_lambda_square_brace-r.cfg                 cpp/lambda.cpp
-30773  cpp/sp_cpp_lambda_square_brace-f.cfg                 cpp/lambda.cpp
-30774  cpp/sp_cpp_lambda_paren_brace-r.cfg                  cpp/lambda.cpp
-30775  cpp/sp_cpp_lambda_paren_brace-f.cfg                  cpp/lambda.cpp
-30776  cpp/sp_cpp_lambda_fparen-r.cfg                       cpp/sp_cpp_lambda_fparen.cpp
-30777  cpp/sp_cpp_lambda_fparen-f.cfg                       cpp/sp_cpp_lambda_fparen.cpp
-
-30780  cpp/lambda_in_one_liner.cfg                          cpp/lambda_in_one_liner.cpp
-30781  cpp/lambda_in_one_liner.cfg                          cpp/lambda_brace_list.cpp
-
-30790  cpp/Issue_2795.cfg                                   cpp/Issue_2795.cpp
-30791  cpp/Issue_3203.cfg                                   cpp/Issue_3203.cpp
-
-30800  common/star_pos-0.cfg                                cpp/align-star-amp-pos.cpp
-30801  cpp/star_pos-1.cfg                                   cpp/align-star-amp-pos.cpp
-30802  cpp/star_pos-2.cfg                                   cpp/align-star-amp-pos.cpp
-30803  cpp/bug_1403.cfg                                     cpp/bug_1403.cpp
-30805  cpp/ptr_star-1.cfg                                   cpp/ptr-star.cpp
-30806  cpp/ptr_star-2.cfg                                   cpp/ptr-star.cpp
-30807  cpp/ptr_star-3.cfg                                   cpp/ptr-star.cpp
-30808  cpp/sp_after_ptr_star_qualifier-f.cfg                cpp/ptr-star.cpp
-30809  common/empty.cfg                                     cpp/bug_1289.cpp
-
-30810  cpp/ben_022.cfg                                      cpp/ptr-star.cpp
-30811  cpp/avalon4.cfg                                      cpp/misc3.cpp
-30812  cpp/ben_023.cfg                                      cpp/misc4.cpp
-30813  cpp/ben_024.cfg                                      cpp/misc5.cpp
-30814  common/empty.cfg                                     cpp/misc6.cpp
-30815  common/width-2.cfg                                   cpp/cmt-reflow.cpp
-30816  cpp/cu.cfg                                           cpp/for_long.cpp
-30817  common/indent_columns-3.cfg                          cpp/cmt-cpp-cont.cpp
-30818  cpp/bug_1169.cfg                                     cpp/bug_1169.cpp
-30819  cpp/bug_1170.cfg                                     cpp/bug_1170.cpp
-
-30820  cpp/pp_define_at_level-1.cfg                         cpp/pp-define-indent.cpp
-30821  common/empty.cfg                                     cpp/pp_indent_case.cpp
-30822  common/empty.cfg                                     cpp/pp_indent_brace.cpp
-30823  common/empty.cfg                                     cpp/pp_indent_func_def.cpp
-30824  common/empty.cfg                                     cpp/pp_indent_extern.cpp
-30825  cpp/Issue_1966.cfg                                   cpp/Issue_1966.cpp
-30826  cpp/Issue_2319.cfg                                   cpp/Issue_2319.cpp
-30827  cpp/Issue_1167.cfg                                   cpp/Issue_1167.cpp
-30828  cpp/bug_1691.cfg                                     cpp/bug_1691.cpp
-30829  cpp/ptr_star-2.cfg                                   cpp/Issue_2726.cpp
-
-30830  common/kw_subst2.cfg                                 cpp/kw_subst.cpp
-30831  common/kw_subst.cfg                                  cpp/kw_subst2.cpp
-30832  common/kw_subst4.cfg                                 cpp/kw_subst.cpp
-
-30840  cpp/nl_func_type_name_remove.cfg                     cpp/nl_func_type_name.cpp
-30841  cpp/nl_func_type_name_force.cfg                      cpp/nl_func_type_name.cpp
-30842  cpp/nl_func_type_name_class.cfg                      cpp/nl_func_type_name.cpp
-30843  cpp/nl_func_type_name_mixed.cfg                      cpp/nl_func_type_name.cpp
-30844  cpp/Issue_2771.cfg                                   cpp/Issue_2771.cpp
-30845  cpp/ben_026.cfg                                      cpp/deref.cpp
-30846  cpp/Issue_3197.cfg                                   cpp/Issue_3197.h
-
-30850  common/sp_cmt_cpp_start_force.cfg                    cpp/sp_cmt_cpp_start.cc
-30852  cpp/sp_paren_qualifier-f.cfg                         cpp/Issue_2138.cpp
-30853  cpp/sp_paren_noexcept-f.cfg                          cpp/noexcept.cpp
-30854  cpp/Issue_1703.cfg                                   cpp/Issue_1703.cpp
-30855  common/empty.cfg                                     cpp/cpp_move.cpp
-30856  cpp/sp_cmt_cpp_region-f.cfg                          cpp/sp_cmt_cpp_region.cpp
-30857  cpp/sp_cmt_cpp_region-r.cfg                          cpp/sp_cmt_cpp_region.cpp
-
-30860  cpp/sf574.cfg                                        cpp/sf574.cpp
-
-30870  common/cmt_insert-0.cfg                              cpp/cmt_insert.cpp
-30871  common/cmt_insert-1.cfg                              cpp/cmt_insert.cpp
-30872  cpp/Issue_2752.cfg                                   cpp/Issue_2752.cpp
-#      will also use the file footer.txt
-
-30880  common/empty.cfg                                     cpp/bug_1758.cpp
-30881  cpp/bug_1758-f.cfg                                   cpp/bug_1758-f.cpp
-
-30900  common/region-0.cfg                                  cpp/region.cpp
-30901  common/region-1.cfg                                  cpp/region.cpp
-30902  common/region-2.cfg                                  cpp/region.cpp
-30903  common/region-3.cfg                                  cpp/region.cpp
-30907  cpp/Issue_1813.cfg                                   cpp/Issue_1813.cpp
-30908  cpp/Issue_1813.cfg                                   cpp/Issue_1813-2.cpp
-30909  cpp/Issue_1813.cfg                                   cpp/Issue_1813-3.cpp
-
-30910  cpp/indent_namespace-t.cfg                           cpp/indent_namespace.h
-30911  cpp/indent_class-t.cfg                               cpp/indent_namespace.h
-30912  cpp/long_namespace.cfg                               cpp/long_namespace.cpp
-30913  cpp/indent_namespace-t.cfg                           cpp/indent_namespace2.h
-30914  cpp/indent_namespace_single_indent.cfg               cpp/indent_namespace_single_indent.h
-30915  common/empty.cfg                                     cpp/bug_1235.cpp
-30916  common/empty.cfg                                     cpp/Issue_1737.cpp
-30917  cpp/Issue_2345.cfg                                   cpp/Issue_2345-3.cpp
-30918  cpp/Issue_2345.cfg                                   cpp/Issue_2345-4.cpp
-30919  common/empty.cfg                                     cpp/Issue_2387.cpp
-
-30920  cpp/ben_027.cfg                                      cpp/indent-off.cpp
-30921  cpp/ben_028.cfg                                      cpp/variadic-template.h
-30922  cpp/sp_before_ellipsis-f.cfg                         cpp/variadic-template.h
-30923  cpp/sf.2886991-f.cfg                                 cpp/sf.2886991.cpp
-30924  cpp/sf.2886991-r.cfg                                 cpp/sf.2886991.cpp
-30925  cpp/sp_func_call_empty.cfg                           cpp/function-def.cpp
-30926  cpp/sp_func_class_empty.cfg                          cpp/function-def.cpp
-30927  cpp/sp_func_def_empty.cfg                            cpp/function-def.cpp
-30928  cpp/sp_func_proto_empty.cfg                          cpp/function-def.cpp
-30929  cpp/bug_1324.cfg                                     cpp/bug_1324.cpp
-
-30930  common/indent_var_def.cfg                            cpp/indent_var_def.cpp
-30931  cpp/indent_var_def_cont-t.cfg                        cpp/indent_var_def_cont.cpp
-30932  common/empty.cfg                                     cpp/indent_var_def_cont.cpp
-30933  cpp/indent_paren_after_func_def-t.cfg                cpp/indent_paren_after_func_def.cpp
-30934  cpp/indent_paren_after_func_decl-t.cfg               cpp/indent_paren_after_func_decl.cpp
-30935  cpp/ben_029.cfg                                      cpp/indent-misc.cpp
-30936  cpp/indent_braces_no.cfg                             cpp/indent_braces_no.h
-30937  cpp/indent_param.cfg                                 cpp/indent_param.cpp
-30938  common/empty.cfg                                     cpp/indent_switch_pp.cpp
-30939  cpp/indent_paren_after_func_call-t.cfg               cpp/indent_paren_after_func_call.cpp
-
-30940  common/mod_case_brace_rm.cfg                         cpp/case-brace-remove.cpp
-30941  cpp/Issue_2150.cfg                                   cpp/Issue_2150.cpp
-30942  cpp/Issue_1692.cfg                                   cpp/Issue_1692.cpp
-30943  cpp/Issue_2735.cfg                                   cpp/Issue_2735.cpp
-#30944
-30945  common/sp_before_byref-r.cfg                         cpp/sf.3266678.cpp
-30946  cpp/sf.3315874.cfg                                   cpp/sf.3315874.h
-30947  cpp/bug_1689.cfg                                     cpp/bug_1689.cpp
-30948  cpp/sp_before_byref_func.cfg                         cpp/sp_before_byref_func.cpp
-30949  cpp/Issue_2757.cfg                                   cpp/Issue_2757.cpp
-
-30950  cpp/sp_before_tr_emb_cmt-f.cfg                       cpp/sp_before_tr_emb_cmt_input.cpp
-30951  cpp/sp_before_tr_emb_cmt-a.cfg                       cpp/sp_before_tr_emb_cmt_input.cpp
-30952  cpp/sp_before_constr_colon.cfg                       cpp/sp_before_constr_colon.cpp
-30953  cpp/constr_colon.cfg                                 cpp/constr_colon.cpp
-30954  cpp/Issue_2305.cfg                                   cpp/Issue_2305.cpp
-30955  cpp/indent_ctor_init.cfg                             cpp/indent_ctor_init.cpp
-30956  cpp/indent_ctor_init_following.cfg                   cpp/indent_ctor_init.cpp
-30957  cpp/negative_indent.cfg                              cpp/class-init.cpp
-30958  cpp/nl_for_leave_one_liners-f.cfg                    cpp/nl_for_leave_one_liners.cpp
-30959  cpp/nl_for_leave_one_liners-t.cfg                    cpp/nl_for_leave_one_liners.cpp
-
-30960  cpp/Issue_2151.cfg                                   cpp/Issue_2151.cpp
-30961  cpp/Issue_2232.cfg                                   cpp/Issue_2232.cpp
-30962  cpp/nl_assign_leave_one_liners.cfg                   cpp/nl_assign_leave_one_liners.cpp
-30963  cpp/Issue_2907.cfg                                   cpp/Issue_2907.cpp
-30964  cpp/Issue_2823.cfg                                   cpp/Issue_2823.cpp
-
-30970  cpp/Issue_2219.cfg                                   cpp/Issue_2219.cpp
-30971  cpp/Issue_2224.cfg                                   cpp/Issue_2224.cpp
-30972  cpp/Issue_2229.cfg                                   cpp/Issue_2229.cpp
-30973  cpp/Issue_2236.cfg                                   cpp/Issue_2236.cpp
-30974  common/empty.cfg                                     cpp/using-alias-in-define.cpp
-
-31000  common/empty.cfg                                     cpp/digraph.cpp
-31001  cpp/ben_030.cfg                                      cpp/digraph.cpp
-
-31050  common/empty.cfg                                     cpp/pos_assign.cpp
-31051  cpp/pos_assign.cfg                                   cpp/pos_assign.cpp
-
-31101  common/empty.cfg                                     cpp/nl_before_brace_open_test.cpp
-31102  cpp/nl_before_brace_open_1.cfg                       cpp/nl_before_brace_open_test.cpp
-31103  cpp/nl_before_brace_open_2.cfg                       cpp/nl_before_brace_open_test.cpp
-31104  cpp/nl_before_brace_open_3.cfg                       cpp/nl_before_brace_open_test.cpp
-
-31562  cpp/space_indent_class-t_columns-4.cfg               cpp/sf562.cpp
-31567  common/align_same_func_call_params-t.cfg             cpp/sf567.cpp
-31568  cpp/Issue_2368.cfg                                   cpp/Issue_2368.cpp
-
-31583  common/empty.cfg                                     cpp/sf583.cpp
-31593  common/indent_continue-8.cfg                         cpp/sf593.cpp
-31594  common/issue_672.cfg                                 cpp/issue_672.cpp
-31595  cpp/issue_1778.cfg                                   cpp/issue_1778.cpp
-31596  cpp/issue_1782.cfg                                   cpp/issue_1782.cpp
-31597  cpp/issue_1804.cfg                                   cpp/issue_1804.cpp
-31598  cpp/Issue_1753.cfg                                   cpp/Issue_1753.cpp
-31599  cpp/sp_paren_ellipsis-i.cfg                          cpp/parameter-packs.cpp
-
-31600  cpp/sp_paren_ellipsis-f.cfg                          cpp/parameter-packs.cpp
-31601  cpp/sp_paren_ellipsis-r.cfg                          cpp/parameter-packs.cpp
-31602  cpp/sp_sizeof_ellipsis-f.cfg                         cpp/parameter-packs.cpp
-31603  cpp/sp_sizeof_ellipsis-r.cfg                         cpp/parameter-packs.cpp
-31604  cpp/sp_before_ellipsis-f.cfg                         cpp/parameter-packs.cpp
-31605  cpp/sp_before_ellipsis-r.cfg                         cpp/parameter-packs.cpp
-31606  cpp/sp_type_ellipsis-f.cfg                           cpp/parameter-packs.cpp
-31607  cpp/sp_type_ellipsis-r.cfg                           cpp/parameter-packs.cpp
-31608  cpp/sp_sizeof_ellipsis_paren-f.cfg                   cpp/parameter-packs.cpp
-31609  cpp/sp_sizeof_ellipsis_paren-r.cfg                   cpp/parameter-packs.cpp
-
-31610  cpp/Issue_2085.cfg                                   cpp/Issue_2085.cpp
-31611  cpp/sp_sizeof_ellipsis-i.cfg                         cpp/parameter-packs.cpp
-31612  cpp/sp_sizeof_ellipsis_paren-i.cfg                   cpp/parameter-packs.cpp
-31613  cpp/sp_type_ellipsis-i.cfg                           cpp/parameter-packs.cpp
-31614  cpp/Issue_3309-i.cfg                                 cpp/Issue_3309.cpp
-31615  cpp/Issue_3309-f.cfg                                 cpp/Issue_3309.cpp
-31616  cpp/Issue_3309-r.cfg                                 cpp/Issue_3309.cpp
-
-31620  common/sp_after_type-f.cfg                           cpp/sp_after_type.cpp
-31621  cpp/sp_after_type-i.cfg                              cpp/sp_after_type.cpp
-31622  cpp/sp_after_cast-f.cfg                              cpp/sp_after_type.cpp
-31623  cpp/sp_after_cast-r.cfg                              cpp/sp_after_type.cpp
-31624  cpp/sp_before_ptr_star-f.cfg                         cpp/sp_after_type.cpp
-31625  cpp/sp_before_ptr_star-r.cfg                         cpp/sp_after_type.cpp
-31626  cpp/sp_decltype_paren-f.cfg                          cpp/issue_1916.cpp
-31627  cpp/sp_decltype_paren-r.cfg                          cpp/issue_1916.cpp
-31628  cpp/sp_after_decltype-f.cfg                          cpp/issue_1916.cpp
-31629  cpp/sp_after_decltype-r.cfg                          cpp/issue_1916.cpp
-
-31630  common/sp_after_type-f.cfg                           cpp/issue_1916.cpp
-31631  common/sp_after_type-r.cfg                           cpp/issue_1916.cpp
-31632  cpp/issue_1916.cfg                                   cpp/issue_1916.cpp
-31633  cpp/sp_after_decltype-f.cfg                          cpp/sp_after_decltype.cpp
-31634  cpp/sp_after_decltype-r.cfg                          cpp/sp_after_decltype.cpp
-31635  common/empty.cfg                                     cpp/sp_decltype.cpp
-31636  cpp/Issue_1923.cfg                                   cpp/Issue_1923.cpp
-
-31660  cpp/nl_func_var_def_blk-1.cfg                        cpp/issue_1919.cpp
-31661  cpp/Issue_3097.cfg                                   cpp/Issue_3097.cpp
-
-31700  cpp/toggle_processing_cmt.cfg                        cpp/toggle_processing_cmt.cpp
-31701  cpp/toggle_processing_cmt2.cfg                       cpp/toggle_processing_cmt2.cpp
-31702  cpp/toggle_processing_cmt3.cfg                       cpp/toggle_processing_cmt.cpp
-31703  cpp/toggle_processing_cmt4.cfg                       cpp/toggle_processing_cmt.cpp
-
-31710  common/empty.cfg                                     cpp/string_replace_tab_chars.cpp
-31711  cpp/string_replace_tab_chars-t.cfg                   cpp/string_replace_tab_chars.cpp
-
-31720  cpp/ben_031.cfg                                      cpp/bit-colon.cpp
-31721  cpp/Issue_2689.cfg                                   cpp/Issue_2689.cpp
-
-31730  cpp/sp_arith-a.cfg                                   cpp/ms-style-ref.cpp
-
-31740  common/empty.cfg                                     cpp/I2102.cpp
-
-32000  cpp/sp_skip_vbrace_tokens.cfg                        cpp/sp_skip_vbrace_tokens.cpp
-32001  common/empty.cfg                                     cpp/issue_547_for_each.cpp
-32002  common/empty.cfg                                     cpp/proto-wrap.cpp
-32003  cpp/align_var_class_span-1.cfg                       cpp/issue_633_typename.cpp
-32004  common/empty.cfg                                     cpp/issue_624_angle.cpp
-32005  cpp/align_var_class_span-1.cfg                       cpp/issue_633_typename.cpp
-32006  common/space_indent_columns-4.cfg                    cpp/bug_i_687.cpp
-32007  cpp/Issue_3052.cfg                                   cpp/Issue_3052.cpp
-32008  cpp/Issue_3034.cfg                                   cpp/Issue_3034.cpp
-
-32100  cpp/cpp17.cfg                                        cpp/cpp17.cpp
-32105  cpp/I2103.cfg                                        cpp/I2103.cpp
-
-32115  cpp/2185.cfg                                         cpp/2185.cpp
-
-33000  cpp/tab-0-11.cfg                                     cpp/tab-0.cpp
-33001  cpp/indent_columns-11.cfg                            cpp/tab-1.cpp
-33002  common/empty.cfg                                     cpp/cmt_convert_tab_to_spaces.cpp
-33003  cpp/cmt_convert_tab_to_spaces-t.cfg                  cpp/cmt_convert_tab_to_spaces.cpp
-33004  common/sp_cmt_cpp_start-a.cfg                        cpp/DoxygenComments.cpp
-33005  cpp/sp_cmt.cfg                                       cpp/DoxygenComments.cpp
-33006  common/empty.cfg                                     cpp/string_replace_tab_chars.cpp
-33007  common/empty.cfg                                     cpp/NewLine.cpp
-33008  cpp/NewLine-r.cfg                                    cpp/NewLine.cpp
-33009  cpp/NewLine-f.cfg                                    cpp/NewLine0.cpp
-
-33010  cpp/indent_columns-4.cfg                             cpp/Q_EMIT.cpp
-33011  cpp/indent_class-t_columns-4.cfg                     cpp/static.h
-33012  cpp/kdepim2.cfg                                      cpp/Q_SIGNAL_SLOT.cpp
-33013  cpp/kdepim3.cfg                                      cpp/Q_2.cpp
-33014  cpp/indent_columns-4.cfg                             cpp/DB.cpp
-33015  cpp/kdepim5.cfg                                      cpp/Q_FOREACH.cpp
-33016  cpp/indent_once.cfg                                  cpp/indent.cpp
-33017  cpp/bug_1160.cfg                                     cpp/bug_1160.cpp
-#33018
-33019  cpp/bug_657.cfg                                      cpp/bug_657.cpp
-
-33020  cpp/sp_cmt.cfg                                       cpp/bug_662.cpp
-33021  cpp/bug_633.cfg                                      cpp/bug_633.cpp
-33022  common/empty.cfg                                     cpp/bug_634.cpp
-33023  cpp/indent_once.cfg                                  cpp/bug_651.cpp
-33024  common/empty.cfg                                     cpp/bug_653.cpp
-33025  common/empty.cfg                                     cpp/bug_654.cpp
-33026  common/empty.cfg                                     cpp/bug_631.cpp
-33027  cpp/bug_664.cfg                                      cpp/bug_664.cpp
-33028  cpp/sp_inside_braces_empty-r.cfg                     cpp/braces_empty.cpp
-33029  cpp/cast.cfg                                         cpp/cast.cpp
-
-33030  common/space_indent_columns-4.cfg                    cpp/Q_FOREVER.cpp
-33031  cpp/align_assign_span-1.cfg                          cpp/bug_612.cpp
-33032  cpp/bug_670.cfg                                      cpp/bug_670.cpp
-33033  cpp/bug_670.cfg                                      cpp/bug_670.h
-33034  common/bug_671.cfg                                   cpp/bug_671.h
-33035  cpp/cmt_cpp_to_c-t.cfg                               cpp/patch_32.cpp
-33036  common/empty.cfg                                     cpp/bug_663.cpp
-33037  cpp/func_class.cfg                                   cpp/func_class.cpp
-33038  cpp/func_class.cfg                                   cpp/func_class.h
-33039  cpp/mod_remove_empty_return-t.cfg                    cpp/mod_remove_empty_return.cpp
-
-33040  cpp/nl_after_func_proto_group-3.cfg                  cpp/bug_i_411.cpp
-33041  cpp/nl_after_func_proto-3.cfg                        cpp/bug_i_411.cpp
-33042  cpp/nl_after_func_class_proto-3.cfg                  cpp/bug_i_411.cpp
-33043  cpp/bug_i_478.cfg                                    cpp/bug_i_478.cpp
-33044  cpp/sp_before_comma-f.cfg                            cpp/bug_i_481.cpp
-33045  cpp/indent_columns-4.cfg                             cpp/bug_i_width.cpp
-33046  cpp/bug_i_409-split.cfg                              cpp/bug_i_409.cpp
-33047  cpp/bug_i_409-create.cfg                             cpp/bug_i_409.cpp
-33048  cpp/bug_i_405.cfg                                    cpp/bug_i_405.cpp
-33049  cpp/pp-pragma.cfg                                    cpp/pp-pragma.cpp
-
-33050  common/empty.cfg                                     cpp/issue_523.cpp
-33051  common/empty.cfg                                     cpp/bug_i_503.cpp
-33052  common/empty.cfg                                     cpp/bug_i_512.cpp
-33053  common/space_indent_columns-4.cfg                    cpp/for_auto.cpp
-33054  common/indent_columns-3.cfg                          cpp/bug_i_825.cpp
-33056  common/empty.cfg                                     cpp/bug_33056.cpp
-33057  cpp/bug_1349.cfg                                     cpp/bug_1349.cpp
-33058  cpp/Issue_3164.cfg                                   cpp/Issue_3164.cpp
-33039  cpp/mod_remove_empty_return-t.cfg                    cpp/mod_remove_empty_return.cpp
-33059  cpp/mod_remove_empty_return-t.cfg                    cpp/mod_remove_empty_return-2.cpp
-
-33060  common/empty.cfg                                     cpp/if_constexpr.cpp
-33061  common/empty.cfg                                     cpp/if_chain_braces.cpp
-33062  cpp/mod_full_brace_if_chain-t.cfg                    cpp/if_chain_braces.cpp
-33063  common/mod_full_brace_if_chain_only-t.cfg            cpp/if_chain_braces.cpp
-33064  cpp/if_chain_braces_2.cfg                            cpp/if_chain_braces.cpp
-33069  cpp/Issue_2195.cfg                                   cpp/Issue_2195.cpp
-
-33070  cpp/code_width-70.cfg                                cpp/multi_line.cpp
-33071  cpp/multi_line_1.cfg                                 cpp/multi_line.cpp
-33072  cpp/multi_line_2.cfg                                 cpp/multi_line.cpp
-33073  cpp/multi_line_3.cfg                                 cpp/multi_line.cpp
-33074  cpp/multi_line_4.cfg                                 cpp/multi_line.cpp
-33075  cpp/multi_line_5.cfg                                 cpp/multi_line.cpp
-33076  cpp/multi_line_6.cfg                                 cpp/multi_line.cpp
-33077  cpp/multi_line_7.cfg                                 cpp/multi_line.cpp
-33078  cpp/multi_line_8.cfg                                 cpp/multi_line.cpp
-33079  cpp/multi_line_9.cfg                                 cpp/multi_line.cpp
-
-33080  cpp/multi_line_10.cfg                                cpp/multi_line.cpp
-33081  common/space_indent_columns-4.cfg                    cpp/bug_i_552.cpp
-33082  common/empty.cfg                                     cpp/namespace_namespace.cpp
-33083  cpp/bug_i_359.cfg                                    cpp/bug_i_359.cpp
-33084  cpp/op_sym_empty.cfg                                 cpp/op_sym_empty.cpp
-33085  cpp/indent_with_tabs-0.cfg                           cpp/bug_i_323.cpp
-33086  cpp/indent_class-t.cfg                               cpp/bug_i_568.cpp
-33087  common/space_indent_columns-4.cfg                    cpp/bug_i_596.cpp
-33088  common/empty.cfg                                     cpp/bug_i_197.cpp
-33089  cpp/indent_class-t_columns-4.cfg                     cpp/bug_643.cpp
-
-33090  common/empty.cfg                                     cpp/gh555.cpp
-33091  cpp/no_squeeze_ifdef.cfg                             cpp/squeeze_ifdef.cpp
-33092  cpp/squeeze_ifdef.cfg                                cpp/squeeze_ifdef.cpp
-33093  cpp/sp_angle_paren-f.cfg                             cpp/sp_angle_paren.cpp
-33094  cpp/sp_angle_paren_empty.cfg                         cpp/sp_angle_paren.cpp
-33095  cpp/bug_i_322.cfg                                    cpp/bug_i_322.cpp
-33096  cpp/squeeze_ifdef_top.cfg                            cpp/squeeze_ifdef.cpp
-33097  cpp/pos_enum_comma-tf.cfg                            cpp/enum_comma.h
-33098  cpp/pos_comma-lf.cfg                                 cpp/enum_comma.h
-33099  cpp/enum_comma-3.cfg                                 cpp/enum_comma.h
-
-33100  cpp/enum_comma-4.cfg                                 cpp/enum_comma.h
-33101  cpp/pos_comma-tb.cfg                                 cpp/enum_comma.h
-33102  cpp/enum_comma-6.cfg                                 cpp/enum_comma.h
-33103  cpp/bug_858-f.cfg                                    cpp/bug_858.cpp
-33104  cpp/bug_858-r.cfg                                    cpp/bug_858.cpp
-33105  cpp/bug_1001.cfg                                     cpp/bug_1001.cpp
-33106  common/bool-pos-eol-force.cfg                        cpp/pos_bool_in_template.h
-33107  cpp/Issue_2688.cfg                                   cpp/Issue_2688.cpp
-33108  cpp/Issue_2045.cfg                                   cpp/Issue_2045.cpp
-33109  common/empty.cfg                                     cpp/Issue_3205.cpp
-
-33110  cpp/enum.cfg                                         cpp/enum.cpp
-33120  cpp/Issue_2149.cfg                                   cpp/Issue_2149.cpp
-
-33150  cpp/indent_columns-4.cfg                             cpp/bug_i_753.cpp
-33151  cpp/bug_i_752.cfg                                    cpp/bug_i_752.cpp
-33152  cpp/bug_1004.cfg                                     cpp/bug_1004.cpp
-
-33160  common/sp_before_byref-r.cfg                         cpp/bug_1112.cpp
-33161  common/sp_before_byref-r.cfg                         cpp/byref-3.cpp
-
-33180  cpp/pp_multi_comment.cfg                             cpp/pp_multi_comment.cpp
-33181  cpp/Issue_2759.cfg                                   cpp/Issue_2759.cpp
-33182  cpp/Issue_2794.cfg                                   cpp/Issue_2794.cpp
-
-33200  cpp/cmt_multi_first_len_minimum-1.cfg                cpp/first_len_minimum.cpp
-
-33201  cpp/indent_ctor_members_twice.cfg                    cpp/indent_ctor_members_twice.cpp
-33202  cpp/initlist_leading_commas.cfg                      cpp/initlist_leading_commas.cpp
-33203  cpp/Issue_2574.cfg                                   cpp/Issue_2574.cpp
-33204  cpp/Issue_2582.cfg                                   cpp/Issue_2582.cpp
-33205  cpp/Issue_3198.cfg                                   cpp/Issue_3198.cpp
-
-33210  cpp/disable_nl_cont.cfg                              cpp/templates4.cpp
-33211  cpp/disable_nl_cont.cfg                              cpp/pp_multi_comment.cpp
-33212  cpp/disable_nl_cont.cfg                              cpp/pp-define-indent.cpp
-33213  cpp/disable_nl_cont.cfg                              cpp/disable_macro.cpp
-33214  cpp/Issue_2742.cfg                                   cpp/Issue_2742.cpp
-33215  cpp/Issue_3055.cfg                                   cpp/Issue_3055.cpp
-33216  cpp/Issue_3055.cfg                                   cpp/Issue_3055-a.cpp
-33217  common/empty.cfg                                     cpp/Issue_3113.cpp
-
-34001  common/nl_before_after.cfg                           cpp/nl_before_after.h
-34002  common/indent_columns-3.cfg                          cpp/bug_i_793.cpp
-34003  cpp/nl_max_blank_in_func-1.cfg                       cpp/nl_max_blank_in_func.cpp
-34004  cpp/nl_max_blank_in_func-4.cfg                       cpp/nl_max_blank_in_func.cpp
-34005  common/empty.cfg                                     cpp/nl_max_blank_in_func.cpp
-34006  common/empty.cfg                                     cpp/bug_i_575.cpp
-34007  cpp/indent_with_tabs-0.cfg                           cpp/bug_i_928.cpp
-
-34100  common/empty.cfg                                     cpp/bug_i_525.cpp
-34101  common/empty.cfg                                     cpp/bug_i_646.cpp
-34105  cpp/bug_i_663.cfg                                    cpp/bug_i_663.cpp
-34108  cpp/bug_i_666.cfg                                    cpp/bug_i_666.cpp
-
-34112  cpp/sp_after_cast-r.cfg                              cpp/bug_i_889.cpp
-34113  cpp/nl_before_func_body_def-1.cfg                    cpp/bug_902.cpp
-34114  cpp/nl_before_func_body_def-2.cfg                    cpp/bug_902.cpp
-34115  cpp/nl_before_func_body_def-2.cfg                    cpp/nl_before_func_body_def.cpp
-34116  cpp/nl_before_func_body_def-2.cfg                    cpp/issue_2000.cpp
-34117  cpp/extern_func.cfg                                  cpp/extern_func.cpp
-34118  cpp/Issue_2163.cfg                                   cpp/Issue_2163.cpp
-
-34120  cpp/align_assign_span-1.cfg                          cpp/bug_i_999.cpp
-34121  cpp/bug_1717.cfg                                     cpp/bug_1717.cpp
-34122  cpp/Issue_2440.cfg                                   cpp/Issue_2440.cpp
-34123  cpp/Issue_2440_nl.cfg                                cpp/Issue_2440_nl.cpp
-
-34130  cpp/nl_brace_fparen-f.cfg                            cpp/bug_i_1000.cpp
-34131  cpp/nl_brace_fparen-r.cfg                            cpp/bug_i_1000.cpp
-34132  cpp/new_op_a.cfg                                     cpp/new_op.cpp
-34133  cpp/new_op_f.cfg                                     cpp/new_op.cpp
-34134  cpp/new_op_r.cfg                                     cpp/new_op.cpp
-34135  cpp/new_op_paren_open_close.cfg                      cpp/new_op.cpp
-34136  cpp/sp_balance_nested_parens.cfg                     cpp/sp_balance_nested_parens.cpp
-
-34140  common/empty.cfg                                     cpp/bug_1027.cpp
-34141  common/empty.cfg                                     cpp/bug_1005.cpp
-34142  common/sp_before_byref-r.cfg                         cpp/I1112-1.cpp
-34143  cpp/I1112-2.cfg                                      cpp/I1112-2.cpp
-34144  cpp/sp_before_ptr_star-r.cfg                         cpp/I1112-3.cpp
-34145  cpp/i683.cfg                                         cpp/i683.cpp
-34146  cpp/sp_bool-f.cfg                                    cpp/bug_1002.cpp
-34147  cpp/sp_bool-r.cfg                                    cpp/bug_1002.cpp
-34148  cpp/nl_before_if_closing_paren-f.cfg                 cpp/bug_1139.cpp
-34149  cpp/nl_before_if_closing_paren-r.cfg                 cpp/bug_1139.cpp
-
-34150  common/empty.cfg                                     cpp/bug_1032.cpp
-34151  cpp/indent_else_if-t.cfg                             cpp/bug_666.cpp
-34152  common/empty.cfg                                     cpp/bug_1068.cpp
-34153  cpp/nl_type_brace_init_lst-f.cfg                     cpp/type_brace_init_lst.cpp
-34154  cpp/nl_type_brace_init_lst-r.cfg                     cpp/type_brace_init_lst.cpp
-34155  cpp/nl_type_brace_init_lst_open-f.cfg                cpp/type_brace_init_lst.cpp
-34156  cpp/nl_type_brace_init_lst_open-r.cfg                cpp/type_brace_init_lst.cpp
-34157  cpp/nl_type_brace_init_lst_close-f.cfg               cpp/type_brace_init_lst.cpp
-34158  cpp/nl_type_brace_init_lst_close-r.cfg               cpp/type_brace_init_lst.cpp
-34159  cpp/sp_type_brace_init_lst-f.cfg                     cpp/type_brace_init_lst.cpp
-
-34160  cpp/sp_type_brace_init_lst-r.cfg                     cpp/type_brace_init_lst.cpp
-34161  cpp/sp_inside_type_brace_init_lst-f.cfg              cpp/type_brace_init_lst.cpp
-34162  cpp/sp_inside_type_brace_init_lst-r.cfg              cpp/type_brace_init_lst.cpp
-34163  cpp/sp_after_type_brace_init_lst_open-f.cfg          cpp/type_brace_init_lst.cpp
-34164  cpp/sp_after_type_brace_init_lst_open-r.cfg          cpp/type_brace_init_lst.cpp
-34165  cpp/sp_before_type_brace_init_lst_close-f.cfg        cpp/type_brace_init_lst.cpp
-34166  cpp/sp_before_type_brace_init_lst_close-r.cfg        cpp/type_brace_init_lst.cpp
-34168  cpp/nl_type_brace_init_lst-r.cfg                                   cpp/Issue_2910.cpp
-34169  cpp/sp_inside_fparens-f.cfg                          cpp/init-list-call.cpp
-
-34170  common/empty.cfg                                     cpp/i1082.cpp
-34171  common/empty.cfg                                     cpp/i1181.cpp
-34172  common/space_indent_columns-4.cfg                    cpp/i1165.cpp
-34173  cpp/arith-vs-ptr.cfg                                 cpp/i1464.cpp
-34174  cpp/arith-vs-ptr.cfg                                 cpp/i1466.cpp
-34175  cpp/align_assign_span-1.cfg                          cpp/i1509.cpp
-34176  cpp/align_assign_span-1.cfg                          cpp/i1509_bug_1112_correction.cpp
-34177  cpp/sp_func_call_paren.cfg                           cpp/sp_func_call_paren.cpp
-34178  cpp/Issue_3237.cfg                                   cpp/Issue_3237.cpp
-
-34180  cpp/bug_1402.cfg                                     cpp/bug_1402.cpp
-
-34190  cpp/bug_1003.cfg                                     cpp/bug_1003.cpp
-34191  common/empty.cfg                                     cpp/comment-align-multiline.cpp
-34192  cpp/mod_remove_extra_semicolon-t.cfg                 cpp/i1207.cpp
-34193  common/empty.cfg                                     cpp/i1218.cpp
-34194  cpp/sp_arith_additive-f.cfg                          cpp/sp_arith_additive.cpp
-34195  cpp/sp_arith_additive-r.cfg                          cpp/sp_arith_additive.cpp
-34196  cpp/Issue_1460.cfg                                   cpp/Issue_1460.h
-34197  cpp/bug_1161.cfg                                     cpp/bug_1161.cpp
-34198  cpp/sp_dc.cfg                                        cpp/bug_1249.cpp
-34199  common/empty.cfg                                     cpp/not_lambda.cpp
-
-34200  cpp/i1536.cfg                                        cpp/i1536.cpp
-34201  cpp/mod_add_long_namespace_closebrace_comment-1.cfg  cpp/i1565.cpp
-34202  cpp/mod_add_long_namespace_closebrace_comment-1.cfg  cpp/i1617.cpp
-34203  cpp/i1516.cfg                                        cpp/i1516.cpp
-34204  cpp/align_func_params_span-1.cfg                     cpp/func_param_indent_leading_comma.cpp
-34205  cpp/bug_1395.cfg                                     cpp/bug_1395.cpp
-34206  cpp/indent_semicolon_for_paren-t.cfg                 cpp/for_loop_head.cpp
-34207  cpp/indent_first_for_expr-t.cfg                      cpp/for_loop_head.cpp
-34208  cpp/nl_func_type_name-r.cfg                          cpp/conversion_operator.cpp
-34209  cpp/nl-brAfter-fcallParen.cfg                        cpp/lambda_selfcalling.cpp
-
-# TODO: Find relevant test cases for 'override'.
-34210  common/empty.cfg                                     cpp/override_virtual.cpp
-34211  cpp/anonymous_enum.cfg                               cpp/anonymous_enum.cpp
-
-34250  common/empty.cfg                                     cpp/bug_1607.cpp
-34251  cpp/bug_1649.cfg                                     cpp/bug_1649.cpp
-34252  cpp/nl_after_func_proto_group-3.cfg                  cpp/issue_2001.cpp
-34253  cpp/nl_after_func_proto_group-3.cfg                  cpp/friends.cpp
-34254  cpp/issue_1985.cfg                                   cpp/issue_1985.cpp
-34255  cpp/eat_blanks_after_codewidth.cfg                   cpp/eat_blanks_after_codewidth.cpp
-34256  cpp/Issue_2836.cfg                                   cpp/Issue_2836.cpp
-
-34280  cpp/UNI-29935.cfg                                    cpp/UNI-29935.cpp
-
-34290  cpp/sp_type_brace_init_lst-f.cfg                     cpp/brace_brace_init_lst.cpp
-34291  cpp/sp_type_brace_init_lst-r.cfg                     cpp/brace_brace_init_lst.cpp
-34292  cpp/sp_inside_type_brace_init_lst-f.cfg              cpp/brace_brace_init_lst.cpp
-34293  cpp/sp_inside_type_brace_init_lst-r.cfg              cpp/brace_brace_init_lst.cpp
-34294  cpp/sp_after_type_brace_init_lst_open-f.cfg          cpp/brace_brace_init_lst.cpp
-34295  cpp/sp_after_type_brace_init_lst_open-r.cfg          cpp/brace_brace_init_lst.cpp
-34296  cpp/i1768.cfg                                        cpp/i1768.cpp
-34297  cpp/align_assign_decl_func-0.cfg                     cpp/align-assign-mixed.cpp
-34298  cpp/align_assign_decl_func-1.cfg                     cpp/align-assign-mixed.cpp
-34299  cpp/align_assign_decl_func-2.cfg                     cpp/align-assign-mixed.cpp
-
-# __asm__
-34300  cpp/bug_1236.cfg                                     cpp/bug_1236.cpp
-34301  cpp/nl_fdef_brace_cond-f.cfg                         cpp/nl_fdef_brace_cond-f.cpp
-34302  cpp/nl_fdef_brace_cond-r.cfg                         cpp/nl_fdef_brace_cond-r.cpp
-34303  cpp/nl_fdef_brace_cond-fr.cfg                        cpp/nl_fdef_brace_cond-fr.cpp
-34304  cpp/nl_fdef_brace_cond-rf.cfg                        cpp/nl_fdef_brace_cond-rf.cpp
-34305  cpp/issue_2124-1.cfg                                 cpp/issue_2124-1.cpp
-34306  cpp/issue_2124-2.cfg                                 cpp/issue_2124-2.cpp
-34307  cpp/2203.cfg                                         cpp/2203.cpp
-34308  cpp/enum_comment_wrap.cfg                            cpp/enum_comment_wrap.cpp
-34309  cpp/issue_2209.cfg                                   cpp/issue_2209-1.cpp
-
-34310  cpp/issue_2209.cfg                                   cpp/issue_2209-2.cpp
-34311  cpp/Issue_2250.cfg                                   cpp/Issue_2250.cpp
-34312  cpp/Issue_2101.cfg                                   cpp/Issue_2101.cpp
-34313  cpp/Issue_2437.cfg                                   cpp/Issue_2437.cpp
-34314  cpp/Issue_2604.cfg                                   cpp/Issue_2604.cpp
-34315  cpp/align_func_proto_thresh_1.cfg                    cpp/align_func_proto_thresh.cpp
-34316  cpp/align_func_proto_thresh_2.cfg                    cpp/align_func_proto_thresh.cpp
-34317  cpp/align_func_proto_thresh_3.cfg                    cpp/align_func_proto_thresh.cpp
-34318  cpp/align_assign_func_proto_1.cfg                    cpp/align_assign_func_proto.cpp
-34319  cpp/align_func_proto_thresh_4.cfg                    cpp/align_func_proto_thresh2.cpp
-
-34320  cpp/align_func_proto_thresh_5.cfg                    cpp/align_func_proto_thresh2.cpp
-34321  cpp/bug_2285.cfg                                     cpp/bug_2285.cpp
-34322  cpp/issue_2623_1.cfg                                 cpp/issue_2623.cpp
-34323  cpp/issue_2623_2.cfg                                 cpp/issue_2623.cpp
-34324  cpp/issue_2623_3.cfg                                 cpp/issue_2623.cpp
-34325  cpp/Issue_3025.cfg                                   cpp/Issue_3025.cpp
-34326  cpp/Issue_3040.cfg                                   cpp/Issue_3040.cpp
-34327  cpp/Issue_3044.cfg                                   cpp/Issue_3044.cpp
-34328  cpp/Issue_3048.cfg                                   cpp/Issue_3048.cpp
-
-34330  cpp/Issue_3061_0nl.cfg                               cpp/Issue_3061_0nl.cpp
-34331  cpp/Issue_3061_0nl.cfg                               cpp/Issue_3061_1nl.cpp
-34332  cpp/Issue_3061_0nl.cfg                               cpp/Issue_3061_2nl.cpp
-34333  cpp/Issue_3061_1nl.cfg                               cpp/Issue_3061_0nl.cpp
-34334  cpp/Issue_3061_1nl.cfg                               cpp/Issue_3061_1nl.cpp
-34335  cpp/Issue_3061_1nl.cfg                               cpp/Issue_3061_2nl.cpp
-34336  cpp/Issue_3061_2nl.cfg                               cpp/Issue_3061_0nl.cpp
-34337  cpp/Issue_3061_2nl.cfg                               cpp/Issue_3061_1nl.cpp
-34338  cpp/Issue_3061_2nl.cfg                               cpp/Issue_3061_2nl.cpp
-34339  cpp/Issue_3061_3nl.cfg                               cpp/Issue_3061_0nl.cpp
-34340  cpp/Issue_3061_3nl.cfg                               cpp/Issue_3061_1nl.cpp
-34341  cpp/Issue_3061_3nl.cfg                               cpp/Issue_3061_2nl.cpp
-
-34350  cpp/indent_comma_brace.cfg                           cpp/indent_comma_brace_glob.cpp
-34351  cpp/indent_comma_brace.cfg                           cpp/indent_comma_brace_func.cpp
-
-34360  cpp/nl_before_struct.cfg                             cpp/nl_before_struct_struct.cpp
-34361  cpp/nl_before_struct.cfg                             cpp/nl_before_struct_scoped_enum.cpp
-
-# test the options sp_ with the value "ignore"
-34500  cpp/sp_before_case_colon.cfg                         cpp/sp_before_case_colon.cpp
-34501  cpp/sp_endif_cmt.cfg                                 cpp/sp_endif_cmt.cpp
-34502  cpp/sp_enum_assign-f.cfg                             cpp/sp_enum_assign.cpp
-34503  cpp/sp_enum_assign-i.cfg                             cpp/sp_enum_assign.cpp
-34504  cpp/issue_574-i-i.cfg                                cpp/issue_574-i.cpp
-34505  cpp/Issue_3220-f.cfg                                 cpp/Issue_3220.cpp
-34506  cpp/Issue_3220-i.cfg                                 cpp/Issue_3220.cpp
-34507  cpp/Issue_3220-r.cfg                                 cpp/Issue_3220.cpp
-34508  cpp/Issue_3220-ir.cfg                                cpp/Issue_3220.cpp
-34509  cpp/byref-ir.cfg                                     cpp/byref-2.cpp
-
-34510  cpp/byref-i.cfg                                      cpp/byref-2.cpp
-34511  cpp/byref-f.cfg                                      cpp/byref-2.cpp
-34512  cpp/byref-r.cfg                                      cpp/byref-2.cpp
-34513  cpp/sp_cond_question-ir.cfg                          cpp/sp_cond_question.cpp
-34514  cpp/sp_cond_question-i.cfg                           cpp/sp_cond_question.cpp
-34515  cpp/sp_cond_question-f.cfg                           cpp/sp_cond_question.cpp
-34516  cpp/sp_cond_question-r.cfg                           cpp/sp_cond_question.cpp
-34517  cpp/semi-f.cfg                                       cpp/semi.cpp
-34518  cpp/semi-i.cfg                                       cpp/semi.cpp
-34519  cpp/semi-r.cfg                                       cpp/semi.cpp
-
-34520  cpp/comma-f.cfg                                      cpp/comma.cpp
-34521  cpp/comma-i.cfg                                      cpp/comma.cpp
-34522  cpp/comma-r.cfg                                      cpp/comma.cpp
-34523  cpp/ellipsis-i.cfg                                   cpp/gcc_case_ellipsis.cpp
-34524  cpp/sp_bool-i.cfg                                    cpp/bug_1002.cpp
-34525  cpp/sp_paren_brace-f.cfg                             cpp/sp_paren_brace.cpp
-34526  cpp/sp_paren_brace-i.cfg                             cpp/sp_paren_brace.cpp
-34527  cpp/sp_paren_brace-r.cfg                             cpp/sp_paren_brace.cpp
-34528  cpp/cmt_trailing_single_line_c_to_cpp.cfg            cpp/cmt_trailing_single_line_c_to_cpp.cpp
-34529  cpp/sp_inside_type_brace_init_lst-iif.cfg            cpp/type_brace_init_lst.cpp
-
-34530  cpp/sp_inside_type_brace_init_lst-irf.cfg            cpp/type_brace_init_lst.cpp
-34531  cpp/sp_inside_type_brace_init_lst-rf.cfg             cpp/type_brace_init_lst.cpp
-34532  cpp/sp_inside_type_brace_init_lst-iii.cfg            cpp/type_brace_init_lst.cpp
-34533  cpp/templates-i.cfg                                  cpp/templates.cpp
-34534  cpp/templates-r.cfg                                  cpp/templates.cpp
-34535  cpp/template_sp-ignore.cfg                           cpp/sp_after_angle.cpp
-34536  cpp/template_sp-remove.cfg                           cpp/sp_after_angle.cpp
-
-# Adopt some UT tests
-10000  common/empty.cfg                                     cpp/621_this-spacing.cpp
-10001  common/empty.cfg                                     cpp/622_ifdef-indentation.cpp
-10002  cpp/623_caret-spacing.cfg                            cpp/623_caret-spacing.cpp
-10003  cpp/633_decl-in-func-typedef.cfg                     cpp/633_decl-in-func-typedef.cpp
-10004  common/empty.cfg                                     cpp/634_extern-c-no-block.cpp
-10005  cpp/Uncrustify.Cpp.cfg                               cpp/define-indentation.cpp
-10006  cpp/dont-detab-strings.cfg                           cpp/dont-detab-strings.cpp
-10007  cpp/dont-process-defines.cfg                         cpp/dont-process-defines.cpp
-10008  common/empty.cfg                                     cpp/PR326_invalid-backslash-eol-csharp.cpp
-10009  cpp/STUCK_macro-difficulties.cfg                     cpp/STUCK_macro-difficulties.cpp
-
-10020  cpp/U02-Cpp.cfg                                      cpp/macro_spaces.cpp
-10021  cpp/U03-Cpp.cfg                                      cpp/braces_align.cpp
-10022  cpp/U04-Cpp.cfg                                      cpp/foreach.cpp
-10023  cpp/U05-Cpp.cfg                                      cpp/for_auto.cpp
-10024  cpp/U06-Cpp.cfg                                      cpp/ifcomment.cpp
-10025  cpp/U07-Cpp.cfg                                      cpp/qtargs.cpp
-10026  cpp/sp_before_ellipsis-r.cfg                         cpp/gcc_case_ellipsis.cpp
-10027  cpp/Issue_3058.cfg                                   cpp/Issue_3058.cpp
-10028  cpp/sp_before_ellipsis-f.cfg                         cpp/gcc_case_ellipsis.cpp
-10029  cpp/sp_after_ellipsis-f.cfg                          cpp/gcc_case_ellipsis.cpp
-
-10047  cpp/U16-Cpp.cfg                                      cpp/UNI-1334.cpp
-10048  common/empty.cfg                                     cpp/UNI-1335.cpp
-
-10050  cpp/U18-Cpp.cfg                                      cpp/UNI-1337.cpp
-10052  common/empty.cfg                                     cpp/UNI-1339.cpp
-10053  cpp/UNI-1340.cfg                                     cpp/UNI-1340.cpp
-10054  cpp/UNI-1344.cfg                                     cpp/UNI-1344.cpp
-10056  cpp/UNI-1346.cfg                                     cpp/UNI-1346.cpp
-10057  cpp/UNI-1347.cfg                                     cpp/UNI-1347.cpp
-
-10060  cpp/UNI-1350.cfg                                     cpp/UNI-1350.cpp
-10062  cpp/UNI-1356.cfg                                     cpp/UNI-1356.cpp
-10063  cpp/UNI-1358.cfg                                     cpp/UNI-1358.cpp
-10069  common/empty.cfg                                     cpp/UNI-1980.cpp
-
-10070  cpp/U21-Cpp.cfg                                      cpp/UNI-1981.cpp
-10071  common/empty.cfg                                     cpp/UNI-1983.cpp
-10079  cpp/U23-Cpp.cfg                                      cpp/UNI-9650.cpp
-
-10080  cpp/UNI-10496.cfg                                    cpp/UNI-10496.cpp
-
-10100  cpp/issue_564.cfg                                    cpp/issue_564.cpp
-10101  cpp/issue_574.cfg                                    cpp/issue_574.cpp
-10102  cpp/issue_574-i-a.cfg                                cpp/issue_574.cpp
-10103  cpp/issue_574-i-b.cfg                                cpp/issue_574.cpp
-
-10566  common/empty.cfg                                     cpp/issue_1752.cpp
-
-11000  cpp/UNI-12046.cfg                                    cpp/UNI-12046.cpp
-
-20002  cpp/UNI-32657.cfg                                    cpp/UNI-32657.cpp
-
-20011  common/empty.cfg                                     cpp/UNI-38381.cpp
-
-60001  cpp/UNI-2650.cfg                                     cpp/UNI-2650.cpp
-60002  cpp/U25-Cpp.cfg                                      cpp/UNI-16283.cpp
-60003  cpp/U26-Cpp.cfg                                      cpp/UNI-1288.cpp
-60006  cpp/UNI-2049.cfg                                     cpp/UNI-2049.cpp
-60017  cpp/U27-Cpp.cfg                                      cpp/UNI-2683.cpp
-
-60022  cpp/U28-Cpp.cfg                                      cpp/UNI-18439.cpp
-60025  cpp/U29-Cpp.cfg                                      cpp/UNI-19894.cpp
-60027  cpp/U30-Cpp.cfg                                      cpp/UNI-21506.cpp
-60028  cpp/U31-Cpp.cfg                                      cpp/UNI-21509.cpp
-60029  common/empty.cfg                                     cpp/UNI-21510.cpp
-
-60030  cpp/U33-Cpp.cfg                                      cpp/UNI-21727.cpp
-60031  common/empty.cfg                                     cpp/UNI-21728.cpp
-60032  common/empty.cfg                                     cpp/UNI-21729.cpp
-60036  cpp/UNI-2680.cfg                                     cpp/UNI-2680.cpp
-60038  cpp/UNI-30088.cfg                                    cpp/UNI-30088.cpp
-60039  cpp/U36-Cpp.cfg                                      cpp/UNI-30628.cpp
-
-60042  common/UNI-18777.cfg                                 cpp/UNI-18777.cpp
-60043  cpp/nl_remove_extra_newlines-1.cfg                   cpp/i2033.cpp
-60044  cpp/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg    cpp/i2116.cpp
-60045  cpp/align_asterisk_after_type_cast.cfg               cpp/align_asterisk_after_type_cast.cpp
-60046  cpp/align_continuation_left_shift.cfg                cpp/align_continuation_left_shift.cpp
-60047  cpp/align_default_after_override.cfg                 cpp/align_default_after_override.cpp
-60048  cpp/bug_2322.cfg                                     cpp/bug_2322.cpp
-60049  cpp/bug_2402.cfg                                     cpp/bug_2402.cpp
-
-60050  cpp/mod_remove_extra_semicolon-t.cfg                 cpp/semicolon-removal-after-ternary-operator.cpp
-60051  cpp/bug_2371.cfg                                     cpp/bug_2371.cpp
-60052  cpp/bug_2433_1.cfg                                   cpp/bug_2433_1.cpp
-60053  cpp/bug_2433_2.cfg                                   cpp/bug_2433_2.cpp
-60054  cpp/interface-keyword-in-cpp.cfg                     cpp/interface-keyword-in-cpp.cpp
-60055  cpp/issue_3116.cfg                                   cpp/issue_3116.cpp
-60056  cpp/issue_3116.cfg                                   cpp/issue_3116-2.cpp
-60057  cpp/issue_3116-2.cfg                                 cpp/issue_3116.cpp
-60058  cpp/sp_constr_colon-i.cfg                            cpp/issue_3330.cpp
-60059  cpp/indent_ctor_init_leading.cfg                     cpp/indent_ctor_init.cpp
-60060  cpp/sp_return-a.cfg                                  cpp/returns.cpp
-60061  cpp/sp_return-f.cfg                                  cpp/returns.cpp
-60062  cpp/sp_return-i.cfg                                  cpp/returns.cpp
-60063  cpp/sp_return-r.cfg                                  cpp/returns.cpp
-60064  cpp/sp_constr_colon-i.cfg                            cpp/issue_3368.cpp
-60065  cpp/issue_3378.cfg                                   cpp/issue_3378.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/d.test b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/d.test
deleted file mode 100644
index 520a8c3a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/d.test
+++ /dev/null
@@ -1,66 +0,0 @@
-# d.test ===========
-#
-# Test cases specifically for the D language.
-#
-# Range: 40000 - 49999
-# test.name  config.file  input.file  output.file
-
-40000  common/d.cfg                               d/HashMap.d
-40001  common/d.cfg                               d/imports.d
-40002  common/d.cfg                               d/volatile.d
-40003  common/d.cfg                               d/volatile-1.d
-40004  common/d.cfg                               d/volatile-2.d
-40005  common/d.cfg                               d/volatile-3.d
-40006  common/d.cfg                               d/Lexer.d
-40007  d/d2.cfg                                   d/Lexer.d
-40010  common/d.cfg                               d/template.d
-40011  d/d2.cfg                                   d/template.d
-40012  d/d2-i.cfg                                 d/template.d
-40013  d/d2-r.cfg                                 d/template.d
-40020  common/d.cfg                               d/funcfunc.d
-40021  common/d.cfg                               d/tst01.d
-40022  d/d-tst2.cfg                               d/tst02.d
-40023  common/d.cfg                               d/bug-indent.d
-40024  d/d3.cfg                                   d/tst03.d
-40025  d/d3a.cfg                                  d/tst03.d
-
-40026  common/empty.cfg                           d/wysiwyg_strings.d
-40027  common/empty.cfg                           d/static_if_in_struct.d
-
-40030  common/d.cfg                               d/delegate.d
-40035  common/d.cfg                               d/enum.d
-
-40040  common/sort_imports.cfg                    d/sort_import.d
-
-40050  common/d.cfg                               d/strings.d
-40051  common/d.cfg                               d/numbers.d
-40052  d/d2.cfg                                   d/numbers.d
-
-40060  common/d.cfg                               d/casts.d
-40061  common/d.cfg                               d/const.d
-
-40070  d/d_sp_paren.cfg                           d/d_sp_paren.d
-
-40080  common/d.cfg                               d/static_if.d
-
-40090  d/libd.cfg                                 d/square_indent_tab.d
-
-40100  d/1438.cfg                                 d/1438.d
-
-40201  d/invariant.cfg                            d/invariant.d
-
-40300  common/d.cfg                               d/extern_.d
-
-40400  common/mod_full_brace_if_chain_only-t.cfg  d/vbraces000.d
-40401  common/empty.cfg                           d/vbraces001.d
-40402  common/mod_full_brace_if_chain_only-t.cfg  d/vbraces002.d
-
-40403  common/empty.cfg                           d/template_use.d
-
-40500  common/empty.cfg                           d/template_spacing000.d
-40501  common/sp_after_type-r.cfg                 d/template_spacing001.d
-40502  common/sp_after_type-f.cfg                 d/template_spacing001.d
-40503  d/sp_after_type-a.cfg                      d/template_spacing001.d
-40504  common/sp_after_type-r.cfg                 d/type_spacing000.d
-40505  common/sp_after_type-f.cfg                 d/type_spacing000.d
-40506  d/sp_after_type-a.cfg                      d/type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/difftest.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/difftest.sh
deleted file mode 100755
index 053cae17..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/ecma.test b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/ecma.test
deleted file mode 100644
index 632f3015..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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  ecma/ben_098.cfg                     ecma/example-1.es
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00000-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00000-comment-indent.c
deleted file mode 100644
index b59ab389..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00001-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00001-comment-indent.c
deleted file mode 100644
index e4ba53de..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00002-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00002-comment-indent.c
deleted file mode 100644
index 09ca01ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00003-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00003-comment-indent.c
deleted file mode 100644
index 0f906f2f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00004-switch.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00004-switch.c
deleted file mode 100644
index ffb54327..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00005-cmt-align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00005-cmt-align.c
deleted file mode 100644
index 5e773be1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00006-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00006-comment-convert.c
deleted file mode 100644
index c7a019f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00007-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00007-comment-convert.c
deleted file mode 100644
index 886d7698..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00008-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00008-comment-convert.c
deleted file mode 100644
index c2af0f8b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00009-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00009-comment-convert.c
deleted file mode 100644
index 0d3f218a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00010-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00010-braces.c
deleted file mode 100644
index c4dc5faf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00011-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00011-braces.c
deleted file mode 100644
index 893a32f6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00012-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00012-braces.c
deleted file mode 100644
index 851f4df9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00013-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00013-braces.c
deleted file mode 100644
index 2adcab76..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00014-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00014-braces.c
deleted file mode 100644
index 1966a0c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00015-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00015-braces.c
deleted file mode 100644
index c29cdecd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00016-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00016-braces.c
deleted file mode 100644
index ce7df756..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00020-define-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00020-define-if-indent.c
deleted file mode 100644
index f7efd78c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00050-brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00050-brace-remove.c
deleted file mode 100644
index 857e4031..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00051-brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00051-brace-remove.c
deleted file mode 100644
index bef3e64d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00052-brace-remove2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00052-brace-remove2.c
deleted file mode 100644
index 30f352c6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00053-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00053-brace.c
deleted file mode 100644
index 55c45a57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00054-if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00054-if_chain.c
deleted file mode 100644
index a6e0c561..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00055-braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00055-braces-2.c
deleted file mode 100644
index 38447f86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00056-brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00056-brace-remove3.c
deleted file mode 100644
index 258ca555..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00057-brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00057-brace-remove3.c
deleted file mode 100644
index 26b22e2c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00058-if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00058-if_chain.c
deleted file mode 100644
index ba15dc8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00060-braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00060-braces-2.c
deleted file mode 100644
index 38447f86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00061-braces-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00061-braces-3.c
deleted file mode 100644
index 18784b82..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00062-braces-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00062-braces-4.c
deleted file mode 100644
index 05c0d9b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00065-braces-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00065-braces-5.c
deleted file mode 100644
index 6e1e6cab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00066-vb-while.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00066-vb-while.c
deleted file mode 100644
index c189b7b7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00067-vb-do.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00067-vb-do.c
deleted file mode 100644
index 79c6dedf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00068-bsnl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00068-bsnl.c
deleted file mode 100644
index 310e0eb2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00069-vb-pp.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00069-vb-pp.c
deleted file mode 100644
index 9fb79a06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00070-return-multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00070-return-multi.c
deleted file mode 100644
index d351cdb0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00071-include_define.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00071-include_define.h
deleted file mode 100644
index 89f11e5a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00072-align-proto.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00072-align-proto.c
deleted file mode 100644
index 15746cd9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00073-nl_proto_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00073-nl_proto_endif.c
deleted file mode 100644
index f50766b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00074-clang-has_include.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00074-clang-has_include.h
deleted file mode 100644
index 976de29d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00076-1225.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00076-1225.c
deleted file mode 100644
index 5b51cf3c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00081-else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00081-else-if.c
deleted file mode 100644
index ff5f5b21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00082-else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00082-else-if.c
deleted file mode 100644
index 06cc37f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00091-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00091-cond.c
deleted file mode 100644
index 840d4a6c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00092-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00092-cond.c
deleted file mode 100644
index a718a48b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00093-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00093-cond.c
deleted file mode 100644
index 8d55652a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00101-bugs-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00101-bugs-1.c
deleted file mode 100644
index abc2e08e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00102-bugs-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00102-bugs-2.c
deleted file mode 100644
index 42bed259..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00103-bugs-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00103-bugs-3.c
deleted file mode 100644
index 07d410b1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00104-bugs-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00104-bugs-4.c
deleted file mode 100644
index 61885443..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00105-bugs-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00105-bugs-5.c
deleted file mode 100644
index 72bfbe4d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00106-bugs-6.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00106-bugs-6.c
deleted file mode 100644
index 302c2328..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00107-bugs-7.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00107-bugs-7.c
deleted file mode 100644
index 34fc146e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00108-bugs-8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00108-bugs-8.c
deleted file mode 100644
index 0eae4dff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00110-misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00110-misc.c
deleted file mode 100644
index fdca271b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00111-misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00111-misc.c
deleted file mode 100644
index ad40a4ea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00120-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00120-sp_cmt_cpp_start.c
deleted file mode 100644
index 74a333c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00121-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00121-sp_cmt_cpp_start.c
deleted file mode 100644
index 3160a288..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00122-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00122-sp_cmt_cpp_start.c
deleted file mode 100644
index fe237c5a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00123-cmt_reflow.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00123-cmt_reflow.c
deleted file mode 100644
index 44e0cf34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00130-minus-minus.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00130-minus-minus.c
deleted file mode 100644
index debe70a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00135-br_cmt.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00135-br_cmt.c
deleted file mode 100644
index 9e6c6de9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00140-global-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00140-global-vars.c
deleted file mode 100644
index 0df79336..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00141-deref.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00141-deref.c
deleted file mode 100644
index a7ad3f5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00142-type-cast.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00142-type-cast.c
deleted file mode 100644
index 93076825..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00143-t3.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00143-t3.in.c
deleted file mode 100644
index b40fbd17..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00144-align-proto-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00144-align-proto-vars.c
deleted file mode 100644
index c7bf6081..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00145-vardefcol.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00145-vardefcol.c
deleted file mode 100644
index 1238be0d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00150-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00150-casts.c
deleted file mode 100644
index d89ad598..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00151-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00151-casts.c
deleted file mode 100644
index 9f2a13de..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00152-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00152-casts.c
deleted file mode 100644
index acc2ebe4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00153-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00153-casts.c
deleted file mode 100644
index 8bf710b6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00154-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00154-casts.c
deleted file mode 100644
index fca4010b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00155-cast_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00155-cast_brace.c
deleted file mode 100644
index 6e8f12b2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00160-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00160-fcn_indent.c
deleted file mode 100644
index 23c173c2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00161-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00161-fcn_indent.c
deleted file mode 100644
index 90342554..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00162-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00162-fcn_indent.c
deleted file mode 100644
index c8f152d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00163-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00163-fcn_indent.c
deleted file mode 100644
index bbf36763..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00164-fcn_indent_func_def_col1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/c/00170-beautifier-off.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00170-beautifier-off.c
deleted file mode 100644
index 351d76ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00180-lvalue.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00180-lvalue.c
deleted file mode 100644
index a8121da4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00201-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00201-case.c
deleted file mode 100644
index 0d004c19..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00202-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00202-case.c
deleted file mode 100644
index d5175084..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00203-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00203-case.c
deleted file mode 100644
index 548a2a64..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00204-bug_1718.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00204-bug_1718.c
deleted file mode 100644
index eaddc974..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00205-case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00205-case-nl_before_return.c
deleted file mode 100644
index b650d7ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00206-case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00206-case-nl_before_return.c
deleted file mode 100644
index d0b6bbbb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00207-nl_before_ignore_after_case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00207-nl_before_ignore_after_case.c
deleted file mode 100644
index 4c361605..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00207-nl_before_ignore_after_case.c
+++ /dev/null
@@ -1,53 +0,0 @@
-void func(void)
-{
-	switch (cond)
-	{
-	case CASE_A:
-		for (;;)
-			do_stuff();
-		break;
-
-	case CASE_B:
-		if (cond)
-			do_stuff();
-		break;
-
-	case CASE_C:
-		do {
-			do_stuff()
-		} while (cond);
-		break;
-
-	case CASE_D:
-		while(cond)
-			do_stuff();
-		break;
-
-	case CASE_E:
-		switch(cond)
-		{
-		case CASE_EE:
-			break;
-		}
-		break;
-	}
-
-	for (;;)
-		do_stuff();
-
-	if (cond)
-		do_stuff();
-
-	do {
-		do_stuff()
-	} while (cond);
-
-	while(cond)
-		do_stuff();
-
-	switch(cond)
-	{
-	case CASE_A:
-		do_stuff();
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00301-align-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00301-align-struct-init.c
deleted file mode 100644
index cfa44035..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00302-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00302-one-liner-init.c
deleted file mode 100644
index 63c86afe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00303-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00303-one-liner-init.c
deleted file mode 100644
index 503eedfb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00304-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00304-one-liner-init.c
deleted file mode 100644
index 471aaa2d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00305-one-liner-define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00305-one-liner-define.c
deleted file mode 100644
index 99f24f5a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00310-sp_embed_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00310-sp_embed_comment.c
deleted file mode 100644
index 3dc105aa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00320-indent_first_bool_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00320-indent_first_bool_expr.c
deleted file mode 100644
index 0dcaa413..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00401-align-equ.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00401-align-equ.c
deleted file mode 100644
index 9b213f96..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00402-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00402-align-var.c
deleted file mode 100644
index d7396d46..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00403-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00403-align-var.c
deleted file mode 100644
index cb62295e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00404-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00404-align-var.c
deleted file mode 100644
index 48af3d3c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00405-bits.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00405-bits.c
deleted file mode 100644
index 9a5a6ceb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00406-bug_i_771.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00406-bug_i_771.c
deleted file mode 100644
index 9c2b1cc2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00411-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00411-align-typedef.c
deleted file mode 100644
index 001e4a52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00412-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00412-align-typedef.c
deleted file mode 100644
index 001e4a52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00413-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00413-align-typedef.c
deleted file mode 100644
index d5f826e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00414-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00414-align-typedef.c
deleted file mode 100644
index 8e63e499..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00415-align_stack.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00415-align_stack.c
deleted file mode 100644
index 507d6da2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00416-align_sf_call_thresh_416.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/c/00417-align_sf_call_thresh_417.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/c/00418-align_sf_call_span_418.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/c/00419-align_sf_call_span_419.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/c/00420-Issue-2278.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00420-Issue-2278.c
deleted file mode 100644
index 2bab88ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00421-nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00421-nl_ds_struct_enum.c
deleted file mode 100644
index ec5bcc31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00422-nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00422-nl_ds_struct_enum.c
deleted file mode 100644
index d45b2add..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00423-bug_1702.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00423-bug_1702.c
deleted file mode 100644
index bf74c8bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00430-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00430-paren-indent.c
deleted file mode 100644
index f6b148ce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00431-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00431-paren-indent.c
deleted file mode 100644
index 51a80854..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00432-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00432-paren-indent.c
deleted file mode 100644
index 9ab77831..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00440-bug_489.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00440-bug_489.c
deleted file mode 100644
index 47a5da06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00451-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00451-enum_gallery.c
deleted file mode 100644
index 3cb8db3c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00452-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00452-enum_gallery.c
deleted file mode 100644
index cb235c3d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00453-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00453-enum_gallery.c
deleted file mode 100644
index af537d1d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00453-enum_gallery.rerun.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00453-enum_gallery.rerun.c
deleted file mode 100644
index 148f1970..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00454-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00454-enum_gallery.c
deleted file mode 100644
index 8d00cbce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00461-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00461-align_func_proto_star_amp.h
deleted file mode 100644
index 5b0490c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00461-align_func_proto_star_amp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __LIBR_BACKENDS_H
-#define __LIBR_BACKENDS_H
-
-char    szPath[512];
-char *  pszFilePart;
-int     ret;
-double *pd;
-
-INTERNAL_FN libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-INTERNAL_FN void *         data_pointer(libr_section *scn, libr_data *data);
-INTERNAL_FN size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void *         data_pointer(libr_section *scn, libr_data *data);
-size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void *         data_pointer(libr_section *scn, libr_data *data);
-
-void * data_pointer(libr_section *scn, libr_data *data);
-size_t data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-
-void *data_pointer(libr_section *scn, libr_data *data);
-
-size_t data_size(libr_section *scn, libr_data *data);
-
-#endif /* __LIBR_BACKENDS_H */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00462-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00462-align_func_proto_star_amp.h
deleted file mode 100644
index c05fc454..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00462-align_func_proto_star_amp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __LIBR_BACKENDS_H
-#define __LIBR_BACKENDS_H
-
-char    szPath[512];
-char *  pszFilePart;
-int     ret;
-double *pd;
-
-INTERNAL_FN libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-INTERNAL_FN void           *data_pointer(libr_section *scn, libr_data *data);
-INTERNAL_FN size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void           *data_pointer(libr_section *scn, libr_data *data);
-size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void           *data_pointer(libr_section *scn, libr_data *data);
-
-void   *data_pointer(libr_section *scn, libr_data *data);
-size_t data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-
-void *data_pointer(libr_section *scn, libr_data *data);
-
-size_t data_size(libr_section *scn, libr_data *data);
-
-#endif /* __LIBR_BACKENDS_H */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00463-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00463-align_func_proto_star_amp.h
deleted file mode 100644
index 702b9396..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00463-align_func_proto_star_amp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __LIBR_BACKENDS_H
-#define __LIBR_BACKENDS_H
-
-char    szPath[512];
-char *  pszFilePart;
-int     ret;
-double *pd;
-
-INTERNAL_FN libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-INTERNAL_FN void          *data_pointer(libr_section *scn, libr_data *data);
-INTERNAL_FN size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void          *data_pointer(libr_section *scn, libr_data *data);
-size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void          *data_pointer(libr_section *scn, libr_data *data);
-
-void  *data_pointer(libr_section *scn, libr_data *data);
-size_t data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-
-void *data_pointer(libr_section *scn, libr_data *data);
-
-size_t data_size(libr_section *scn, libr_data *data);
-
-#endif /* __LIBR_BACKENDS_H */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00464-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00464-align_func_proto_star_amp.h
deleted file mode 100644
index f1f927dc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00464-align_func_proto_star_amp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __LIBR_BACKENDS_H
-#define __LIBR_BACKENDS_H
-
-char   szPath[512];
-char   *pszFilePart;
-int    ret;
-double *pd;
-
-INTERNAL_FN libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-INTERNAL_FN void *         data_pointer(libr_section *scn, libr_data *data);
-INTERNAL_FN size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void *         data_pointer(libr_section *scn, libr_data *data);
-size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void *         data_pointer(libr_section *scn, libr_data *data);
-
-void * data_pointer(libr_section *scn, libr_data *data);
-size_t data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-
-void *data_pointer(libr_section *scn, libr_data *data);
-
-size_t data_size(libr_section *scn, libr_data *data);
-
-#endif /* __LIBR_BACKENDS_H */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00465-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00465-align_func_proto_star_amp.h
deleted file mode 100644
index 9bd55a23..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00465-align_func_proto_star_amp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __LIBR_BACKENDS_H
-#define __LIBR_BACKENDS_H
-
-char   szPath[512];
-char   *pszFilePart;
-int    ret;
-double *pd;
-
-INTERNAL_FN libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-INTERNAL_FN void           *data_pointer(libr_section *scn, libr_data *data);
-INTERNAL_FN size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void           *data_pointer(libr_section *scn, libr_data *data);
-size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void           *data_pointer(libr_section *scn, libr_data *data);
-
-void   *data_pointer(libr_section *scn, libr_data *data);
-size_t data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-
-void *data_pointer(libr_section *scn, libr_data *data);
-
-size_t data_size(libr_section *scn, libr_data *data);
-
-#endif /* __LIBR_BACKENDS_H */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00466-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00466-align_func_proto_star_amp.h
deleted file mode 100644
index b91044f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00466-align_func_proto_star_amp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __LIBR_BACKENDS_H
-#define __LIBR_BACKENDS_H
-
-char   szPath[512];
-char   *pszFilePart;
-int    ret;
-double *pd;
-
-INTERNAL_FN libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-INTERNAL_FN void          *data_pointer(libr_section *scn, libr_data *data);
-INTERNAL_FN size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void          *data_pointer(libr_section *scn, libr_data *data);
-size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void          *data_pointer(libr_section *scn, libr_data *data);
-
-void  *data_pointer(libr_section *scn, libr_data *data);
-size_t data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-
-void *data_pointer(libr_section *scn, libr_data *data);
-
-size_t data_size(libr_section *scn, libr_data *data);
-
-#endif /* __LIBR_BACKENDS_H */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00467-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00467-align_func_proto_star_amp.h
deleted file mode 100644
index e87c4cd8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00467-align_func_proto_star_amp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __LIBR_BACKENDS_H
-#define __LIBR_BACKENDS_H
-
-char    szPath[512];
-char   *pszFilePart;
-int     ret;
-double *pd;
-
-INTERNAL_FN libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-INTERNAL_FN void *         data_pointer(libr_section *scn, libr_data *data);
-INTERNAL_FN size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void *         data_pointer(libr_section *scn, libr_data *data);
-size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void *         data_pointer(libr_section *scn, libr_data *data);
-
-void * data_pointer(libr_section *scn, libr_data *data);
-size_t data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-
-void *data_pointer(libr_section *scn, libr_data *data);
-
-size_t data_size(libr_section *scn, libr_data *data);
-
-#endif /* __LIBR_BACKENDS_H */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00468-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00468-align_func_proto_star_amp.h
deleted file mode 100644
index 0fb8eacb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00468-align_func_proto_star_amp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __LIBR_BACKENDS_H
-#define __LIBR_BACKENDS_H
-
-char    szPath[512];
-char   *pszFilePart;
-int     ret;
-double *pd;
-
-INTERNAL_FN libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-INTERNAL_FN void           *data_pointer(libr_section *scn, libr_data *data);
-INTERNAL_FN size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void           *data_pointer(libr_section *scn, libr_data *data);
-size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void           *data_pointer(libr_section *scn, libr_data *data);
-
-void   *data_pointer(libr_section *scn, libr_data *data);
-size_t data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-
-void *data_pointer(libr_section *scn, libr_data *data);
-
-size_t data_size(libr_section *scn, libr_data *data);
-
-#endif /* __LIBR_BACKENDS_H */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00469-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00469-align_func_proto_star_amp.h
deleted file mode 100644
index 5f776985..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00469-align_func_proto_star_amp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __LIBR_BACKENDS_H
-#define __LIBR_BACKENDS_H
-
-char    szPath[512];
-char   *pszFilePart;
-int     ret;
-double *pd;
-
-INTERNAL_FN libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-INTERNAL_FN void          *data_pointer(libr_section *scn, libr_data *data);
-INTERNAL_FN size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void          *data_pointer(libr_section *scn, libr_data *data);
-size_t         data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void          *data_pointer(libr_section *scn, libr_data *data);
-
-void  *data_pointer(libr_section *scn, libr_data *data);
-size_t data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-
-void *data_pointer(libr_section *scn, libr_data *data);
-
-size_t data_size(libr_section *scn, libr_data *data);
-
-#endif /* __LIBR_BACKENDS_H */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00501-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00501-bool-pos.c
deleted file mode 100644
index b9d537a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00502-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00502-bool-pos.c
deleted file mode 100644
index 7890fcd7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00503-pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00503-pos_compare.c
deleted file mode 100644
index cc809a09..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00504-pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00504-pos_compare.c
deleted file mode 100644
index fe16e10e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00505-pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00505-pos_conditional.c
deleted file mode 100644
index 91f17d57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00506-pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00506-pos_conditional.c
deleted file mode 100644
index 23945656..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00510-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00510-bool-pos.c
deleted file mode 100644
index 5958e3c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00511-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00511-bool-pos.c
deleted file mode 100644
index 8f6effd8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00512-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00512-bool-pos.c
deleted file mode 100644
index 2e82b7ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00513-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00513-bool-pos.c
deleted file mode 100644
index cad844c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00514-my_infile.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00514-my_infile.c
deleted file mode 100644
index 3f4c76fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00600-dos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00600-dos.c
deleted file mode 100644
index a0482ba3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00601-mac.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00601-mac.c
deleted file mode 100644
index 2be04c61..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00611-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00611-pp-space.c
deleted file mode 100644
index 217fc89a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00612-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00612-pp-space.c
deleted file mode 100644
index 7c19bf1e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00613-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00613-pp-space.c
deleted file mode 100644
index 7092a193..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00614-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00614-pp-space.c
deleted file mode 100644
index 103c2ca4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00615-pp-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00615-pp-nest.c
deleted file mode 100644
index 5e99a1d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00616-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00616-pp-if-indent.c
deleted file mode 100644
index dc2dea10..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00617-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00617-pp-if-indent.c
deleted file mode 100644
index 2caf73d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00618-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00618-pp-if-indent.c
deleted file mode 100644
index f7b3d270..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00619-Issue_3169.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00619-Issue_3169.c
deleted file mode 100644
index 848e451e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00619-Issue_3169.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <stdint.h>
-
-void bar (void)
-{
-
-  int32_t       result;
-  const int32_t other
-    = 7;
-}
-
-#define P(bits)                   \
-  void foo(void)                  \
-  {                               \
-                                  \
-    int##bits##_t       result15; \
-    const int##bits##_t other     \
-      = 7;                        \
-  }
-
-#define Q(value)            \
-  void baz(void)            \
-  {                         \
-                            \
-    int32_t       result24; \
-    const int32_t other     \
-      = 7;                  \
-  }
-
-P(32)
-Q(7)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00620-indent-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00620-indent-assign.c
deleted file mode 100644
index c01e146a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00621-nl_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00621-nl_endif.c
deleted file mode 100644
index bae6272c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00622-indent-off-after-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00622-indent-off-after-assign.c
deleted file mode 100644
index eb083f7b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00631-nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00631-nl_assign.c
deleted file mode 100644
index 7319d498..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00632-nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00632-nl_assign.c
deleted file mode 100644
index 2452e773..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00633-bug_3156.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00633-bug_3156.c
deleted file mode 100644
index 508a0098..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00701-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00701-function-def.c
deleted file mode 100644
index 6f0133e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00702-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00702-function-def.c
deleted file mode 100644
index eaa568da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00703-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00703-function-def.c
deleted file mode 100644
index 76cf664f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00710-add_long_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00710-add_long_comment.c
deleted file mode 100644
index 82bf680e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00721-nl-semicolon.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00721-nl-semicolon.c
deleted file mode 100644
index 441091b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00801-fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00801-fcn_type.c
deleted file mode 100644
index 72af3fa3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00802-funcfunc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00802-funcfunc.c
deleted file mode 100644
index 4d0f0432..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00803-fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00803-fcn_type.c
deleted file mode 100644
index 9e1e5c55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00901-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00901-code_width.c
deleted file mode 100644
index 672f9153..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00902-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00902-code_width.c
deleted file mode 100644
index 9c5a4cec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00903-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00903-code_width.c
deleted file mode 100644
index 049e952d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00910-pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00910-pascal_ptr.c
deleted file mode 100644
index 27a9cdef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/00911-pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00911-pascal_ptr.c
deleted file mode 100644
index 4c0d0dde..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01000-mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01000-mod-paren.c
deleted file mode 100644
index ca919f77..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01001-nl-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01001-nl-comment.c
deleted file mode 100644
index ecac3e2a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01002-mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01002-mod-paren.c
deleted file mode 100644
index 2537330f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01005-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01005-mod_case_brace.c
deleted file mode 100644
index caeae178..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01006-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01006-mod_case_brace.c
deleted file mode 100644
index 371bd5cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01007-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01007-mod_case_brace.c
deleted file mode 100644
index 2ea3dea5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01008-Issue_3366.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01008-Issue_3366.c
deleted file mode 100644
index 75a95e36..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01008-Issue_3366.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#define __CVTENDIAN1_H
-#define __CVTENDIAN2_H
-
-static int ConvertEndian(void *ptr, int bytes)
-{
-   switch(bytes)
-   {
-   default:
-      {
-         break;
-      }
-   }
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01011-semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01011-semicolons.c
deleted file mode 100644
index 962ec588..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01012-semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01012-semicolons.c
deleted file mode 100644
index 54d895e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01015-paren_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01015-paren_indent.c
deleted file mode 100644
index d993315c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01016-align_attr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01016-align_attr.c
deleted file mode 100644
index 012217e4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01020-kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01020-kw_subst.c
deleted file mode 100644
index 61b43c3f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01021-hello.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01021-hello.c
deleted file mode 100644
index 6ba46ef7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01022-kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01022-kw_subst.c
deleted file mode 100644
index 6cba8370..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01030-multi.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01030-multi.h
deleted file mode 100644
index 14a599c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01035-func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01035-func_wrap.c
deleted file mode 100644
index b2f86805..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01036-func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01036-func_wrap.c
deleted file mode 100644
index 24e932ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01037-type_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01037-type_wrap.c
deleted file mode 100644
index c3c23569..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01040-newline_after_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01040-newline_after_endif.c
deleted file mode 100644
index 2a0cbe62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01050-func_call_user.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01050-func_call_user.c
deleted file mode 100644
index 82eba7cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01060-backslash-newline-lex.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01060-backslash-newline-lex.c
deleted file mode 100644
index f5000b82..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01070-various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01070-various_colons.c
deleted file mode 100644
index 0850b17e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01071-various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01071-various_colons.c
deleted file mode 100644
index e25134ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/01080-bug_1196.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01080-bug_1196.c
deleted file mode 100644
index 9fdabca6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02000-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02000-i2c-core.c
deleted file mode 100644
index 528a6161..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02001-directfb.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02001-directfb.h
deleted file mode 100644
index 3c7ffc18..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02002-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02002-i2c-core.c
deleted file mode 100644
index 698df2a6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02100-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02100-i2c-core.c
deleted file mode 100644
index df01ad5b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02101-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02101-comment-indent.c
deleted file mode 100644
index 7c5f0f0c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02200-xml.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02200-xml.c
deleted file mode 100644
index 62bd81d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02201-align-string.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02201-align-string.c
deleted file mode 100644
index 0b2cf25a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02300-preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02300-preproc-if.c
deleted file mode 100644
index 8e20a744..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02301-preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02301-preproc-if.c
deleted file mode 100644
index 0130e1f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02302-nl-cont.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02302-nl-cont.c
deleted file mode 100644
index dfbb0c2d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02303-nl-cont2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02303-nl-cont2.c
deleted file mode 100644
index a0129423..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02310-empty-for.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02310-empty-for.c
deleted file mode 100644
index 4bd43b09..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02311-pragma.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02311-pragma.c
deleted file mode 100644
index ec944697..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02315-pp_ret.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02315-pp_ret.c
deleted file mode 100644
index 18a3d5cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02320-nl_create_one_liner.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02320-nl_create_one_liner.c
deleted file mode 100644
index 55974c3c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02325-sort_include.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02325-sort_include.c
deleted file mode 100644
index 4f2b20bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02330-one_liners.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02330-one_liners.c
deleted file mode 100644
index 57d8ba44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02410-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02410-ifdef-indent.c
deleted file mode 100644
index e71d8cf3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02411-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02411-ifdef-indent.c
deleted file mode 100644
index bf39a98c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02412-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02412-ifdef-indent.c
deleted file mode 100644
index 23b4dd37..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02413-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02413-ifdef-indent.c
deleted file mode 100644
index 8738bbf7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02414-whole_file_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02414-whole_file_ifdef.c
deleted file mode 100644
index c767bbf7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02415-endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02415-endif.c
deleted file mode 100644
index c8b99a6a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02416-cmt_nl_end.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02416-cmt_nl_end.c
deleted file mode 100644
index 56de21ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02421-cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02421-cmt_multi.c
deleted file mode 100644
index 61faac36..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02422-cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02422-cmt_multi.c
deleted file mode 100644
index bbdd79cd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02423-cmt_multi_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02423-cmt_multi_utf8.c
deleted file mode 100644
index 05b01f84..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02431-cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02431-cmt_right_align.c
deleted file mode 100644
index 315e5010..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02432-cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02432-cmt_right_align.c
deleted file mode 100644
index eef43777..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02440-string_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02440-string_utf8.c
deleted file mode 100644
index a473e1bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02440-string_utf8.c
+++ /dev/null
@@ -1 +0,0 @@
-char* x = "中国語 (�体)";
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02441-utf8-identifiers.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02441-utf8-identifiers.c
deleted file mode 100644
index 1dc39e9c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02451-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02451-nl_return_expr.c
deleted file mode 100644
index bf8621d5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02452-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02452-nl_return_expr.c
deleted file mode 100644
index 4dc23adf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02453-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02453-nl_return_expr.c
deleted file mode 100644
index c917fb17..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02454-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02454-nl_return_expr.c
deleted file mode 100644
index 2e33d2b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02455-macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02455-macro-returns.c
deleted file mode 100644
index dba84c56..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02456-macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02456-macro-returns.c
deleted file mode 100644
index 7cd29044..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02457-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02457-nl_before_return.c
deleted file mode 100644
index a396202f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02460-freebsd.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02460-freebsd.c
deleted file mode 100644
index 804c5ec7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02486-doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02486-doxy-comment.c
deleted file mode 100644
index e2a6c2c4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02487-doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02487-doxy-comment.c
deleted file mode 100644
index 4abad3c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02501-custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02501-custom_types_ssl.c
deleted file mode 100644
index 3e28d2e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02502-custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02502-custom_types_ssl.c
deleted file mode 100644
index 0df5ddad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02504-align_keep_extra.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02504-align_keep_extra.c
deleted file mode 100644
index 985f428c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/02510-asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02510-asm.c
deleted file mode 100644
index 6609bf9b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/07630-indent-vbrace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/07630-indent-vbrace.c
deleted file mode 100644
index a1344348..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/08399-gh399.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/08399-gh399.c
deleted file mode 100644
index 780234ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09588-sf588.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09588-sf588.c
deleted file mode 100644
index d1c5f1cc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09594-sf594.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09594-sf594.c
deleted file mode 100644
index 94a1973c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09601-sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09601-sp_after_sparen.c
deleted file mode 100644
index 93cbfea2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09602-bug_671.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09602-bug_671.c
deleted file mode 100644
index a9d54ee8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09603-indent_ternary-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09603-indent_ternary-1.c
deleted file mode 100644
index f9200886..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09604-indent_ternary-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09604-indent_ternary-2.c
deleted file mode 100644
index e6d3576c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09605-negative_value.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09605-negative_value.c
deleted file mode 100644
index 6399fbef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09606-extern.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09606-extern.c
deleted file mode 100644
index d43131fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09607-attribute.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09607-attribute.c
deleted file mode 100644
index 19e3a057..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09608-func_call_user2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09608-func_call_user2.c
deleted file mode 100644
index ee4e24d4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09609-Issue_2279.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09609-Issue_2279.c
deleted file mode 100644
index 88c0ae84..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09610-bug_i_876.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09610-bug_i_876.c
deleted file mode 100644
index e1afece6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09611-bug_i_222.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09611-bug_i_222.c
deleted file mode 100644
index 4f0ded31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09612-bug_1041.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09612-bug_1041.c
deleted file mode 100644
index 7c07615b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09613-i1413.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09613-i1413.c
deleted file mode 100644
index 4287ca86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09614-string_prefixes.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09614-string_prefixes.c
deleted file mode 100644
index e901c9ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09615-i1564.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09615-i1564.c
deleted file mode 100644
index 2b37b25c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09616-enum_comma_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09616-enum_comma_ifdef.c
deleted file mode 100644
index 95637aae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09617-Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09617-Issue_2360.c
deleted file mode 100644
index 0489b0f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09618-Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09618-Issue_2360.c
deleted file mode 100644
index 898c64e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09619-Issue_2411.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09619-Issue_2411.c
deleted file mode 100644
index 40244488..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09620-Issue_2640.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09620-Issue_2640.c
deleted file mode 100644
index ba25bcbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09621-pp-before-func-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09621-pp-before-func-def.c
deleted file mode 100644
index 948ce135..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/09622-Issue_3356.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09622-Issue_3356.c
deleted file mode 100644
index 7f1e0282..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09622-Issue_3356.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* PR middle-end/46360 */
-
-__attribute__((gnu_inline, always_inline)) extern inline char *
-strncpy (char *dest, const char *src, SIZE_TYPE len)
-{
-	return __builtin_strncpy (dest, src, len);
-}
-
-void
-foo (char *s)
-{
-	strncpy (s, "", 0);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10004-pragma_asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10004-pragma_asm.c
deleted file mode 100644
index 0e6b48d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/10005-i1270.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10005-i1270.c
deleted file mode 100644
index 4831a47a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/10006-bug_2331.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10006-bug_2331.c
deleted file mode 100644
index 67088d94..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/10007-indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10007-indent-macro-brace.c
deleted file mode 100644
index 192a399f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/10008-indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10008-indent-macro-brace.c
deleted file mode 100644
index a54cd504..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/10009-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10009-return-compound-literal.c
deleted file mode 100644
index fad9a3f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/10010-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10010-return-compound-literal.c
deleted file mode 100644
index da33e2fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/10011-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10011-return-compound-literal.c
deleted file mode 100644
index fad9a3f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/10012-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10012-sparen-indent.c
deleted file mode 100644
index d9ddbe06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/10013-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10013-sparen-indent.c
deleted file mode 100644
index b09a3102..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/10014-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10014-sparen-indent.c
deleted file mode 100644
index bf0ba8cf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/10015-Issue_2845.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10015-Issue_2845.h
deleted file mode 100644
index 9f34b1dc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/c/10016-Issue_3233.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10016-Issue_3233.c
deleted file mode 100644
index ccb53151..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10016-Issue_3233.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "config.h"
-
-#include "nautilus-previewer.h"
-
-#define PREVIEWER2_DBUS_IFACE "org.gnome.NautilusPreviewer2"
-#define PREVIEWER_DBUS_PATH "/org/gnome/NautilusPreviewer"
-
-static GDBusProxy *previewer_v2_proxy = NULL;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10017-double-sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10017-double-sparen.c
deleted file mode 100644
index 6633006e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10017-double-sparen.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <stdio.h>
-
-int main() {
-	FILE *f;
-	if ( (f = fopen("/dev/null", "r")) )
-		puts("file is open");
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10018-double-sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10018-double-sparen.c
deleted file mode 100644
index f77262fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10018-double-sparen.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <stdio.h>
-
-int main() {
-	FILE *f;
-	if ( (f = fopen("/dev/null", "r") ) )
-		puts("file is open");
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10019-include-guard.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10019-include-guard.h
deleted file mode 100644
index e742dd4c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10019-include-guard.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef FOO
-	#define FOO
-
-	int foo();
-
-	#ifdef BAR
-		#define BAZ
-		int bar();
-	#endif
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10020-single_line_comment_after.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10020-single_line_comment_after.c
deleted file mode 100644
index 527b3e80..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10020-single_line_comment_after.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdio.h>
-
-int main(void)
-{
-    printf("Hello "); // This comment is short.
-
-    printf("world!\n");
-        // This comment is long, so I put it on the next line and indented it.
-
-    return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10021-parenthesized_indirect_call.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10021-parenthesized_indirect_call.c
deleted file mode 100644
index 7fd4d573..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10021-parenthesized_indirect_call.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-void hello(void)
-{
-        printf("Hello world!\n");
-}
-
-void (*get_hello(void)) (void)
-{
-        return hello;
-}
-
-int main()
-{
-        (get_hello()) ();
-        return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10022-Issue_3269.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10022-Issue_3269.c
deleted file mode 100644
index 6baef61c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10022-Issue_3269.c
+++ /dev/null
@@ -1,17 +0,0 @@
-int main(void)
-{
-	int x = 0;
-
-	while ( x < 5 )
-	{
-		x++;
-	}
-
-	do
-	{
-		x++;
-	}
-	while ( x < 5 );
-
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10023-Issue_3272.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10023-Issue_3272.h
deleted file mode 100644
index 673c5a91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10023-Issue_3272.h
+++ /dev/null
@@ -1,11 +0,0 @@
-//#define INLINE_BUSY_WAIT(ticks)            \
-//{                                          \
-//    volatile size_t busy_wait_counter = 0; \
-//    while (busy_wait_counter++ < ticks);   \
-//}
-
-// #define INLINE_BUSY_WAIT(ticks)            \
-// {                                          \
-//     volatile size_t busy_wait_counter = 0; \
-//     while (busy_wait_counter++ < ticks);   \
-// }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10024-Issue_3274.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10024-Issue_3274.c
deleted file mode 100644
index f8b9f789..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10024-Issue_3274.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define FOO
-#define BAR()
-
-FOO
-BAR()
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10025-forever.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10025-forever.c
deleted file mode 100644
index fc14ccf1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10025-forever.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int main(void)
-{
-	for( ;; )
-		continue;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10026-forever.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10026-forever.c
deleted file mode 100644
index 94dc8ce1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10026-forever.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int main(void)
-{
-	for(; ;)
-		continue;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10027-Issue_3327.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10027-Issue_3327.c
deleted file mode 100644
index 92ec0779..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10027-Issue_3327.c
+++ /dev/null
@@ -1,10 +0,0 @@
-int main(void)
-{
-	#if 1
-		#pragma GCC warning "This code won't compile"
-		#define FOO 1
-		#line 7
-		#error
-	#endif
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10028-Issue_3339.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10028-Issue_3339.c
deleted file mode 100644
index fa6872e4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10028-Issue_3339.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int main(int argc, char **argv)
-{
-	if (argc > 1)
-		return /*status*/0/*success*/;
-	else
-		return /*status*/          1      /*failure*/;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10029-Issue_3339.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10029-Issue_3339.c
deleted file mode 100644
index 0b9b50e1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10029-Issue_3339.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int main(int argc, char **argv)
-{
-	if (argc > 1)
-		return /*status*/ 0 /*success*/;
-	else
-		return /*status*/ 1 /*failure*/;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10030-Issue_3339.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10030-Issue_3339.c
deleted file mode 100644
index fb71b266..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10030-Issue_3339.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int main(int argc, char **argv)
-{
-	if (argc > 1)
-		return /*status*/0/*success*/;
-	else
-		return /*status*/1/*failure*/;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10031-Issue_3342.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10031-Issue_3342.c
deleted file mode 100644
index 986aab70..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10031-Issue_3342.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int main(int argc, char **argv)
-{
-	int x[argc * argc];
-	typedef int x_t[argc * argc];
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10032-Issue_3345.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10032-Issue_3345.c
deleted file mode 100644
index eec63b28..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10032-Issue_3345.c
+++ /dev/null
@@ -1,8 +0,0 @@
-int main(int argc, char **argv)
-{
-	int x = argc * argc;
-	int y[] = { argc * argc };
-	struct { int x; } z = { argc * argc };
-	enum { w = 5 * 5 };
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10033-Issue_3343.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10033-Issue_3343.c
deleted file mode 100644
index 6acdb70e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10033-Issue_3343.c
+++ /dev/null
@@ -1,10 +0,0 @@
-int x[] =
-{
-	#if 1
-#define X1
-		#include "x1.c"
-	#else
-#define X2
-		#include "x2.c"
-	#endif
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10034-Issue_3343.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10034-Issue_3343.c
deleted file mode 100644
index 31eddc22..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10034-Issue_3343.c
+++ /dev/null
@@ -1,10 +0,0 @@
-int x[] =
-{
-	#if 1
-#define X1
-	#include "x1.c"
-	#else
-#define X2
-	#include "x2.c"
-	#endif
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10035-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10035-comment-indent.c
deleted file mode 100644
index 4486816e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10035-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.74.0/tests/expected/c/10036-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10036-comment-indent.c
deleted file mode 100644
index 9ac0677f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10036-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.74.0/tests/expected/c/10037-Issue_3362.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10037-Issue_3362.c
deleted file mode 100644
index abff8de4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10037-Issue_3362.c
+++ /dev/null
@@ -1,15 +0,0 @@
-int main(int argc, char** argv)
-{
-	switch (argc)
-	{
-	case 1:
-		// return the number unchanged
-		return 1;
-	case 2:
-	// fall through
-	case 3:
-		return 5;
-	default:
-		return 10;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10038-Issue_3362.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10038-Issue_3362.c
deleted file mode 100644
index 7a8c08f3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10038-Issue_3362.c
+++ /dev/null
@@ -1,15 +0,0 @@
-int main(int argc, char** argv)
-{
-	switch (argc)
-	{
-	case 1:
-		// return the number unchanged
-		return 1;
-	case 2:
-		// fall through
-	case 3:
-		return 5;
-	default:
-		return 10;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10039-Issue_3370.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10039-Issue_3370.c
deleted file mode 100644
index 2586a3b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10039-Issue_3370.c
+++ /dev/null
@@ -1,17 +0,0 @@
-int main(int argc, char** argv)
-{
-	switch (argc)
-	{
-	// If FOO or BAR is defined, treat it specially
-	#ifdef FOO
-		case FOO:
-			return 1;
-	#endif
-	#ifdef BAR
-		case BAR:
-			return 2;
-	#endif
-	default:
-		return 100;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10040-Issue_3377.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10040-Issue_3377.c
deleted file mode 100644
index fc4aa694..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10040-Issue_3377.c
+++ /dev/null
@@ -1,9 +0,0 @@
-int main(void)
-{
-	int i = 0;
-	while ( i < 10 )
-		i++;
-	for (i = 0; i < 10; i++)
-		continue;
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10041-Issue_3351.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10041-Issue_3351.c
deleted file mode 100644
index 592fc511..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10041-Issue_3351.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-
-void foo(unsigned flags, unsigned COMMENT) {
-	/* Discard file comment if any */
-	if ((flags & COMMENT) != 0) {
-		while (getchar() != 0) /* null */
-		{
-		}
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10042-Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10042-Issue_3376.c
deleted file mode 100644
index 084e9c7d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10042-Issue_3376.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int *ptr;
-int *(*func1)(void (*param), void (*));
-int *(*func2)(void (*callback)(void), void (*)(void));
-int *(* func3)(void (* callback)(void), void (* )(void));
-int *(*  func4)(void (*  callback)(void), void (*  )(void));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10043-Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10043-Issue_3376.c
deleted file mode 100644
index 6874a984..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10043-Issue_3376.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int *ptr;
-int *(* func1)(void (*param), void (*));
-int *(* func2)(void (* callback)(void), void (*)(void));
-int *(* func3)(void (* callback)(void), void (* )(void));
-int *(*  func4)(void (*  callback)(void), void (*  )(void));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10044-Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10044-Issue_3376.c
deleted file mode 100644
index b6ea490d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10044-Issue_3376.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int *ptr;
-int *(*func1)(void (*param), void (*));
-int *(*func2)(void (*callback)(void), void (*)(void));
-int *(*func3)(void (*callback)(void), void (* )(void));
-int *(*func4)(void (*callback)(void), void (*  )(void));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10045-Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10045-Issue_3376.c
deleted file mode 100644
index fa3776db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10045-Issue_3376.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int *ptr;
-int *(* func1)(void (*param), void (*));
-int *(* func2)(void (* callback)(void), void (*)(void));
-int *(* func3)(void (* callback)(void), void (* )(void));
-int *(* func4)(void (* callback)(void), void (*  )(void));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/02102-indent-c.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/02102-indent-c.cpp
deleted file mode 100644
index 70648397..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/02103-output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/02103-output.cpp
deleted file mode 100644
index ca003784..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10000-621_this-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10000-621_this-spacing.cpp
deleted file mode 100644
index bd28a5e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp
deleted file mode 100644
index c466b45c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10002-623_caret-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10002-623_caret-spacing.cpp
deleted file mode 100644
index 5058ea4b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/10005-define-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10005-define-indentation.cpp
deleted file mode 100644
index 24370df9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10006-dont-detab-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10006-dont-detab-strings.cpp
deleted file mode 100644
index 11352d82..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10007-dont-process-defines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10007-dont-process-defines.cpp
deleted file mode 100644
index 56f6852e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp
deleted file mode 100644
index ea1c724e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10020-macro_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10020-macro_spaces.cpp
deleted file mode 100644
index 55a50766..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10021-braces_align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10021-braces_align.cpp
deleted file mode 100644
index 40d966f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10022-foreach.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10022-foreach.cpp
deleted file mode 100644
index 2862e6ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10023-for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10023-for_auto.cpp
deleted file mode 100644
index 775031a5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10024-ifcomment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10024-ifcomment.cpp
deleted file mode 100644
index b41c5c6f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10025-qtargs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10025-qtargs.cpp
deleted file mode 100644
index 01d94543..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp
deleted file mode 100644
index 852360a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10027-Issue_3058.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10027-Issue_3058.cpp
deleted file mode 100644
index 09e1dc92..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10028-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10028-gcc_case_ellipsis.cpp
deleted file mode 100644
index 852360a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10028-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.74.0/tests/expected/cpp/10029-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10029-gcc_case_ellipsis.cpp
deleted file mode 100644
index e2d8ef8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10029-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.74.0/tests/expected/cpp/10047-UNI-1334.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10047-UNI-1334.cpp
deleted file mode 100644
index 9a856f91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10048-UNI-1335.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10048-UNI-1335.cpp
deleted file mode 100644
index 891b945a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10050-UNI-1337.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10050-UNI-1337.cpp
deleted file mode 100644
index 59635c19..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10052-UNI-1339.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10052-UNI-1339.cpp
deleted file mode 100644
index 255db223..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10053-UNI-1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10053-UNI-1340.cpp
deleted file mode 100644
index 2a96aa31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10054-UNI-1344.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10054-UNI-1344.cpp
deleted file mode 100644
index 43c4429e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10056-UNI-1346.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10056-UNI-1346.cpp
deleted file mode 100644
index af875c3e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10057-UNI-1347.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10057-UNI-1347.cpp
deleted file mode 100644
index ec8f350b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10060-UNI-1350.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10060-UNI-1350.cpp
deleted file mode 100644
index 7353e915..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10062-UNI-1356.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10062-UNI-1356.cpp
deleted file mode 100644
index c70ca61d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10063-UNI-1358.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10063-UNI-1358.cpp
deleted file mode 100644
index 120aa9c4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10069-UNI-1980.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10069-UNI-1980.cpp
deleted file mode 100644
index 97940716..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10070-UNI-1981.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10070-UNI-1981.cpp
deleted file mode 100644
index d4f74dc3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10071-UNI-1983.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10071-UNI-1983.cpp
deleted file mode 100644
index e7d9de6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10079-UNI-9650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10079-UNI-9650.cpp
deleted file mode 100644
index 0d6cdb46..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10080-UNI-10496.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10080-UNI-10496.cpp
deleted file mode 100644
index 81122be8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10100-issue_564.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10100-issue_564.cpp
deleted file mode 100644
index ac5fbef3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10101-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10101-issue_574.cpp
deleted file mode 100644
index 6621d455..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10102-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10102-issue_574.cpp
deleted file mode 100644
index 0f3b7da3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10103-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10103-issue_574.cpp
deleted file mode 100644
index b87e76fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/10566-issue_1752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10566-issue_1752.cpp
deleted file mode 100644
index 8e16cfa3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/11000-UNI-12046.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/11000-UNI-12046.cpp
deleted file mode 100644
index 5ffc0da9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/20002-UNI-32657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/20002-UNI-32657.cpp
deleted file mode 100644
index eb7655da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/20011-UNI-38381.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/20011-UNI-38381.cpp
deleted file mode 100644
index 701b55b2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30000-cout.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30000-cout.cpp
deleted file mode 100644
index f099751f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30001-alt_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30001-alt_tokens.cpp
deleted file mode 100644
index 02083b88..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30002-constructor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30002-constructor.cpp
deleted file mode 100644
index f7cbb30d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30003-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30003-strings.cpp
deleted file mode 100644
index acef8744..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30010-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30010-class.h
deleted file mode 100644
index 2293d9c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30011-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30011-misc.cpp
deleted file mode 100644
index 9e3b8c5b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30012-misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30012-misc2.cpp
deleted file mode 100644
index c5febbac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30013-sim.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30013-sim.h
deleted file mode 100644
index 835ae666..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30014-ctor-var.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30014-ctor-var.cpp
deleted file mode 100644
index 2551d8bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30015-exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30015-exception.cpp
deleted file mode 100644
index 75a4f97e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30016-custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30016-custom-open.cpp
deleted file mode 100644
index 234f5591..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30017-custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30017-custom-open.cpp
deleted file mode 100644
index 6acd92e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30018-class-addr.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30018-class-addr.h
deleted file mode 100644
index 042579dc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30019-wacky-template.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30019-wacky-template.cpp
deleted file mode 100644
index cf6e5c87..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30020-bool.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30020-bool.cpp
deleted file mode 100644
index 9f9e55b2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30021-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30021-byref.cpp
deleted file mode 100644
index 87f6c44a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30022-extern_c.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30022-extern_c.h
deleted file mode 100644
index a97d93b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30023-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30023-templates.cpp
deleted file mode 100644
index 960e0b82..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30023-templates.cpp
+++ /dev/null
@@ -1,197 +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;
-   int 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.74.0/tests/expected/cpp/30024-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30024-class-init.cpp
deleted file mode 100644
index 884d5c71..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30025-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30025-class-init.cpp
deleted file mode 100644
index 703686ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30026-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30026-byref.cpp
deleted file mode 100644
index 2534aa05..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30027-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30027-byref.cpp
deleted file mode 100644
index d0598697..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30028-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30028-byref.cpp
deleted file mode 100644
index 7a97856d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30029-init_align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30029-init_align.h
deleted file mode 100644
index 085f838b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30030-Timestamp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30030-Timestamp.h
deleted file mode 100644
index 998b7d6f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30031-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30031-operator.cpp
deleted file mode 100644
index f17b865d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30032-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30032-operator.cpp
deleted file mode 100644
index cfa98ca1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30033-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30033-operator.cpp
deleted file mode 100644
index 976d919f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30034-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30034-operator_proto.cpp
deleted file mode 100644
index 3e5af195..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30035-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30035-operator_proto.cpp
deleted file mode 100644
index 3824798c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30036-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30036-operator.cpp
deleted file mode 100644
index b1468795..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30037-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30037-operator_proto.cpp
deleted file mode 100644
index d5c7e8fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30038-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30038-operator.cpp
deleted file mode 100644
index a1bfafe3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30039-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30039-operator_proto.cpp
deleted file mode 100644
index 4ec0acf1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30040-nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30040-nl-class.h
deleted file mode 100644
index 9ccbcf75..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30041-nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30041-nl-class.h
deleted file mode 100644
index 57e47625..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30042-Issue_2020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30042-Issue_2020.cpp
deleted file mode 100644
index d618f922..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30043-nl_func_call_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30043-nl_func_call_empty.cpp
deleted file mode 100644
index fbf89d16..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/30045-nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30045-nl_func_decl.cpp
deleted file mode 100644
index 81d0a00e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30046-nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30046-nl_func_decl.cpp
deleted file mode 100644
index 17aa59f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp
deleted file mode 100644
index e8a947c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/30049-nl_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30049-nl_func_call_paren.cpp
deleted file mode 100644
index 847b7037..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30050-nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30050-nl-namespace.h
deleted file mode 100644
index e515b479..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30051-nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30051-nl-namespace.h
deleted file mode 100644
index c51d75be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30052-try-catch-nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30052-try-catch-nl.cpp
deleted file mode 100644
index 410a735e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30053-exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30053-exception.cpp
deleted file mode 100644
index 2c41efbf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30054-Issue_2091.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30054-Issue_2091.cpp
deleted file mode 100644
index 6e32d683..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30055-nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30055-nl_func.cpp
deleted file mode 100644
index 142e6895..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30056-nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30056-nl_func.cpp
deleted file mode 100644
index f930b703..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30057-nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30057-nl_inside_namespace.cpp
deleted file mode 100644
index 01486ebe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30058-nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30058-nl_inside_namespace.cpp
deleted file mode 100644
index 01486ebe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30059-Issue_2186.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30059-Issue_2186.cpp
deleted file mode 100644
index 2c3081ea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30060-Issue_1734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30060-Issue_1734.cpp
deleted file mode 100644
index 31d08c29..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30061-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30061-class-init.cpp
deleted file mode 100644
index 7ce41d09..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30062-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30062-class-init.cpp
deleted file mode 100644
index 53ce4a31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30063-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30063-class-init.cpp
deleted file mode 100644
index ad278c90..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30064-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30064-class-init.cpp
deleted file mode 100644
index c44bdfd3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30065-Example.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30065-Example.h
deleted file mode 100644
index 1a868d10..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30066-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30066-class-init.cpp
deleted file mode 100644
index 1fc8bb57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30067-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30067-nl_func_type_name.cpp
deleted file mode 100644
index a30a08e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30068-nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30068-nl_func_scope_name.cpp
deleted file mode 100644
index 1e4caa86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30069-class-implementation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30069-class-implementation.cpp
deleted file mode 100644
index 18481338..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30070-nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30070-nl_func_scope_name.cpp
deleted file mode 100644
index c14a06ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30071-lineEndings-Mac.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30071-lineEndings-Mac.cpp
deleted file mode 100644
index 20fa083a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30072-lineEndings-Win.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30072-lineEndings-Win.cpp
deleted file mode 100644
index cdbf7653..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30073-lineEndings-Unix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30073-lineEndings-Unix.cpp
deleted file mode 100644
index 608952c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30074-bom.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30074-bom.cpp
deleted file mode 100644
index 7ee7e7e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30075-goto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30075-goto.cpp
deleted file mode 100644
index 4cccfe2c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30076-Issue_2594.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30076-Issue_2594.cpp
deleted file mode 100644
index 240e19db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30077-Issue_2596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30077-Issue_2596.cpp
deleted file mode 100644
index d2517e8b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30078-Issue_2672-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30078-Issue_2672-a.cpp
deleted file mode 100644
index d29d2c47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30079-Issue_2672-b.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30079-Issue_2672-b.cpp
deleted file mode 100644
index f484d4ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30080-nl_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30080-nl_brace_brace.cpp
deleted file mode 100644
index a9783697..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30081-Issue_2383.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30081-Issue_2383.cpp
deleted file mode 100644
index 356fd9af..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30082-Issue_931.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30082-Issue_931.cpp
deleted file mode 100644
index 76a6b856..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30083-Issue_995-do.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30083-Issue_995-do.cpp
deleted file mode 100644
index 2e84d7ce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30084-Issue_1184.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30084-Issue_1184.cpp
deleted file mode 100644
index 848b1e03..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30085-align_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30085-align_class.cpp
deleted file mode 100644
index 552d6947..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30086-align_class-constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30086-align_class-constr.cpp
deleted file mode 100644
index f6082028..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30087-Issue_1511.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30087-Issue_1511.cpp
deleted file mode 100644
index 2583c0e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30088-Issue_2561.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30088-Issue_2561.cpp
deleted file mode 100644
index aa566966..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30089-Issue_2281.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30089-Issue_2281.cpp
deleted file mode 100644
index e0d8727d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30090-bug_488.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30090-bug_488.cpp
deleted file mode 100644
index 268d5ba4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30091-bug_472.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30091-bug_472.cpp
deleted file mode 100644
index e48251fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30092-bug_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30092-bug_481.cpp
deleted file mode 100644
index 99d8c390..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30093-bug_484.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30093-bug_484.cpp
deleted file mode 100644
index 875ff3d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30094-bug_495.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30094-bug_495.cpp
deleted file mode 100644
index d7db1238..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30095-bug_485.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30095-bug_485.cpp
deleted file mode 100644
index b5e7842c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30096-bug_1854.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30096-bug_1854.cpp
deleted file mode 100644
index 29cc2774..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30096-bug_1854.cpp
+++ /dev/null
@@ -1 +0,0 @@
-while (*p++ = ' ') ;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30097-issue_1946.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30097-issue_1946.cpp
deleted file mode 100644
index 9682da68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30098-Issue_2692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30098-Issue_2692.cpp
deleted file mode 100644
index 4173ad5d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30098-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.74.0/tests/expected/cpp/30099-bug_1127.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30099-bug_1127.cpp
deleted file mode 100644
index 0109baaf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30100-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30100-templates.cpp
deleted file mode 100644
index e4dd89e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30100-templates.cpp
+++ /dev/null
@@ -1,200 +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;
-   int 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.74.0/tests/expected/cpp/30101-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30101-templates.cpp
deleted file mode 100644
index 78a60ebd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30101-templates.cpp
+++ /dev/null
@@ -1,182 +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;
-   int 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.74.0/tests/expected/cpp/30102-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30102-templates.cpp
deleted file mode 100644
index 86bbfaf7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30102-templates.cpp
+++ /dev/null
@@ -1,188 +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;
-   int 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.74.0/tests/expected/cpp/30103-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30103-templates.cpp
deleted file mode 100644
index adadb882..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30103-templates.cpp
+++ /dev/null
@@ -1,188 +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;
-   int 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.74.0/tests/expected/cpp/30104-templ_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30104-templ_class.h
deleted file mode 100644
index 802f7e27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30105-av.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30105-av.h
deleted file mode 100644
index 6efe8e9b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30106-templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30106-templates2.cpp
deleted file mode 100644
index 48f56d99..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30107-templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30107-templates2.cpp
deleted file mode 100644
index a49d4381..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30108-templates3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30108-templates3.cpp
deleted file mode 100644
index a0e20d19..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30109-templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30109-templates4.cpp
deleted file mode 100644
index 781822e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30110-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30110-class-init.cpp
deleted file mode 100644
index e1b1949c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30111-bug_1346.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30111-bug_1346.h
deleted file mode 100644
index 2ca31e50..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30112-bug_1432.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30112-bug_1432.cpp
deleted file mode 100644
index 575a21c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30113-bug_1452.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30113-bug_1452.cpp
deleted file mode 100644
index 59a3babd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30114-bug_1462.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30114-bug_1462.cpp
deleted file mode 100644
index b6a33ceb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30115-Issue_1704.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30115-Issue_1704.cpp
deleted file mode 100644
index 90cb2049..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30116-Issue_1052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30116-Issue_1052.cpp
deleted file mode 100644
index 0e21f136..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30117-Issue_2343.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30117-Issue_2343.cpp
deleted file mode 100644
index a82e1172..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30118-Issue_2758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30118-Issue_2758.cpp
deleted file mode 100644
index 576b1bef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30119-Issue_2879.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30119-Issue_2879.cpp
deleted file mode 100644
index fbc323ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30120-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30120-sp_after_angle.cpp
deleted file mode 100644
index 04af5289..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30121-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30121-sp_after_angle.cpp
deleted file mode 100644
index 8764578e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30122-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30122-sp_after_angle.cpp
deleted file mode 100644
index ee7acae0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30123-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30123-sp_after_angle.cpp
deleted file mode 100644
index a791a8ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30124-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30124-sp_after_angle.cpp
deleted file mode 100644
index c29f3552..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30125-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30125-sp_after_angle.cpp
deleted file mode 100644
index a791a8ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30126-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30126-sp_after_angle.cpp
deleted file mode 100644
index 18788919..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30127-Issue_2565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30127-Issue_2565.cpp
deleted file mode 100644
index 721d4d78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30128-Issue_2873.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30128-Issue_2873.cpp
deleted file mode 100644
index 6803fd9a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30129-Issue_2890.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30129-Issue_2890.cpp
deleted file mode 100644
index d03e4f62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30130-if-constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30130-if-constexpr.cpp
deleted file mode 100644
index 483317be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30131-Issue_3010.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30131-Issue_3010.cpp
deleted file mode 100644
index 93fd70db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30132-sp_brace_catch.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30132-sp_brace_catch.cpp
deleted file mode 100644
index 04c1b9c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30133-Issue_3252.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30133-Issue_3252.cpp
deleted file mode 100644
index 5dc0e67e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30133-Issue_3252.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void (*x) (void);
-
-typedef struct
-{
-	void (*y) (void);
-} z;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30200-bug_1862.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30200-bug_1862.cpp
deleted file mode 100644
index c5357c86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30201-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30201-cmt_indent.cpp
deleted file mode 100644
index ed27ffca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30202-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30202-cmt_indent.cpp
deleted file mode 100644
index 95c47d6e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30203-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30203-cmt_indent.cpp
deleted file mode 100644
index 05cc2df3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30204-comment-align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30204-comment-align.cpp
deleted file mode 100644
index afaaafef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30205-cmt_right.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30205-cmt_right.cpp
deleted file mode 100644
index bcca4e2e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp
deleted file mode 100644
index d020e171..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30207-cmt_indent_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30207-cmt_indent_pp.h
deleted file mode 100644
index 50e35c8d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30208-bug_1108.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30208-bug_1108.cpp
deleted file mode 100644
index 573a9810..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30209-bug_1134.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30209-bug_1134.cpp
deleted file mode 100644
index 369b70f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30210-bug_1338.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30210-bug_1338.cpp
deleted file mode 100644
index 04b4cd8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp
deleted file mode 100644
index 34c09203..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp
deleted file mode 100644
index f9316598..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30213-align_right_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30213-align_right_comment.cpp
deleted file mode 100644
index 43a2a70f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30214-align_across_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30214-align_across_braces.cpp
deleted file mode 100644
index 199ede8d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30215-Issue_2099.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30215-Issue_2099.cpp
deleted file mode 100644
index 4726f44b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30216-Issue_2302.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30216-Issue_2302.cpp
deleted file mode 100644
index e2684ae6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30217-2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30217-2138.cpp
deleted file mode 100644
index 8d1d7462..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30218-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30218-trailing_return.cpp
deleted file mode 100644
index be70a23b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30219-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30219-trailing_return.cpp
deleted file mode 100644
index e250cbd5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30220-bug_1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30220-bug_1340.cpp
deleted file mode 100644
index f64bc6a0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30221-Issue_2914.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30221-Issue_2914.cpp
deleted file mode 100644
index c2cd8b59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30222-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30222-trailing_return.cpp
deleted file mode 100644
index 9c076282..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30223-sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30223-sp_enum_colon.cpp
deleted file mode 100644
index 11d7320b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30224-sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30224-sp_enum_colon.cpp
deleted file mode 100644
index 804fe1ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30225-Issue_3176.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30225-Issue_3176.cpp
deleted file mode 100644
index 2384027d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30225-Issue_3176.cpp
+++ /dev/null
@@ -1 +0,0 @@
-SecureStorage::~SecureStorage() = default;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30226-sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30226-sp_enum_colon.cpp
deleted file mode 100644
index be23e687..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30226-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.74.0/tests/expected/cpp/30227-sp_inside_braces_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30227-sp_inside_braces_enum.cpp
deleted file mode 100644
index 8386e215..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30227-sp_inside_braces_enum.cpp
+++ /dev/null
@@ -1 +0,0 @@
-enum {    IDD = IDD_ATCS_MGR_DLG   };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30228-sp_inside_braces_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30228-sp_inside_braces_enum.cpp
deleted file mode 100644
index 666f834c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30228-sp_inside_braces_enum.cpp
+++ /dev/null
@@ -1 +0,0 @@
-enum { IDD = IDD_ATCS_MGR_DLG };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30229-sp_inside_braces_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30229-sp_inside_braces_enum.cpp
deleted file mode 100644
index 98640667..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30229-sp_inside_braces_enum.cpp
+++ /dev/null
@@ -1 +0,0 @@
-enum {IDD = IDD_ATCS_MGR_DLG};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30230-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30230-sp_type_func.cpp
deleted file mode 100644
index 0d17364f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30231-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30231-sp_type_func.cpp
deleted file mode 100644
index d7d69cc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30232-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30232-sp_type_func.cpp
deleted file mode 100644
index fe2a3348..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30233-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30233-sp_type_func.cpp
deleted file mode 100644
index fe2a3348..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30234-functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30234-functype_param.cpp
deleted file mode 100644
index 32419616..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30235-functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30235-functype_param.cpp
deleted file mode 100644
index 9e9f5ecc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30240-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30240-align_func_params.cpp
deleted file mode 100644
index 923d274b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30241-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30241-align_func_params.cpp
deleted file mode 100644
index 923d274b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30242-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30242-align_func_params.cpp
deleted file mode 100644
index 512233cd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30243-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30243-align_func_params.cpp
deleted file mode 100644
index 82434066..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30244-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30244-align_func_params.cpp
deleted file mode 100644
index 5efed666..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30245-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30245-align_func_params.cpp
deleted file mode 100644
index a44170a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30246-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30246-align_func_params.cpp
deleted file mode 100644
index 9def11e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30247-Issue_2332.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30247-Issue_2332.cpp
deleted file mode 100644
index 0bc9cf8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30248-Issue_2831.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30248-Issue_2831.cpp
deleted file mode 100644
index c099567a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30249-align-330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30249-align-330.cpp
deleted file mode 100644
index a92e1545..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30250-align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30250-align_fcall.cpp
deleted file mode 100644
index 055f0029..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30251-align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30251-align_fcall.cpp
deleted file mode 100644
index 055f0029..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30253-align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30253-align_left_shift.cpp
deleted file mode 100644
index 7c98226d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30254-align_left_shift2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30254-align_left_shift2.cpp
deleted file mode 100644
index bfea744c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30255-align_constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30255-align_constr.cpp
deleted file mode 100644
index 380f0c8b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30256-func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30256-func_call.cpp
deleted file mode 100644
index e3eff88c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30257-func_call_chain.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30257-func_call_chain.cpp
deleted file mode 100644
index 7e2f3931..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30258-casts.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30258-casts.cpp
deleted file mode 100644
index d8a496fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp
deleted file mode 100644
index 7b63b639..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30260-var_def_gap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30260-var_def_gap.cpp
deleted file mode 100644
index 7333d292..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30261-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30261-align_var_def_thresh.cpp
deleted file mode 100644
index 8512377e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30262-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30262-align_var_def_thresh.cpp
deleted file mode 100644
index 4996a3d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30263-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30263-align_var_def_thresh.cpp
deleted file mode 100644
index 1e10f370..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30264-Issue_2668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30264-Issue_2668.cpp
deleted file mode 100644
index da8e118f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30265-long_br_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30265-long_br_cmt.cpp
deleted file mode 100644
index 8ebdcec9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30266-Issue_2921.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30266-Issue_2921.cpp
deleted file mode 100644
index 53e3c495..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30267-Issue_2930.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30267-Issue_2930.cpp
deleted file mode 100644
index 00cff53b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30268-Issue_3018.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30268-Issue_3018.cpp
deleted file mode 100644
index ddbb473e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30270-const_throw.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30270-const_throw.cpp
deleted file mode 100644
index 44f0ca68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30271-sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30271-sp_throw_paren.cpp
deleted file mode 100644
index 21ce9291..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30272-sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30272-sp_throw_paren.cpp
deleted file mode 100644
index ea851aff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp
deleted file mode 100644
index ee0d705b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp
deleted file mode 100644
index 93cc7f86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30275-bug_1321.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30275-bug_1321.cpp
deleted file mode 100644
index 5e708c11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30278-bug_1439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30278-bug_1439.cpp
deleted file mode 100644
index d560522b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp
deleted file mode 100644
index c8b92481..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30280-sf557.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30280-sf557.cpp
deleted file mode 100644
index 287bc9c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30281-Issue_2478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30281-Issue_2478.cpp
deleted file mode 100644
index 40674590..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30282-Issue_2703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30282-Issue_2703.cpp
deleted file mode 100644
index ec4554e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30283-Issue_3321.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30283-Issue_3321.h
deleted file mode 100644
index 9444d24c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30283-Issue_3321.h
+++ /dev/null
@@ -1,8 +0,0 @@
-auto l1 = []() {
-	  };
-auto l2 = [&]() {
-	  };
-auto l3 = []() noexcept {
-	  };
-auto l4 = [&]() noexcept {
-	  };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30290-align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30290-align_left_shift.cpp
deleted file mode 100644
index 8591a642..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30291-indent_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30291-indent_shift.cpp
deleted file mode 100644
index bc1ae2e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30292-eigen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30292-eigen.cpp
deleted file mode 100644
index aa43434a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30293-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30293-pos_shift.cpp
deleted file mode 100644
index d4a8f1ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30294-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30294-pos_shift.cpp
deleted file mode 100644
index badc9798..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30295-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30295-pos_shift.cpp
deleted file mode 100644
index efb19263..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30300-enum_shr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30300-enum_shr.cpp
deleted file mode 100644
index 26e0d08e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30301-enum_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30301-enum_class.h
deleted file mode 100644
index 7ad5e9ea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30302-bug_1315.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30302-bug_1315.cpp
deleted file mode 100644
index 584f9a00..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30303-Issue_2902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30303-Issue_2902.cpp
deleted file mode 100644
index ae10d5a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30303-Issue_2902.cpp
+++ /dev/null
@@ -1 +0,0 @@
-enum empty {};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30310-braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30310-braced_init_list.cpp
deleted file mode 100644
index 116462c2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30311-uniform_initialization.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30311-uniform_initialization.cpp
deleted file mode 100644
index 64da585d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30312-return_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30312-return_init_list.cpp
deleted file mode 100644
index ef91c528..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30313-sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30313-sp_brace_brace.cpp
deleted file mode 100644
index 2ae91737..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30314-sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30314-sp_brace_brace.cpp
deleted file mode 100644
index b7ca9839..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30315-return_braced_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30315-return_braced_init.cpp
deleted file mode 100644
index cf86baeb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30316-Issue_2428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30316-Issue_2428.cpp
deleted file mode 100644
index b2a0a139..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp
deleted file mode 100644
index 3c22d790..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30318-Issue_2949.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30318-Issue_2949.cpp
deleted file mode 100644
index d37d7ac3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30319-Issue_2886.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30319-Issue_2886.cpp
deleted file mode 100644
index 0474c710..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30320-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30320-returns.cpp
deleted file mode 100644
index d1ac08c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30320-returns.cpp
+++ /dev/null
@@ -1,34 +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 foo6(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}
-#define case6(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};
-	case 6:
-		return /**/ 6;
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30321-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30321-returns.cpp
deleted file mode 100644
index 1abe1e54..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30321-returns.cpp
+++ /dev/null
@@ -1,34 +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 foo6(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}
-#define case6(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};
-	case 6:
-		return /**/ 6;
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30322-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30322-returns.cpp
deleted file mode 100644
index a61b0fcf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30322-returns.cpp
+++ /dev/null
@@ -1,34 +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 foo6(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}
-#define case6(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};
-	case 6:
-		return /**/ 6;
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30323-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30323-returns.cpp
deleted file mode 100644
index b12cd7eb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30323-returns.cpp
+++ /dev/null
@@ -1,34 +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 foo6(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}
-#define case6(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};
-	case 6:
-		return /**/ 6;
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30324-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30324-returns.cpp
deleted file mode 100644
index fede22db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30324-returns.cpp
+++ /dev/null
@@ -1,34 +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 foo6(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}
-#define case6(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};
-	case 6:
-		return /**/ (6);
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30325-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30325-returns.cpp
deleted file mode 100644
index d797f9c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30325-returns.cpp
+++ /dev/null
@@ -1,34 +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 foo6(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}
-#define case6(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};
-	case 6:
-		return /**/ 6;
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30326-indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30326-indent_off_after_return.cpp
deleted file mode 100644
index 6cd6d8e4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30327-indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30327-indent_off_after_return.cpp
deleted file mode 100644
index 6cd6d8e4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30328-call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30328-call_brace_init_lst.cpp
deleted file mode 100644
index b75c35b1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30329-call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30329-call_brace_init_lst.cpp
deleted file mode 100644
index 83837910..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30330-Issue_3080.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30330-Issue_3080.cpp
deleted file mode 100644
index 75c6072b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp
deleted file mode 100644
index 15cc6e3a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30401-Issue_2570.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30401-Issue_2570.cpp
deleted file mode 100644
index 44373e77..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30701-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30701-function-def.cpp
deleted file mode 100644
index 89261c8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30702-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30702-function-def.cpp
deleted file mode 100644
index c1fb4ed4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30703-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30703-function-def.cpp
deleted file mode 100644
index c604152d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30705-func_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30705-func_param.cpp
deleted file mode 100644
index 8bdb0ce8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30706-bug_1020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30706-bug_1020.cpp
deleted file mode 100644
index f0e9e60d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30711-semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30711-semicolons.cpp
deleted file mode 100644
index de28deef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30712-bug_1158.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30712-bug_1158.cpp
deleted file mode 100644
index 2a9ba76d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp
deleted file mode 100644
index 890f2eba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30714-Issue_1733.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30714-Issue_1733.cpp
deleted file mode 100644
index 10be5586..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30715-Issue_2942.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30715-Issue_2942.cpp
deleted file mode 100644
index dbecc7f4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30720-custom-open-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30720-custom-open-2.cpp
deleted file mode 100644
index 4d05944a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30721-Issue_2386.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30721-Issue_2386.cpp
deleted file mode 100644
index ac0b1dd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30730-qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30730-qt-1.cpp
deleted file mode 100644
index 5d0273e2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30731-qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30731-qt-1.cpp
deleted file mode 100644
index 55b2459b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30732-Issue_2734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30732-Issue_2734.cpp
deleted file mode 100644
index 27dfdc70..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30740-sef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30740-sef.cpp
deleted file mode 100644
index 8730ba15..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30741-al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30741-al.cpp
deleted file mode 100644
index 1c911bf2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30742-delete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30742-delete.cpp
deleted file mode 100644
index c33aa682..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30745-Issue_2170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30745-Issue_2170.cpp
deleted file mode 100644
index f1edafd8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30746-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30746-DefaultAndDelete.cpp
deleted file mode 100644
index 7dff7dd5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30747-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30747-DefaultAndDelete.cpp
deleted file mode 100644
index 30d315a7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30748-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30748-DefaultAndDelete.cpp
deleted file mode 100644
index 9b55a964..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30750-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30750-lambda.cpp
deleted file mode 100644
index 5ba33b05..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30751-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30751-lambda.cpp
deleted file mode 100644
index 13d35a5a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30752-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30752-lambda.cpp
deleted file mode 100644
index 84ca8b21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30753-lambda2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30753-lambda2.cpp
deleted file mode 100644
index 2bcfff9f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30754-bug_i_682.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30754-bug_i_682.h
deleted file mode 100644
index 51c58e23..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30755-bug_i_938.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30755-bug_i_938.h
deleted file mode 100644
index b13997a6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30756-bug_1296.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30756-bug_1296.cpp
deleted file mode 100644
index 482045df..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30757-Issue_3054.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30757-Issue_3054.cpp
deleted file mode 100644
index 53edc388..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30758-Issue_3054-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30758-Issue_3054-2.cpp
deleted file mode 100644
index e4c1c8da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30761-out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30761-out-668.cpp
deleted file mode 100644
index 8829c0ce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30762-out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30762-out-668.cpp
deleted file mode 100644
index 0dac74c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30763-Issue_2166.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30763-Issue_2166.cpp
deleted file mode 100644
index d9ac55c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30764-Issue_2591.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30764-Issue_2591.cpp
deleted file mode 100644
index 01ed232e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30765-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30765-lambda.cpp
deleted file mode 100644
index 6f8c8e55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30765-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.74.0/tests/expected/cpp/30766-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30766-lambda.cpp
deleted file mode 100644
index 6f8c8e55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30766-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.74.0/tests/expected/cpp/30767-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30767-lambda.cpp
deleted file mode 100644
index 6f8c8e55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30767-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.74.0/tests/expected/cpp/30768-sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30768-sp_cpp_lambda_fparen.cpp
deleted file mode 100644
index e25d0496..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30768-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.74.0/tests/expected/cpp/30770-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30770-lambda.cpp
deleted file mode 100644
index 25319dcc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30771-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30771-lambda.cpp
deleted file mode 100644
index 1f091e6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30772-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30772-lambda.cpp
deleted file mode 100644
index a5e5f3ee..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30773-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30773-lambda.cpp
deleted file mode 100644
index 3e628450..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30774-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30774-lambda.cpp
deleted file mode 100644
index 3e628450..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30775-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30775-lambda.cpp
deleted file mode 100644
index d86e0d59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp
deleted file mode 100644
index e0c1985d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp
deleted file mode 100644
index f882a211..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp
deleted file mode 100644
index c740c4bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30781-lambda_brace_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30781-lambda_brace_list.cpp
deleted file mode 100644
index 8626f5af..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30790-Issue_2795.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30790-Issue_2795.cpp
deleted file mode 100644
index 6cb7e112..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30791-Issue_3203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30791-Issue_3203.cpp
deleted file mode 100644
index 519d29dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30791-Issue_3203.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <vector>

-

-class A

-{

-public:

-    int a;

-    int b;

-

-    std::vector<int*> v =

-    {

-        &a,

-        &b

-    };

-};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30800-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30800-align-star-amp-pos.cpp
deleted file mode 100644
index dc988ce1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30801-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30801-align-star-amp-pos.cpp
deleted file mode 100644
index c23b0d4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30802-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30802-align-star-amp-pos.cpp
deleted file mode 100644
index cf2bff2d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30803-bug_1403.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30803-bug_1403.cpp
deleted file mode 100644
index 209c0173..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30805-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30805-ptr-star.cpp
deleted file mode 100644
index fcefa84f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30806-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30806-ptr-star.cpp
deleted file mode 100644
index 76659df9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30807-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30807-ptr-star.cpp
deleted file mode 100644
index 55478e3f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30808-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30808-ptr-star.cpp
deleted file mode 100644
index 68cb8151..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30809-bug_1289.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30809-bug_1289.cpp
deleted file mode 100644
index 42663477..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30810-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30810-ptr-star.cpp
deleted file mode 100644
index fa88b0bc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30811-misc3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30811-misc3.cpp
deleted file mode 100644
index 9ca06c3c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30812-misc4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30812-misc4.cpp
deleted file mode 100644
index 5ddaffb0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30813-misc5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30813-misc5.cpp
deleted file mode 100644
index e8ffaf27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30814-misc6.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30814-misc6.cpp
deleted file mode 100644
index 95cc0383..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30815-cmt-reflow.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30815-cmt-reflow.cpp
deleted file mode 100644
index 8bd50283..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30816-for_long.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30816-for_long.cpp
deleted file mode 100644
index 5483d4c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp
deleted file mode 100644
index 9acbac58..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30818-bug_1169.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30818-bug_1169.cpp
deleted file mode 100644
index b1138a57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30819-bug_1170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30819-bug_1170.cpp
deleted file mode 100644
index 18e029cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30820-pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30820-pp-define-indent.cpp
deleted file mode 100644
index 0d7892a2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30821-pp_indent_case.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30821-pp_indent_case.cpp
deleted file mode 100644
index 70b1b9c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30822-pp_indent_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30822-pp_indent_brace.cpp
deleted file mode 100644
index 4900fa34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30823-pp_indent_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30823-pp_indent_func_def.cpp
deleted file mode 100644
index b01c6bbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30824-pp_indent_extern.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30824-pp_indent_extern.cpp
deleted file mode 100644
index 995db611..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30825-Issue_1966.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30825-Issue_1966.cpp
deleted file mode 100644
index 12a8084b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30826-Issue_2319.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30826-Issue_2319.cpp
deleted file mode 100644
index 8c0ae3e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30827-Issue_1167.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30827-Issue_1167.cpp
deleted file mode 100644
index 6410326c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30828-bug_1691.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30828-bug_1691.cpp
deleted file mode 100644
index e93f7f74..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30829-Issue_2726.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30829-Issue_2726.cpp
deleted file mode 100644
index bb7f1d4b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30830-kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30830-kw_subst.cpp
deleted file mode 100644
index 47084a7e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30831-kw_subst2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30831-kw_subst2.cpp
deleted file mode 100644
index b5e58eac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30832-kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30832-kw_subst.cpp
deleted file mode 100644
index 47084a7e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30840-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30840-nl_func_type_name.cpp
deleted file mode 100644
index a4302001..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30841-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30841-nl_func_type_name.cpp
deleted file mode 100644
index 5997a5c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30842-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30842-nl_func_type_name.cpp
deleted file mode 100644
index a826af48..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30843-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30843-nl_func_type_name.cpp
deleted file mode 100644
index b1ead857..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30844-Issue_2771.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30844-Issue_2771.cpp
deleted file mode 100644
index ab7c285f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30845-deref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30845-deref.cpp
deleted file mode 100644
index 9705b51f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30846-Issue_3197.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30846-Issue_3197.h
deleted file mode 100644
index 76331aa3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30846-Issue_3197.h
+++ /dev/null
@@ -1,4 +0,0 @@
-vec_           &                    operator+=(vec_   &, const vec_   &);
-
-
-int       xyz(int a, int b);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc
deleted file mode 100644
index 9cc04a18..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30852-Issue_2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30852-Issue_2138.cpp
deleted file mode 100644
index 3a8fa83c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30853-noexcept.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30853-noexcept.cpp
deleted file mode 100644
index 60f2edd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30853-noexcept.cpp
+++ /dev/null
@@ -1 +0,0 @@
-foo() noexcept;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30854-Issue_1703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30854-Issue_1703.cpp
deleted file mode 100644
index af32d661..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30855-cpp_move.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30855-cpp_move.cpp
deleted file mode 100644
index cec9beb8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp
deleted file mode 100644
index dc9e4160..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp
deleted file mode 100644
index 29f75936..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30860-sf574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30860-sf574.cpp
deleted file mode 100644
index 58810404..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30870-cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30870-cmt_insert.cpp
deleted file mode 100644
index cf5ac204..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30871-cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30871-cmt_insert.cpp
deleted file mode 100644
index a169795a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30872-Issue_2752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30872-Issue_2752.cpp
deleted file mode 100644
index b305b50f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30880-bug_1758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30880-bug_1758.cpp
deleted file mode 100644
index b0f35107..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30881-bug_1758-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30881-bug_1758-f.cpp
deleted file mode 100644
index 24bb563b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30900-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30900-region.cpp
deleted file mode 100644
index 27823ca6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30901-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30901-region.cpp
deleted file mode 100644
index b7bebae8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30902-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30902-region.cpp
deleted file mode 100644
index 39b20ea6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30903-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30903-region.cpp
deleted file mode 100644
index d6e3403a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30907-Issue_1813.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30907-Issue_1813.cpp
deleted file mode 100644
index d5a3cc71..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30908-Issue_1813-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30908-Issue_1813-2.cpp
deleted file mode 100644
index 310de82f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30909-Issue_1813-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30909-Issue_1813-3.cpp
deleted file mode 100644
index 08c8405d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30910-indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30910-indent_namespace.h
deleted file mode 100644
index d569a3ca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30911-indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30911-indent_namespace.h
deleted file mode 100644
index 6f80dc3b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30912-long_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30912-long_namespace.cpp
deleted file mode 100644
index 80af6e83..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30913-indent_namespace2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30913-indent_namespace2.h
deleted file mode 100644
index 196b2322..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30914-indent_namespace_single_indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30914-indent_namespace_single_indent.h
deleted file mode 100644
index 24a9b935..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30915-bug_1235.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30915-bug_1235.cpp
deleted file mode 100644
index b9ff78a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30916-Issue_1737.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30916-Issue_1737.cpp
deleted file mode 100644
index 06b0866b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30917-Issue_2345-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30917-Issue_2345-3.cpp
deleted file mode 100644
index 787ce29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30918-Issue_2345-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30918-Issue_2345-4.cpp
deleted file mode 100644
index f82d757d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30919-Issue_2387.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30919-Issue_2387.cpp
deleted file mode 100644
index 526278d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30920-indent-off.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30920-indent-off.cpp
deleted file mode 100644
index f9eccdb8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30921-variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30921-variadic-template.h
deleted file mode 100644
index f159e700..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30922-variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30922-variadic-template.h
deleted file mode 100644
index 0a1bd443..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30923-sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30923-sf.2886991.cpp
deleted file mode 100644
index 61dc7c21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30924-sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30924-sf.2886991.cpp
deleted file mode 100644
index ce5e0b93..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30925-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30925-function-def.cpp
deleted file mode 100644
index 2d6df544..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30926-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30926-function-def.cpp
deleted file mode 100644
index 78b23a14..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30927-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30927-function-def.cpp
deleted file mode 100644
index bceb00f6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30928-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30928-function-def.cpp
deleted file mode 100644
index b14ecb11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30929-bug_1324.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30929-bug_1324.cpp
deleted file mode 100644
index 1aca5762..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30930-indent_var_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30930-indent_var_def.cpp
deleted file mode 100644
index 5b3ee4e2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30931-indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30931-indent_var_def_cont.cpp
deleted file mode 100644
index c505389f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30932-indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30932-indent_var_def_cont.cpp
deleted file mode 100644
index 70b7304e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/30935-indent-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30935-indent-misc.cpp
deleted file mode 100644
index ad8de7b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30936-indent_braces_no.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30936-indent_braces_no.h
deleted file mode 100644
index 725b0402..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30937-indent_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30937-indent_param.cpp
deleted file mode 100644
index 31569ec1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30938-indent_switch_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30938-indent_switch_pp.cpp
deleted file mode 100644
index dd910c56..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/30940-case-brace-remove.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30940-case-brace-remove.cpp
deleted file mode 100644
index cd163570..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30941-Issue_2150.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30941-Issue_2150.cpp
deleted file mode 100644
index 1e4d6bf5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30942-Issue_1692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30942-Issue_1692.cpp
deleted file mode 100644
index 89de1d6a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30943-Issue_2735.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30943-Issue_2735.cpp
deleted file mode 100644
index 3e292425..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30945-sf.3266678.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30945-sf.3266678.cpp
deleted file mode 100644
index 810b5105..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30946-sf.3315874.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30946-sf.3315874.h
deleted file mode 100644
index 05161496..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30947-bug_1689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30947-bug_1689.cpp
deleted file mode 100644
index 40d34d61..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30948-sp_before_byref_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30948-sp_before_byref_func.cpp
deleted file mode 100644
index 4abfe954..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30949-Issue_2757.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30949-Issue_2757.cpp
deleted file mode 100644
index ba83c29e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp
deleted file mode 100644
index ad0e38d5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30953-constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30953-constr_colon.cpp
deleted file mode 100644
index 6c0706e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30954-Issue_2305.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30954-Issue_2305.cpp
deleted file mode 100644
index 7458b913..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30955-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30955-indent_ctor_init.cpp
deleted file mode 100644
index 55982328..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30956-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30956-indent_ctor_init.cpp
deleted file mode 100644
index 29a146a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30957-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30957-class-init.cpp
deleted file mode 100644
index faa28873..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/30960-Issue_2151.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30960-Issue_2151.cpp
deleted file mode 100644
index d0ee05d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30961-Issue_2232.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30961-Issue_2232.cpp
deleted file mode 100644
index 7867820b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/30963-Issue_2907.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30963-Issue_2907.cpp
deleted file mode 100644
index c0192c4d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30964-Issue_2823.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30964-Issue_2823.cpp
deleted file mode 100644
index c633398f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30970-Issue_2219.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30970-Issue_2219.cpp
deleted file mode 100644
index e08cb889..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30971-Issue_2224.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30971-Issue_2224.cpp
deleted file mode 100644
index 0c454905..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30972-Issue_2229.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30972-Issue_2229.cpp
deleted file mode 100644
index 0c44ed6a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30973-Issue_2236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30973-Issue_2236.cpp
deleted file mode 100644
index 7f7f01f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/30974-using-alias-in-define.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30974-using-alias-in-define.cpp
deleted file mode 100644
index 1b4153d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31000-digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31000-digraph.cpp
deleted file mode 100644
index e985dae6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31001-digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31001-digraph.cpp
deleted file mode 100644
index 641390a6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31050-pos_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31050-pos_assign.cpp
deleted file mode 100644
index af55296b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31050-pos_assign.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-static const unsigned char radiooff_light_bits[] =
-{
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x08, 0x00, 0x10, 0x00, 0x10,
-	0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x08, 0x00, 0x08, 0x0c, 0x06,
-	0xf0, 0x01
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31051-pos_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31051-pos_assign.cpp
deleted file mode 100644
index af55296b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31051-pos_assign.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-static const unsigned char radiooff_light_bits[] =
-{
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x08, 0x00, 0x10, 0x00, 0x10,
-	0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x08, 0x00, 0x08, 0x0c, 0x06,
-	0xf0, 0x01
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31101-nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31101-nl_before_brace_open_test.cpp
deleted file mode 100644
index fdf9067a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31101-nl_before_brace_open_test.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-int foo1() {
-	int i; if (true) { i=2; }
-}
-
-namespace { int foo1() {
-		    int i; if (true) { i=2; }
-	    }
-}
-
-class bar {
-int foo1() {
-	int i; i = 1; if (true) { i=2; }
-}
-int foo2() {
-	int i; i = 1; if (true) { i=2; }
-}
-}
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-static const kjs_double_t NaN_Bytes = {{0x7f, 0xf8, 0, 0, 0, 0, 0, 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-static struct LanguageForEncoding {
-	const char *index; int data;
-} const language_for_encoding[] = { {"iso 8859-1", 13}, {"iso 8859-15", 13} }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31102-nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31102-nl_before_brace_open_test.cpp
deleted file mode 100644
index 59342e57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31102-nl_before_brace_open_test.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-int foo1()
-{
-	int i; if (true)
-	{ i=2; }
-}
-
-namespace
-{ int foo1()
-  {
-	  int i; if (true)
-	  { i=2; }
-  }
-}
-
-class bar
-{
-int foo1()
-{
-	int i; i = 1; if (true)
-	{ i=2; }
-}
-int foo2()
-{
-	int i; i = 1; if (true)
-	{ i=2; }
-}
-}
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-static const kjs_double_t NaN_Bytes =
-{
-	{0x7f, 0xf8, 0, 0, 0, 0, 0, 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-static struct LanguageForEncoding
-{
-	const char *index; int data;
-} const language_for_encoding[] =
-{
-	{"iso 8859-1", 13},
-	{"iso 8859-15", 13} }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31103-nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31103-nl_before_brace_open_test.cpp
deleted file mode 100644
index 5efbf20e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31103-nl_before_brace_open_test.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-int foo1() { int i; if (true) { i=2; }}
-
-namespace { int foo1() { int i; if (true) { i=2; }}}
-
-class bar
-{
-int foo1() { int i; i = 1; if (true) { i=2; }}
-int foo2() { int i; i = 1; if (true) { i=2; }}
-}
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-static const kjs_double_t NaN_Bytes =
-{
-	{0x7f, 0xf8, 0, 0, 0, 0, 0, 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-static struct LanguageForEncoding
-{
-	const char *index; int data;
-} const language_for_encoding[] =
-{
-	{"iso 8859-1", 13},
-	{"iso 8859-15", 13} }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31104-nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31104-nl_before_brace_open_test.cpp
deleted file mode 100644
index a1b93406..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31104-nl_before_brace_open_test.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-int foo1() { int i; if (true) { i=2; }}
-
-namespace
-{ int foo1() { int i; if (true) { i=2; }}}
-
-class bar
-{
-int foo1() { int i; i = 1; if (true) { i=2; }}
-int foo2() { int i; i = 1; if (true) { i=2; }}
-}
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-static const kjs_double_t NaN_Bytes =
-{
-	{0x7f, 0xf8, 0, 0, 0, 0, 0, 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-static struct LanguageForEncoding
-{
-	const char *index; int data;
-} const language_for_encoding[] =
-{
-	{"iso 8859-1", 13},
-	{"iso 8859-15", 13} }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31562-sf562.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31562-sf562.cpp
deleted file mode 100644
index 15ee8e79..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31567-sf567.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31567-sf567.cpp
deleted file mode 100644
index 6d96731d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31568-Issue_2368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31568-Issue_2368.cpp
deleted file mode 100644
index 82b8c59c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31583-sf583.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31583-sf583.cpp
deleted file mode 100644
index 34fc0c21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31593-sf593.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31593-sf593.cpp
deleted file mode 100644
index 2d4499e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31594-issue_672.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31594-issue_672.cpp
deleted file mode 100644
index 499f3168..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31595-issue_1778.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31595-issue_1778.cpp
deleted file mode 100644
index 4eea46e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31596-issue_1782.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31596-issue_1782.cpp
deleted file mode 100644
index 664ead7f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31597-issue_1804.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31597-issue_1804.cpp
deleted file mode 100644
index c98ecdef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31598-Issue_1753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31598-Issue_1753.cpp
deleted file mode 100644
index 9f7da399..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31599-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31599-parameter-packs.cpp
deleted file mode 100644
index 4961aa2b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31599-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.74.0/tests/expected/cpp/31600-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31600-parameter-packs.cpp
deleted file mode 100644
index 5d1cd8e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31601-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31601-parameter-packs.cpp
deleted file mode 100644
index 0394fe8b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31602-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31602-parameter-packs.cpp
deleted file mode 100644
index 15d0a382..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31603-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31603-parameter-packs.cpp
deleted file mode 100644
index 3a810b8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31604-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31604-parameter-packs.cpp
deleted file mode 100644
index 2a180b34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31605-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31605-parameter-packs.cpp
deleted file mode 100644
index a08af3cf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31606-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31606-parameter-packs.cpp
deleted file mode 100644
index a73e2c43..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31607-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31607-parameter-packs.cpp
deleted file mode 100644
index 153fc615..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31608-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31608-parameter-packs.cpp
deleted file mode 100644
index 13ba49db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31609-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31609-parameter-packs.cpp
deleted file mode 100644
index e00841b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31610-Issue_2085.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31610-Issue_2085.cpp
deleted file mode 100644
index 581f4db4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31611-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31611-parameter-packs.cpp
deleted file mode 100644
index 4e89022d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31611-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.74.0/tests/expected/cpp/31612-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31612-parameter-packs.cpp
deleted file mode 100644
index 4e89022d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31612-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.74.0/tests/expected/cpp/31613-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31613-parameter-packs.cpp
deleted file mode 100644
index 4e89022d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31613-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.74.0/tests/expected/cpp/31614-Issue_3309.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31614-Issue_3309.cpp
deleted file mode 100644
index d6dd1dac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31614-Issue_3309.cpp
+++ /dev/null
@@ -1 +0,0 @@
-template<typename ...               ARGS> void test(ARGS&&... args) {}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31615-Issue_3309.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31615-Issue_3309.cpp
deleted file mode 100644
index 84ee58aa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31615-Issue_3309.cpp
+++ /dev/null
@@ -1 +0,0 @@
-template<typename ... ARGS> void test(ARGS&&... args) {}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31616-Issue_3309.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31616-Issue_3309.cpp
deleted file mode 100644
index c269ddb0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31616-Issue_3309.cpp
+++ /dev/null
@@ -1 +0,0 @@
-template<typename ...ARGS> void test(ARGS&&... args) {}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31620-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31620-sp_after_type.cpp
deleted file mode 100644
index 460c0dc2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31621-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31621-sp_after_type.cpp
deleted file mode 100644
index b1ffd02b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31622-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31622-sp_after_type.cpp
deleted file mode 100644
index a924423a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31623-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31623-sp_after_type.cpp
deleted file mode 100644
index 5d923c27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31624-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31624-sp_after_type.cpp
deleted file mode 100644
index b66aba0c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31625-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31625-sp_after_type.cpp
deleted file mode 100644
index add7b57e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31626-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31626-issue_1916.cpp
deleted file mode 100644
index 56ce6f4c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31627-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31627-issue_1916.cpp
deleted file mode 100644
index f84334a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31628-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31628-issue_1916.cpp
deleted file mode 100644
index df2af994..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31629-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31629-issue_1916.cpp
deleted file mode 100644
index 913f1e28..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31630-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31630-issue_1916.cpp
deleted file mode 100644
index df2af994..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31631-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31631-issue_1916.cpp
deleted file mode 100644
index 913f1e28..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31632-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31632-issue_1916.cpp
deleted file mode 100644
index 292b6837..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31633-sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31633-sp_after_decltype.cpp
deleted file mode 100644
index 6a62e6f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31634-sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31634-sp_after_decltype.cpp
deleted file mode 100644
index c48543be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31635-sp_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31635-sp_decltype.cpp
deleted file mode 100644
index 84b157f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31636-Issue_1923.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31636-Issue_1923.cpp
deleted file mode 100644
index 8c3ebe66..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31660-issue_1919.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31660-issue_1919.cpp
deleted file mode 100644
index 187065d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31661-Issue_3097.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31661-Issue_3097.cpp
deleted file mode 100644
index ede644ad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31661-Issue_3097.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-void foo()
-{
-	for( unsigned p = 0; p < np;
-	     ++p )
-	{
-		double* o = bar[p];
-	}
-
-	int x = 42;
-}
-
-void bar()
-{
-	// hello
-	int x  = 42;
-	if( x ) foo;
-
-	type::value_t y = 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp
deleted file mode 100644
index 03615082..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp
deleted file mode 100644
index f67cb76b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp
deleted file mode 100644
index adf1b8be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp
deleted file mode 100644
index e806e89e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp
deleted file mode 100644
index 8350740b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp
deleted file mode 100644
index 56f16799..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31720-bit-colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31720-bit-colon.cpp
deleted file mode 100644
index b8e7c4db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31721-Issue_2689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31721-Issue_2689.cpp
deleted file mode 100644
index e2b43674..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31730-ms-style-ref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31730-ms-style-ref.cpp
deleted file mode 100644
index 826d4e90..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/31740-I2102.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31740-I2102.cpp
deleted file mode 100644
index d8cf883a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp
deleted file mode 100644
index 99d403ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/32001-issue_547_for_each.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32001-issue_547_for_each.cpp
deleted file mode 100644
index cfbe7963..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/32002-proto-wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32002-proto-wrap.cpp
deleted file mode 100644
index 35e8bea3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/32003-issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32003-issue_633_typename.cpp
deleted file mode 100644
index 33b947f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/32004-issue_624_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32004-issue_624_angle.cpp
deleted file mode 100644
index 255db223..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/32005-issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32005-issue_633_typename.cpp
deleted file mode 100644
index 33b947f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/32006-bug_i_687.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32006-bug_i_687.cpp
deleted file mode 100644
index 387eaa06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/32007-Issue_3052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32007-Issue_3052.cpp
deleted file mode 100644
index cb468be3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/32008-Issue_3034.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32008-Issue_3034.cpp
deleted file mode 100644
index 1a110ee8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/32100-cpp17.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32100-cpp17.cpp
deleted file mode 100644
index cfccba03..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/32105-I2103.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32105-I2103.cpp
deleted file mode 100644
index ba6386dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/32115-2185.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32115-2185.cpp
deleted file mode 100644
index 6f874926..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33000-tab-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33000-tab-0.cpp
deleted file mode 100644
index d9ff0418..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33001-tab-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33001-tab-1.cpp
deleted file mode 100644
index 85d8abe2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/33004-DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33004-DoxygenComments.cpp
deleted file mode 100644
index df0b9680..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33005-DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33005-DoxygenComments.cpp
deleted file mode 100644
index 533214f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp
deleted file mode 100644
index 8350740b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33007-NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33007-NewLine.cpp
deleted file mode 100644
index 9c7f1ee9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33008-NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33008-NewLine.cpp
deleted file mode 100644
index b3cc1bed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33009-NewLine0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33009-NewLine0.cpp
deleted file mode 100644
index b5a714fa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33010-Q_EMIT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33010-Q_EMIT.cpp
deleted file mode 100644
index d3ef9396..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33011-static.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33011-static.h
deleted file mode 100644
index 8121fef1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp
deleted file mode 100644
index faf00903..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33013-Q_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33013-Q_2.cpp
deleted file mode 100644
index 7d0bb88a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33014-DB.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33014-DB.cpp
deleted file mode 100644
index 1b8f4bc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33015-Q_FOREACH.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33015-Q_FOREACH.cpp
deleted file mode 100644
index 02fd849d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33016-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33016-indent.cpp
deleted file mode 100644
index 22d04a78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33017-bug_1160.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33017-bug_1160.cpp
deleted file mode 100644
index 8dc7a9d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33019-bug_657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33019-bug_657.cpp
deleted file mode 100644
index 3b5bb42a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33020-bug_662.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33020-bug_662.cpp
deleted file mode 100644
index 48b612ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33021-bug_633.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33021-bug_633.cpp
deleted file mode 100644
index 5b672b47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33022-bug_634.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33022-bug_634.cpp
deleted file mode 100644
index febbf7b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33023-bug_651.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33023-bug_651.cpp
deleted file mode 100644
index f0236016..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33024-bug_653.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33024-bug_653.cpp
deleted file mode 100644
index 1bf853d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33025-bug_654.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33025-bug_654.cpp
deleted file mode 100644
index 497e3372..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33026-bug_631.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33026-bug_631.cpp
deleted file mode 100644
index e110d383..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33027-bug_664.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33027-bug_664.cpp
deleted file mode 100644
index 6fa5beea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33028-braces_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33028-braces_empty.cpp
deleted file mode 100644
index 8e46ab7c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33029-cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33029-cast.cpp
deleted file mode 100644
index 179c98c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33030-Q_FOREVER.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33030-Q_FOREVER.cpp
deleted file mode 100644
index 5dad4fa9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33031-bug_612.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33031-bug_612.cpp
deleted file mode 100644
index 4388ac75..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33032-bug_670.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33032-bug_670.cpp
deleted file mode 100644
index 0ede02f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33033-bug_670.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33033-bug_670.h
deleted file mode 100644
index cc6d46e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33034-bug_671.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33034-bug_671.h
deleted file mode 100644
index 5ef3b5d9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33035-patch_32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33035-patch_32.cpp
deleted file mode 100644
index 8b414f00..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33035-patch_32.cpp
+++ /dev/null
@@ -1 +0,0 @@
-/*! test */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33036-bug_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33036-bug_663.cpp
deleted file mode 100644
index 7583d548..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33037-func_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33037-func_class.cpp
deleted file mode 100644
index ea271c11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33038-func_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33038-func_class.h
deleted file mode 100644
index 8b3ca218..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp
deleted file mode 100644
index 707c1c38..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33040-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33040-bug_i_411.cpp
deleted file mode 100644
index 5a3f09aa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33041-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33041-bug_i_411.cpp
deleted file mode 100644
index 4e89d68d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33042-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33042-bug_i_411.cpp
deleted file mode 100644
index 574f12ba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33043-bug_i_478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33043-bug_i_478.cpp
deleted file mode 100644
index 0f96e53c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33044-bug_i_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33044-bug_i_481.cpp
deleted file mode 100644
index e8470648..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33045-bug_i_width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33045-bug_i_width.cpp
deleted file mode 100644
index 08f7888e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33046-bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33046-bug_i_409.cpp
deleted file mode 100644
index 6946a562..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33047-bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33047-bug_i_409.cpp
deleted file mode 100644
index 7bfdfd83..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33048-bug_i_405.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33048-bug_i_405.cpp
deleted file mode 100644
index eda9b0dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33049-pp-pragma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33049-pp-pragma.cpp
deleted file mode 100644
index 2c013b08..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33050-issue_523.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33050-issue_523.cpp
deleted file mode 100644
index d203e398..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33051-bug_i_503.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33051-bug_i_503.cpp
deleted file mode 100644
index 31ca41a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33052-bug_i_512.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33052-bug_i_512.cpp
deleted file mode 100644
index 9b93cdf2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33053-for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33053-for_auto.cpp
deleted file mode 100644
index 073556c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33054-bug_i_825.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33054-bug_i_825.cpp
deleted file mode 100644
index 242c4811..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33056-bug_33056.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33056-bug_33056.cpp
deleted file mode 100644
index 1339ede1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33057-bug_1349.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33057-bug_1349.cpp
deleted file mode 100644
index fcc2e567..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33058-Issue_3164.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33058-Issue_3164.cpp
deleted file mode 100644
index a1e426b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33058-Issue_3164.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <cassert>
-#include <rt>
-#include <cass>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/33060-if_constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33060-if_constexpr.cpp
deleted file mode 100644
index 032f74ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33061-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33061-if_chain_braces.cpp
deleted file mode 100644
index b544f2bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33062-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33062-if_chain_braces.cpp
deleted file mode 100644
index 1973042c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33063-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33063-if_chain_braces.cpp
deleted file mode 100644
index 7a66eeec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33064-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33064-if_chain_braces.cpp
deleted file mode 100644
index 2781fb26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33069-Issue_2195.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33069-Issue_2195.cpp
deleted file mode 100644
index fe3ec459..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33070-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33070-multi_line.cpp
deleted file mode 100644
index dcea4c00..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33071-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33071-multi_line.cpp
deleted file mode 100644
index 0f8503fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33072-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33072-multi_line.cpp
deleted file mode 100644
index add93503..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33073-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33073-multi_line.cpp
deleted file mode 100644
index c0016ff6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33074-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33074-multi_line.cpp
deleted file mode 100644
index c8f32960..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33075-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33075-multi_line.cpp
deleted file mode 100644
index 66963f4e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33076-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33076-multi_line.cpp
deleted file mode 100644
index 9d105267..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33077-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33077-multi_line.cpp
deleted file mode 100644
index d7cbafc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33078-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33078-multi_line.cpp
deleted file mode 100644
index 01fe4d10..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33079-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33079-multi_line.cpp
deleted file mode 100644
index 6a6490ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33080-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33080-multi_line.cpp
deleted file mode 100644
index 8f44ce91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33081-bug_i_552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33081-bug_i_552.cpp
deleted file mode 100644
index 5a0704de..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33082-namespace_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33082-namespace_namespace.cpp
deleted file mode 100644
index cf6f921e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33083-bug_i_359.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33083-bug_i_359.cpp
deleted file mode 100644
index 8081c1f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33084-op_sym_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33084-op_sym_empty.cpp
deleted file mode 100644
index 3557e513..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33085-bug_i_323.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33085-bug_i_323.cpp
deleted file mode 100644
index 6f622f6e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33086-bug_i_568.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33086-bug_i_568.cpp
deleted file mode 100644
index 2e1a00d7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33087-bug_i_596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33087-bug_i_596.cpp
deleted file mode 100644
index db3644a2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33088-bug_i_197.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33088-bug_i_197.cpp
deleted file mode 100644
index e86698fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33089-bug_643.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33089-bug_643.cpp
deleted file mode 100644
index 55e3e309..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33090-gh555.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33090-gh555.cpp
deleted file mode 100644
index 32147190..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33091-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33091-squeeze_ifdef.cpp
deleted file mode 100644
index 7311c71e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33092-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33092-squeeze_ifdef.cpp
deleted file mode 100644
index 94b20d2e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33093-sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33093-sp_angle_paren.cpp
deleted file mode 100644
index 7ed4f34e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33094-sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33094-sp_angle_paren.cpp
deleted file mode 100644
index c20305c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33095-bug_i_322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33095-bug_i_322.cpp
deleted file mode 100644
index 3904ec27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33096-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33096-squeeze_ifdef.cpp
deleted file mode 100644
index df3d90ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33097-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33097-enum_comma.h
deleted file mode 100644
index bb93f4a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33098-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33098-enum_comma.h
deleted file mode 100644
index 3ec29719..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33099-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33099-enum_comma.h
deleted file mode 100644
index 01a89059..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33100-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33100-enum_comma.h
deleted file mode 100644
index 903a6849..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33101-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33101-enum_comma.h
deleted file mode 100644
index 53c1a99e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33102-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33102-enum_comma.h
deleted file mode 100644
index 6c11f2b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33103-bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33103-bug_858.cpp
deleted file mode 100644
index 1085f7db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33104-bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33104-bug_858.cpp
deleted file mode 100644
index c5ac560e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33105-bug_1001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33105-bug_1001.cpp
deleted file mode 100644
index d6104cd5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33106-pos_bool_in_template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33106-pos_bool_in_template.h
deleted file mode 100644
index f5fdb04e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33107-Issue_2688.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33107-Issue_2688.cpp
deleted file mode 100644
index ac97ff3a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33108-Issue_2045.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33108-Issue_2045.cpp
deleted file mode 100644
index a1670ffc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33109-Issue_3205.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33109-Issue_3205.cpp
deleted file mode 100644
index 99767289..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33109-Issue_3205.cpp
+++ /dev/null
@@ -1 +0,0 @@
-vec_& operator+=(vec_&, const vec_&);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33110-enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33110-enum.cpp
deleted file mode 100644
index 3872557e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33120-Issue_2149.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33120-Issue_2149.cpp
deleted file mode 100644
index 1266bd7b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33150-bug_i_753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33150-bug_i_753.cpp
deleted file mode 100644
index 9aa764a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33151-bug_i_752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33151-bug_i_752.cpp
deleted file mode 100644
index da8fe9f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33152-bug_1004.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33152-bug_1004.cpp
deleted file mode 100644
index f072a583..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33160-bug_1112.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33160-bug_1112.cpp
deleted file mode 100644
index da95fcb6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33161-byref-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33161-byref-3.cpp
deleted file mode 100644
index 8c51bf46..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33180-pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33180-pp_multi_comment.cpp
deleted file mode 100644
index bfe1e1d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33181-Issue_2759.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33181-Issue_2759.cpp
deleted file mode 100644
index cbe9c4a5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33182-Issue_2794.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33182-Issue_2794.cpp
deleted file mode 100644
index 16de515b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33200-first_len_minimum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33200-first_len_minimum.cpp
deleted file mode 100644
index c33d9e03..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp
deleted file mode 100644
index 3b1bea1c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33202-initlist_leading_commas.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33202-initlist_leading_commas.cpp
deleted file mode 100644
index a3bc4a2a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33203-Issue_2574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33203-Issue_2574.cpp
deleted file mode 100644
index bd88347d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33204-Issue_2582.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33204-Issue_2582.cpp
deleted file mode 100644
index adf9bfe9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33205-Issue_3198.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33205-Issue_3198.cpp
deleted file mode 100644
index 8dd234b7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33205-Issue_3198.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-enum class Flags : std::int64_t
-{
-    MyFlag
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33210-templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33210-templates4.cpp
deleted file mode 100644
index 10b96e4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33211-pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33211-pp_multi_comment.cpp
deleted file mode 100644
index 5690e3a6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33212-pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33212-pp-define-indent.cpp
deleted file mode 100644
index 78dc4c98..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33213-disable_macro.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33213-disable_macro.cpp
deleted file mode 100644
index 7e64f416..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33214-Issue_2742.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33214-Issue_2742.cpp
deleted file mode 100644
index 66d12fec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33215-Issue_3055.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33215-Issue_3055.cpp
deleted file mode 100644
index d23a0d56..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33216-Issue_3055-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33216-Issue_3055-a.cpp
deleted file mode 100644
index 21a5c35c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/33217-Issue_3113.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33217-Issue_3113.cpp
deleted file mode 100644
index 63090f4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34001-nl_before_after.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34001-nl_before_after.h
deleted file mode 100644
index 8cdc7273..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34002-bug_i_793.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34002-bug_i_793.cpp
deleted file mode 100644
index b6b6a7ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/34006-bug_i_575.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34006-bug_i_575.cpp
deleted file mode 100644
index 4c25fb75..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34007-bug_i_928.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34007-bug_i_928.cpp
deleted file mode 100644
index 78b214bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34100-bug_i_525.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34100-bug_i_525.cpp
deleted file mode 100644
index b810afe0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34101-bug_i_646.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34101-bug_i_646.cpp
deleted file mode 100644
index f89b6416..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34105-bug_i_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34105-bug_i_663.cpp
deleted file mode 100644
index 2a473bc7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34108-bug_i_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34108-bug_i_666.cpp
deleted file mode 100644
index 212a8656..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34112-bug_i_889.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34112-bug_i_889.cpp
deleted file mode 100644
index 5b803a0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34113-bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34113-bug_902.cpp
deleted file mode 100644
index ada480c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34114-bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34114-bug_902.cpp
deleted file mode 100644
index af6bdb44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/34116-issue_2000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34116-issue_2000.cpp
deleted file mode 100644
index f4f2c2bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34117-extern_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34117-extern_func.cpp
deleted file mode 100644
index 4de29e3c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34118-Issue_2163.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34118-Issue_2163.cpp
deleted file mode 100644
index afd04eb0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34120-bug_i_999.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34120-bug_i_999.cpp
deleted file mode 100644
index 2a5d64a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34121-bug_1717.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34121-bug_1717.cpp
deleted file mode 100644
index 4116871f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34122-Issue_2440.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34122-Issue_2440.cpp
deleted file mode 100644
index c52c30da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34123-Issue_2440_nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34123-Issue_2440_nl.cpp
deleted file mode 100644
index c52c30da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34130-bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34130-bug_i_1000.cpp
deleted file mode 100644
index 6e1e7a0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34131-bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34131-bug_i_1000.cpp
deleted file mode 100644
index 149353e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34132-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34132-new_op.cpp
deleted file mode 100644
index 15386247..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34133-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34133-new_op.cpp
deleted file mode 100644
index ce690c94..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34134-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34134-new_op.cpp
deleted file mode 100644
index 67dfa187..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34135-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34135-new_op.cpp
deleted file mode 100644
index 044cd859..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp
deleted file mode 100644
index 0a6635d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34140-bug_1027.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34140-bug_1027.cpp
deleted file mode 100644
index 5ccafd2b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34141-bug_1005.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34141-bug_1005.cpp
deleted file mode 100644
index 01a457d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34142-I1112-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34142-I1112-1.cpp
deleted file mode 100644
index df27d1d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34143-I1112-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34143-I1112-2.cpp
deleted file mode 100644
index 28a4489d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34144-I1112-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34144-I1112-3.cpp
deleted file mode 100644
index c95a6c40..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34145-i683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34145-i683.cpp
deleted file mode 100644
index 255c6336..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34146-bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34146-bug_1002.cpp
deleted file mode 100644
index 0d72c80a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34147-bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34147-bug_1002.cpp
deleted file mode 100644
index 02b85396..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34148-bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34148-bug_1139.cpp
deleted file mode 100644
index d6d8a484..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34149-bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34149-bug_1139.cpp
deleted file mode 100644
index dd0a10dc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34150-bug_1032.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34150-bug_1032.cpp
deleted file mode 100644
index 80078efe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34151-bug_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34151-bug_666.cpp
deleted file mode 100644
index 212a8656..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34152-bug_1068.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34152-bug_1068.cpp
deleted file mode 100644
index 74fbc8e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34153-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34153-type_brace_init_lst.cpp
deleted file mode 100644
index 356a7713..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34154-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34154-type_brace_init_lst.cpp
deleted file mode 100644
index adc09173..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34155-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34155-type_brace_init_lst.cpp
deleted file mode 100644
index 7d62eafb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34156-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34156-type_brace_init_lst.cpp
deleted file mode 100644
index 6519b4b1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34157-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34157-type_brace_init_lst.cpp
deleted file mode 100644
index 6751c0fa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34158-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34158-type_brace_init_lst.cpp
deleted file mode 100644
index d5dcfdeb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34159-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34159-type_brace_init_lst.cpp
deleted file mode 100644
index 0b9bf31c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34160-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34160-type_brace_init_lst.cpp
deleted file mode 100644
index 01c89132..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34161-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34161-type_brace_init_lst.cpp
deleted file mode 100644
index cc79678f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34162-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34162-type_brace_init_lst.cpp
deleted file mode 100644
index 2d5dc62c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34163-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34163-type_brace_init_lst.cpp
deleted file mode 100644
index 9be7507a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34164-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34164-type_brace_init_lst.cpp
deleted file mode 100644
index 68565614..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34165-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34165-type_brace_init_lst.cpp
deleted file mode 100644
index 92fc0b0b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34166-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34166-type_brace_init_lst.cpp
deleted file mode 100644
index d7dfa908..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34168-Issue_2910.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34168-Issue_2910.cpp
deleted file mode 100644
index 82c2bec9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34169-init-list-call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34169-init-list-call.cpp
deleted file mode 100644
index 95449eb1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34170-i1082.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34170-i1082.cpp
deleted file mode 100644
index 06680c0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34171-i1181.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34171-i1181.cpp
deleted file mode 100644
index 1a959d34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34172-i1165.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34172-i1165.cpp
deleted file mode 100644
index c3123b59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34173-i1464.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34173-i1464.cpp
deleted file mode 100644
index e4005841..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34174-i1466.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34174-i1466.cpp
deleted file mode 100644
index 912488b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34175-i1509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34175-i1509.cpp
deleted file mode 100644
index 419807fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp
deleted file mode 100644
index b9a75cf6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34177-sp_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34177-sp_func_call_paren.cpp
deleted file mode 100644
index 580e9bae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34178-Issue_3237.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34178-Issue_3237.cpp
deleted file mode 100644
index 23b565a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34178-Issue_3237.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-void f()
-{
-	CPoint pt( aaa * bbb );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34180-bug_1402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34180-bug_1402.cpp
deleted file mode 100644
index 09714c41..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34190-bug_1003.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34190-bug_1003.cpp
deleted file mode 100644
index 7495b93d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34191-comment-align-multiline.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34191-comment-align-multiline.cpp
deleted file mode 100644
index db501481..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34192-i1207.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34192-i1207.cpp
deleted file mode 100644
index e02da8c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34193-i1218.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34193-i1218.cpp
deleted file mode 100644
index d4d05106..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34194-sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34194-sp_arith_additive.cpp
deleted file mode 100644
index 5ecb2ec8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34195-sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34195-sp_arith_additive.cpp
deleted file mode 100644
index f419a3ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34196-Issue_1460.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34196-Issue_1460.h
deleted file mode 100644
index 63787999..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34197-bug_1161.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34197-bug_1161.cpp
deleted file mode 100644
index 34740f5a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34198-bug_1249.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34198-bug_1249.cpp
deleted file mode 100644
index 65637efe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34199-not_lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34199-not_lambda.cpp
deleted file mode 100644
index a9c65439..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34200-i1536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34200-i1536.cpp
deleted file mode 100644
index 0eb7fc69..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34201-i1565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34201-i1565.cpp
deleted file mode 100644
index d0bef508..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34202-i1617.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34202-i1617.cpp
deleted file mode 100644
index 98ede13b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34203-i1516.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34203-i1516.cpp
deleted file mode 100644
index d0612a2b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34203-i1516.cpp
+++ /dev/null
@@ -1,23 +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();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/34205-bug_1395.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34205-bug_1395.cpp
deleted file mode 100644
index 16e2fbba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34206-for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34206-for_loop_head.cpp
deleted file mode 100644
index 6cea550d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34207-for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34207-for_loop_head.cpp
deleted file mode 100644
index 2aa9bdc0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34208-conversion_operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34208-conversion_operator.cpp
deleted file mode 100644
index 27b52dac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34209-lambda_selfcalling.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34209-lambda_selfcalling.cpp
deleted file mode 100644
index 8f0c819e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34210-override_virtual.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34210-override_virtual.cpp
deleted file mode 100644
index 537454b1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34211-anonymous_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34211-anonymous_enum.cpp
deleted file mode 100644
index ef237a6e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34250-bug_1607.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34250-bug_1607.cpp
deleted file mode 100644
index 9e4e47d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34251-bug_1649.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34251-bug_1649.cpp
deleted file mode 100644
index 4b352c79..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34252-issue_2001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34252-issue_2001.cpp
deleted file mode 100644
index 39b9446d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34253-friends.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34253-friends.cpp
deleted file mode 100644
index 58fd649a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34254-issue_1985.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34254-issue_1985.cpp
deleted file mode 100644
index ef9fc90a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp
deleted file mode 100644
index 7005d86c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34256-Issue_2836.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34256-Issue_2836.cpp
deleted file mode 100644
index 4d2a648f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34280-UNI-29935.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34280-UNI-29935.cpp
deleted file mode 100644
index 28d0b66d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp
deleted file mode 100644
index 19c4b962..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp
deleted file mode 100644
index aed91c1b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp
deleted file mode 100644
index cc0ac847..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp
deleted file mode 100644
index c47119ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp
deleted file mode 100644
index afe3a0ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp
deleted file mode 100644
index 9b8ea3c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34296-i1768.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34296-i1768.cpp
deleted file mode 100644
index 94327d9c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34297-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34297-align-assign-mixed.cpp
deleted file mode 100644
index d8082600..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34298-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34298-align-assign-mixed.cpp
deleted file mode 100644
index 4f8dadde..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34299-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34299-align-assign-mixed.cpp
deleted file mode 100644
index ddae789b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34300-bug_1236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34300-bug_1236.cpp
deleted file mode 100644
index 8acaaed2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/34305-issue_2124-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34305-issue_2124-1.cpp
deleted file mode 100644
index bad0ea55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34306-issue_2124-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34306-issue_2124-2.cpp
deleted file mode 100644
index bad0ea55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34307-2203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34307-2203.cpp
deleted file mode 100644
index 70a1f31a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34308-enum_comment_wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34308-enum_comment_wrap.cpp
deleted file mode 100644
index 736e6718..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34309-issue_2209-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34309-issue_2209-1.cpp
deleted file mode 100644
index 82ff67c6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34310-issue_2209-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34310-issue_2209-2.cpp
deleted file mode 100644
index 26c579d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34311-Issue_2250.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34311-Issue_2250.cpp
deleted file mode 100644
index 9268c2e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34312-Issue_2101.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34312-Issue_2101.cpp
deleted file mode 100644
index 3e07c686..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34313-Issue_2437.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34313-Issue_2437.cpp
deleted file mode 100644
index 77a273ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34314-Issue_2604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34314-Issue_2604.cpp
deleted file mode 100644
index eb87fc8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp
deleted file mode 100644
index c4f1a119..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp
deleted file mode 100644
index 1bbde49b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp
deleted file mode 100644
index e0d3488a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34318-align_assign_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34318-align_assign_func_proto.cpp
deleted file mode 100644
index 1c003058..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp
deleted file mode 100644
index 8a9df8b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp
deleted file mode 100644
index 432a9e3e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34321-bug_2285.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34321-bug_2285.cpp
deleted file mode 100644
index a456e9be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34322-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34322-issue_2623.cpp
deleted file mode 100644
index a9566447..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34323-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34323-issue_2623.cpp
deleted file mode 100644
index 72fd90e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34324-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34324-issue_2623.cpp
deleted file mode 100644
index 61961fa1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34325-Issue_3025.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34325-Issue_3025.cpp
deleted file mode 100644
index 9e64526e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34326-Issue_3040.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34326-Issue_3040.cpp
deleted file mode 100644
index f9e69333..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34327-Issue_3044.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34327-Issue_3044.cpp
deleted file mode 100644
index 799fd0a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34328-Issue_3048.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34328-Issue_3048.cpp
deleted file mode 100644
index fb6b0d38..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp
deleted file mode 100644
index d46f2655..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp
deleted file mode 100644
index d46f2655..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp
deleted file mode 100644
index d46f2655..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp
deleted file mode 100644
index ef73253e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp
deleted file mode 100644
index ef73253e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp
deleted file mode 100644
index ef73253e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp
deleted file mode 100644
index c228ce46..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp
deleted file mode 100644
index c228ce46..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp
deleted file mode 100644
index c228ce46..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp
deleted file mode 100644
index 7188f0d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp
deleted file mode 100644
index 7188f0d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp
deleted file mode 100644
index 7188f0d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp
deleted file mode 100644
index 0e475aa4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp
deleted file mode 100644
index 59b5b996..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/34360-nl_before_struct_struct.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34360-nl_before_struct_struct.cpp
deleted file mode 100644
index 032a0dfc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34360-nl_before_struct_struct.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <string>
-
-
-struct Foo
-{
-	std::string name;
-	int value;
-};
-
-
-struct Bar
-{
-	Foo* parent;
-	int modifier;
-};
-
-void baz( Foo*, Bar* );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34361-nl_before_struct_scoped_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34361-nl_before_struct_scoped_enum.cpp
deleted file mode 100644
index 02ce38f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34361-nl_before_struct_scoped_enum.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-int main();
-
-enum struct Baz
-{
-	Abc = 4
-	, Def = 1
-};
-
-Baz decide( Baz, Baz ) noexcept;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34500-sp_before_case_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34500-sp_before_case_colon.cpp
deleted file mode 100644
index 54507d64..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34500-sp_before_case_colon.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-int foo(abc_t d)
-{
-	switch (d)
-	{
-	case A:
-		return 0;
-	case B:
-		return 1;
-	case C:
-		return 2;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34501-sp_endif_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34501-sp_endif_cmt.cpp
deleted file mode 100644
index 9e5b2db8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34501-sp_endif_cmt.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.74.0/tests/expected/cpp/34502-sp_enum_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34502-sp_enum_assign.cpp
deleted file mode 100644
index 62a271a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34502-sp_enum_assign.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-typedef enum
-{
-        A = 0,
-        B = 1 << 0,
-        C = 1 << 1
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34503-sp_enum_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34503-sp_enum_assign.cpp
deleted file mode 100644
index 2ebab438..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34503-sp_enum_assign.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-typedef enum
-{
-        A                       =                 0,
-        B = 1 << 0,
-        C = 1 << 1
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34504-issue_574-i.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34504-issue_574-i.cpp
deleted file mode 100644
index 3366cc79..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34504-issue_574-i.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-class A

-{

-    void check(int strList       =        13);

-};

-int A      =            5;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34505-Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34505-Issue_3220.cpp
deleted file mode 100644
index fae042d7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34505-Issue_3220.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-int * b;
-auto Func2(Model * model) -> Color * * const;
-auto Func2(Model * model) -> Color * * const {
-        return nullptr;
-}
-int * Funcf(Model * model, int * *);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34506-Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34506-Issue_3220.cpp
deleted file mode 100644
index ba42b013..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34506-Issue_3220.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-int *   b;
-auto Func2(Model    *      model) -> Color                  *  *    const;
-auto Func2(Model   *   model) -> Color   *   *        const {
-        return nullptr;
-}
-int    *    Funcf(Model   *   model, int   *  *);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34507-Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34507-Issue_3220.cpp
deleted file mode 100644
index f9f684b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34507-Issue_3220.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-int*b;
-auto Func2(Model*model) -> Color**const;
-auto Func2(Model*model) -> Color**const {
-        return nullptr;
-}
-int*Funcf(Model*model, int**);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34508-Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34508-Issue_3220.cpp
deleted file mode 100644
index aba03416..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34508-Issue_3220.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-int*   b;
-auto Func2(Model*      model) -> Color                  *  *    const;
-auto Func2(Model*   model) -> Color   *   *        const {
-        return nullptr;
-}
-int    *    Funcf(Model*   model, int*  *);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34509-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34509-byref-2.cpp
deleted file mode 100644
index ab1b3a6e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34509-byref-2.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int   &    aa(int   &x,int  &b);
-// sp_before_byref_func, sp_after_byref_func, sp_before_byref, sp_after_byref, sp_before_byref, sp_after_byref
-int        aa(int    &x,int    &)
-// sp_before_byref, sp_after_byref, sp_before_unnamed_byref
-{
-	b = aa(x,b);
-	c = aa(&    y,&d);     // sp_addr
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34510-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34510-byref-2.cpp
deleted file mode 100644
index 0ef61cde..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34510-byref-2.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int   &    aa(int   &   x,int  &   b);
-// sp_before_byref_func, sp_after_byref_func, sp_before_byref, sp_after_byref, sp_before_byref, sp_after_byref
-int        aa(int    &   x,int    &)
-// sp_before_byref, sp_after_byref, sp_before_unnamed_byref
-{
-	b = aa(x,b);
-	c = aa(&    y,&d);     // sp_addr
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34511-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34511-byref-2.cpp
deleted file mode 100644
index db510335..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34511-byref-2.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int & aa(int & x,int & b);
-// sp_before_byref_func, sp_after_byref_func, sp_before_byref, sp_after_byref, sp_before_byref, sp_after_byref
-int        aa(int & x,int &)
-// sp_before_byref, sp_after_byref, sp_before_unnamed_byref
-{
-	b = aa(x,b);
-	c = aa(& y,& d);       // sp_addr
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34512-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34512-byref-2.cpp
deleted file mode 100644
index 099e3c2b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34512-byref-2.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int&aa(int&x,int&b);
-// sp_before_byref_func, sp_after_byref_func, sp_before_byref, sp_after_byref, sp_before_byref, sp_after_byref
-int aa(int&x,int&)
-// sp_before_byref, sp_after_byref, sp_before_unnamed_byref
-{
-	b = aa(x,b);
-	c = aa(&y,&d);         // sp_addr
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34513-sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34513-sp_cond_question.cpp
deleted file mode 100644
index 5f5a9e14..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34513-sp_cond_question.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//example file
-int b;
-int t;
-int f;
-int a = b?t:f;
-int a = b?                      :f;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34514-sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34514-sp_cond_question.cpp
deleted file mode 100644
index cec6c827..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34514-sp_cond_question.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//example file
-int b;
-int t;
-int f;
-int a = b           ?           t           :           f;
-int a = b           ?                      :           f;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34515-sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34515-sp_cond_question.cpp
deleted file mode 100644
index 39997b4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34515-sp_cond_question.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//example file
-int b;
-int t;
-int f;
-int a = b ? t : f;
-int a = b ? : f;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34516-sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34516-sp_cond_question.cpp
deleted file mode 100644
index c7d79ab9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34516-sp_cond_question.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//example file
-int b;
-int t;
-int f;
-int a = b?t:f;
-int a = b?:f;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34517-semi.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34517-semi.cpp
deleted file mode 100644
index 6c42948f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34517-semi.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-for ( i = 1 ; i < 10 ; i++)
-{
-        a = i ;
-}
-for ( ; ; )
-{
-        a = i ; b = j ;
-        a = i ;           /* comment */
-        a = i ;             // comment
-}
-if (p == b) ;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34518-semi.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34518-semi.cpp
deleted file mode 100644
index 7c8a711e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34518-semi.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-for ( i = 1         ; i < 10                      ; i++)
-{
-        a = i   ;
-}
-for (          ;                       ;    )
-{
-        a = i  ;   b = j;
-        a = i  ;          /* comment */
-        a = i    ;          // comment
-}
-if (p == b)                     ;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34519-semi.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34519-semi.cpp
deleted file mode 100644
index 56af135e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34519-semi.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-for ( i = 1;i < 10;i++)
-{
-        a = i;
-}
-for (;;)
-{
-        a = i;b = j;
-        a = i;            /* comment */
-        a = i;              // comment
-}
-if (p == b);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34520-comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34520-comma.cpp
deleted file mode 100644
index e9b0c428..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34520-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.74.0/tests/expected/cpp/34521-comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34521-comma.cpp
deleted file mode 100644
index e101145a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34521-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.74.0/tests/expected/cpp/34522-comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34522-comma.cpp
deleted file mode 100644
index bc8ebd4f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34522-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.74.0/tests/expected/cpp/34523-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34523-gcc_case_ellipsis.cpp
deleted file mode 100644
index 1b0b4088..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34523-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.74.0/tests/expected/cpp/34524-bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34524-bug_1002.cpp
deleted file mode 100644
index 713018e4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34524-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.74.0/tests/expected/cpp/34525-sp_paren_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34525-sp_paren_brace.cpp
deleted file mode 100644
index febfb72d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34525-sp_paren_brace.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-void *stopper_for_apply = (int[]) {0};
-//                               ^ here
-
-template<typename T, typename U>
-auto add(T t, U u) -> decltype(t + u) {
-//                                   ^ here
-	return t + u;
-}
-
-void f()noexcept() {
-//                ^ here
-}
-
-#define FOO5(x) for(;;) (!(x)) { *(volatile int*)0 = 1; }
-//                            ^ here
-
-(struct foo) {...}
-//          ^ here
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34526-sp_paren_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34526-sp_paren_brace.cpp
deleted file mode 100644
index 4ac73f87..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34526-sp_paren_brace.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-void *stopper_for_apply = (int[])               {0};
-//                               ^ here
-
-template<typename T, typename U>
-auto add(T t, U u) -> decltype(t + u)                {
-//                                   ^ here
-	return t + u;
-}
-
-void f()noexcept()               {
-//                ^ here
-}
-
-#define FOO5(x) for(;;) (!(x))                { *(volatile int*)0 = 1; }
-//                            ^ here
-
-(struct foo)      {...}
-//          ^ here
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34527-sp_paren_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34527-sp_paren_brace.cpp
deleted file mode 100644
index aa65f644..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34527-sp_paren_brace.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-void *stopper_for_apply = (int[]){0};
-//                               ^ here
-
-template<typename T, typename U>
-auto add(T t, U u) -> decltype(t + u){
-//                                   ^ here
-	return t + u;
-}
-
-void f()noexcept(){
-//                ^ here
-}
-
-#define FOO5(x) for(;;) (!(x)){ *(volatile int*)0 = 1; }
-//                            ^ here
-
-(struct foo){...}
-//          ^ here
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34528-cmt_trailing_single_line_c_to_cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34528-cmt_trailing_single_line_c_to_cpp.cpp
deleted file mode 100644
index 946409b2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34528-cmt_trailing_single_line_c_to_cpp.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-int main(int argc, char **argv){
-
-	// C-style comments on same line with actual code
-	// ----------------------------------------------
-
-	int a = 5; // Trailing, single-line C-style comment
-
-	int b = /* Single-line C-style comment in the middle */ 5;
-
-	/* Single-line C-style comment at beginning of line */ int c =  5;
-
-	int d = 5; /* Trailing
-	              Multi-line
-	              C-style
-	              comment */
-
-# define A_MACRO \
-	do { \
-		if (true) { \
-			int e = 5; /* Trailing single-line C-style comment inside macro*/ \
-		} \
-	} while (0)
-
-
-	// C-style comments with no actual code on the same line
-	// -----------------------------------------------------
-
-	// Single-line C-style comment.
-
-	/* Multi-line
-	 * C-style
-	 * comment.
-	 * */
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34529-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34529-type_brace_init_lst.cpp
deleted file mode 100644
index cc79678f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34529-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.74.0/tests/expected/cpp/34530-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34530-type_brace_init_lst.cpp
deleted file mode 100644
index b99238b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34530-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.74.0/tests/expected/cpp/34531-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34531-type_brace_init_lst.cpp
deleted file mode 100644
index cc79678f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34531-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.74.0/tests/expected/cpp/34532-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34532-type_brace_init_lst.cpp
deleted file mode 100644
index 53e74de2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34532-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.74.0/tests/expected/cpp/34533-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34533-templates.cpp
deleted file mode 100644
index 5f3d6f90..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34533-templates.cpp
+++ /dev/null
@@ -1,188 +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;
-   int 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.74.0/tests/expected/cpp/34534-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34534-templates.cpp
deleted file mode 100644
index 9e3f463d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34534-templates.cpp
+++ /dev/null
@@ -1,188 +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;
-   int 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.74.0/tests/expected/cpp/34535-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34535-sp_after_angle.cpp
deleted file mode 100644
index 18788919..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34535-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.74.0/tests/expected/cpp/34536-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34536-sp_after_angle.cpp
deleted file mode 100644
index 8764578e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34536-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.74.0/tests/expected/cpp/39000-UNI-64325.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/39000-UNI-64325.cpp
deleted file mode 100644
index c4005d7c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60001-UNI-2650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60001-UNI-2650.cpp
deleted file mode 100644
index b9ced773..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60002-UNI-16283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60002-UNI-16283.cpp
deleted file mode 100644
index 7f042642..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60003-UNI-1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60003-UNI-1288.cpp
deleted file mode 100644
index aece270a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60006-UNI-2049.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60006-UNI-2049.cpp
deleted file mode 100644
index 7e47d927..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60017-UNI-2683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60017-UNI-2683.cpp
deleted file mode 100644
index 734e3999..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60022-UNI-18439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60022-UNI-18439.cpp
deleted file mode 100644
index 8d467c67..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60025-UNI-19894.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60025-UNI-19894.cpp
deleted file mode 100644
index 2d7e481e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60027-UNI-21506.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60027-UNI-21506.cpp
deleted file mode 100644
index a8c5f2df..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60028-UNI-21509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60028-UNI-21509.cpp
deleted file mode 100644
index bde48ee7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60029-UNI-21510.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60029-UNI-21510.cpp
deleted file mode 100644
index ea406fbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60030-UNI-21727.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60030-UNI-21727.cpp
deleted file mode 100644
index 991d2631..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60031-UNI-21728.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60031-UNI-21728.cpp
deleted file mode 100644
index 658fba68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60032-UNI-21729.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60032-UNI-21729.cpp
deleted file mode 100644
index 4b8d1d59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60036-UNI-2680.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60036-UNI-2680.cpp
deleted file mode 100644
index b6aa5bd7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60038-UNI-30088.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60038-UNI-30088.cpp
deleted file mode 100644
index 1fd5c1fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60039-UNI-30628.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60039-UNI-30628.cpp
deleted file mode 100644
index ffa60026..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60042-UNI-18777.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60042-UNI-18777.cpp
deleted file mode 100644
index 0f177fdc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60043-i2033.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60043-i2033.cpp
deleted file mode 100644
index fd27cf6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60044-i2116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60044-i2116.cpp
deleted file mode 100644
index af664cd9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60044-i2116.cpp
+++ /dev/null
@@ -1 +0,0 @@
-void f(){}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp
deleted file mode 100644
index c0c066b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60047-align_default_after_override.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60047-align_default_after_override.cpp
deleted file mode 100644
index 43db090f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60048-bug_2322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60048-bug_2322.cpp
deleted file mode 100644
index 50454903..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60049-bug_2402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60049-bug_2402.cpp
deleted file mode 100644
index e483fdc9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60050-semicolon-removal-after-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cpp/60051-bug_2371.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60051-bug_2371.cpp
deleted file mode 100644
index f17cec62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60052-bug_2433_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60052-bug_2433_1.cpp
deleted file mode 100644
index d011d5a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60053-bug_2433_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60053-bug_2433_2.cpp
deleted file mode 100644
index 600efc82..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp
deleted file mode 100644
index ed92e698..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60055-issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60055-issue_3116.cpp
deleted file mode 100644
index 44ec3a5f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60056-issue_3116-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60056-issue_3116-2.cpp
deleted file mode 100644
index dded453c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cpp/60057-issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60057-issue_3116.cpp
deleted file mode 100644
index 991c46bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60057-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.74.0/tests/expected/cpp/60058-issue_3330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60058-issue_3330.cpp
deleted file mode 100644
index 37062480..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60058-issue_3330.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-class Spaceship
-{
-public:
-	Spaceship():shields(100)
-	{
-	}
-
-	int shields;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60059-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60059-indent_ctor_init.cpp
deleted file mode 100644
index f1b32d0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60059-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.74.0/tests/expected/cpp/60060-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60060-returns.cpp
deleted file mode 100644
index 21013963..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60060-returns.cpp
+++ /dev/null
@@ -1,34 +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 foo6(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}
-#define case6(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};
-	case 6:
-		return /**/6;
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60061-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60061-returns.cpp
deleted file mode 100644
index bd199ba8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60061-returns.cpp
+++ /dev/null
@@ -1,34 +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 foo6(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}
-#define case6(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};
-	case 6:
-		return /**/6;
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60062-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60062-returns.cpp
deleted file mode 100644
index 1085bd72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60062-returns.cpp
+++ /dev/null
@@ -1,34 +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 foo6(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}
-#define case6(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};
-	case 6:
-		return/**/6;
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60063-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60063-returns.cpp
deleted file mode 100644
index bd199ba8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60063-returns.cpp
+++ /dev/null
@@ -1,34 +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 foo6(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}
-#define case6(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};
-	case 6:
-		return /**/6;
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60064-issue_3368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60064-issue_3368.cpp
deleted file mode 100644
index 2158086c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60064-issue_3368.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-class Spaceship
-{
-public:
-	template<class T>
-	Spaceship<T>():shields(100)
-	{
-	}
-
-	int shields;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60065-issue_3378.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60065-issue_3378.cpp
deleted file mode 100644
index 8da9261d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60065-issue_3378.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-class Foo
-{
-public:
-	int bar()
-	{
-one:
- two:
-  three:
-   four:
-    five:
-     six:
-      seven:
-       eight:
-	nine:
-	 ten:
-	  eleven:
-	   twelve:
-	    thirteen:
-	     fourteen:
-	      fifteen:
-	       sixteen:
-		seventeen:
-		 eighteen:
-		  nineteen:
-		   twenty:
-		return 0;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10000-simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10000-simple.cs
deleted file mode 100644
index 36cedfa2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10001-getset.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10001-getset.cs
deleted file mode 100644
index 756170b6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10002-simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10002-simple.cs
deleted file mode 100644
index f8344b26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10003-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10003-region.cs
deleted file mode 100644
index 2ada63e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10010-var-member.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10010-var-member.cs
deleted file mode 100644
index 0da0b9f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10011-strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10011-strings.cs
deleted file mode 100644
index 6794e762..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10012-621_this-spacing.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10012-621_this-spacing.cs
deleted file mode 100644
index bd28a5e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10013-625_where-constraints.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10013-625_where-constraints.cs
deleted file mode 100644
index 123109b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cs/10015-misc-failures.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10015-misc-failures.cs
deleted file mode 100644
index e7022083..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10016-new-constraint-paren-space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10016-new-constraint-paren-space.cs
deleted file mode 100644
index a337a447..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10018-delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10018-delete-space-oc.mm
deleted file mode 100644
index 59496772..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10019-func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10019-func-param-wrap-oc.mm
deleted file mode 100644
index 6e192eec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10020-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10020-region.cs
deleted file mode 100644
index b2f57ece..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10021-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10021-region.cs
deleted file mode 100644
index 926e467d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10022-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10022-region.cs
deleted file mode 100644
index 9628d4fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10023-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10023-region.cs
deleted file mode 100644
index e21c467c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10027-oneline_property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10027-oneline_property.cs
deleted file mode 100644
index e4470be2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10028-ifcolalign.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10028-ifcolalign.cs
deleted file mode 100644
index 13df0440..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10029-when.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10029-when.cs
deleted file mode 100644
index 4480f618..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10030-sort_using.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10030-sort_using.cs
deleted file mode 100644
index 99e802c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10031-bug_i_935.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10031-bug_i_935.cs
deleted file mode 100644
index c45eb79d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10032-sort_using_categ.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10032-sort_using_categ.cs
deleted file mode 100644
index ec997fc9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10033-objc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10033-objc.mm
deleted file mode 100644
index 07ede276..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10034-asm.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10034-asm.h.mm
deleted file mode 100644
index 84a5efa8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10035-definesalign.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10035-definesalign.h.mm
deleted file mode 100644
index 9ad29954..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10036-inttypes.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10036-inttypes.h.mm
deleted file mode 100644
index 4ac13417..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10039-615_nested-usings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10039-615_nested-usings.cs
deleted file mode 100644
index d46108bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10040-tcf.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10040-tcf.cs
deleted file mode 100644
index 009f269e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10041-gs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10041-gs.cs
deleted file mode 100644
index ba9f873e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10042-exception-filters.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10042-exception-filters.cs
deleted file mode 100644
index d638d9a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10044-ifcomment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10044-ifcomment.cs
deleted file mode 100644
index 2c3ab0fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10045-UNI-1288.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10045-UNI-1288.cs
deleted file mode 100644
index 03d60f5b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10046-UNI-1333.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10046-UNI-1333.mm
deleted file mode 100644
index de887ad0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10050-generics.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10050-generics.cs
deleted file mode 100644
index 74e49ecd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10051-UNI-1338.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10051-UNI-1338.cs
deleted file mode 100644
index 3f3d9d06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10055-UNI-1345.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10055-UNI-1345.cs
deleted file mode 100644
index 13f61127..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10060-unsafe.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10060-unsafe.cs
deleted file mode 100644
index fdfdd67b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10065-UNI-1975.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10065-UNI-1975.cs
deleted file mode 100644
index 1d2f2659..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10066-UNI-1977.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10066-UNI-1977.cs
deleted file mode 100644
index 94b929c4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10067-UNI-1978.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10067-UNI-1978.cs
deleted file mode 100644
index 5f55cb2f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10070-utf16le.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10070-utf16le.cs
deleted file mode 100644
index c017f6c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10070-utf16le.cs
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10071-utf16be.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10071-utf16be.cs
deleted file mode 100644
index d9f54e37..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10071-utf16be.cs
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10072-utf16le_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10072-utf16le_no_bom.cs
deleted file mode 100644
index c017f6c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10072-utf16le_no_bom.cs
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10073-utf16be_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10073-utf16be_no_bom.cs
deleted file mode 100644
index d9f54e37..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10073-utf16be_no_bom.cs
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10074-UNI-2020.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10074-UNI-2020.cs
deleted file mode 100644
index 854a3655..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10075-UNI-2021.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10075-UNI-2021.cs
deleted file mode 100644
index b0ec0414..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10076-UNI-1343.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10076-UNI-1343.cs
deleted file mode 100644
index 076e338d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10077-UNI-1919.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10077-UNI-1919.cs
deleted file mode 100644
index cc8e8420..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10078-UNI-3484.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10078-UNI-3484.cs
deleted file mode 100644
index d7e4f26a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10080-property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10080-property.cs
deleted file mode 100644
index 98d3c21c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10090-string_multi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10090-string_multi.cs
deleted file mode 100644
index 7d006dce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10100-bug_600.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10100-bug_600.cs
deleted file mode 100644
index 54c24643..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10101-sf607.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10101-sf607.cs
deleted file mode 100644
index 3207e6c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10102-pp-ignore.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10102-pp-ignore.mm
deleted file mode 100644
index f26232c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10103-UNI-2506.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10103-UNI-2506.cs
deleted file mode 100644
index 8cd07962..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10104-UNI-2505.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10104-UNI-2505.cs
deleted file mode 100644
index a17e6a5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10110-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10110-mdarray_space.cs
deleted file mode 100644
index 8c328f5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10111-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10111-mdarray_space.cs
deleted file mode 100644
index 56aa58ce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10112-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10112-mdarray_space.cs
deleted file mode 100644
index ab877b8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10119-preserveTabs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10119-preserveTabs.cs
deleted file mode 100644
index c9583dcd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10120-cmt_backslash_eol.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10120-cmt_backslash_eol.cs
deleted file mode 100644
index e56aec25..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10130-sp_between_new_paren.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10130-sp_between_new_paren.cs
deleted file mode 100644
index fd706ffa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10140-remove_semi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10140-remove_semi.cs
deleted file mode 100644
index 3ee1926e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10150-operator-null-conditional.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10150-operator-null-conditional.cs
deleted file mode 100644
index 61ac6d74..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs
deleted file mode 100644
index 416e6afc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10160-delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10160-delegate.cs
deleted file mode 100644
index 6296ad80..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10161-delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10161-delegate.cs
deleted file mode 100644
index 152fba2b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10200-logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10200-logger.cs
deleted file mode 100644
index defede8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10300-1822.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10300-1822.cs
deleted file mode 100644
index 92b5fd5b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/10628-sf628.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10628-sf628.cs
deleted file mode 100644
index 54d3c52c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/11011-620_getset-brace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11011-620_getset-brace.cs
deleted file mode 100644
index d4652c5f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/11030-argtypes.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11030-argtypes.mm
deleted file mode 100644
index 1afeb694..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/11031-casting.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11031-casting.mm
deleted file mode 100644
index c73d6ef8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/11032-newlines.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11032-newlines.mm
deleted file mode 100644
index 49a15913..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/11072-UNI-2007.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11072-UNI-2007.cs
deleted file mode 100644
index 29e53f26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/11073-UNI-2008.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11073-UNI-2008.cs
deleted file mode 100644
index a4de3475..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/12001-bug_620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12001-bug_620.cs
deleted file mode 100644
index 56e9b8bc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/12002-nullable_prop.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12002-nullable_prop.cs
deleted file mode 100644
index 21c4f7b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cs/12004-verbatim_strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12004-verbatim_strings.cs
deleted file mode 100644
index 73fa1bf0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/12005-bug_1591.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12005-bug_1591.cs
deleted file mode 100644
index ac62df9e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/12101-bug_i_679.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12101-bug_i_679.cs
deleted file mode 100644
index 199ad7e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cs/12104-bug_1637.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12104-bug_1637.cs
deleted file mode 100644
index 9ffe19e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/12105-bug_1650.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12105-bug_1650.cs
deleted file mode 100644
index 869a9d0f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/12106-UNI-40685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12106-UNI-40685.cs
deleted file mode 100644
index 9b70920e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/cs/12108-Issue_2705.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12108-Issue_2705.cs
deleted file mode 100644
index 08619bb1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/12200-comma.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12200-comma.cs
deleted file mode 100644
index 34ccfdd8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12200-comma.cs
+++ /dev/null
@@ -1 +0,0 @@
-int[ , , ] x;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12201-comma.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12201-comma.cs
deleted file mode 100644
index 794410f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12201-comma.cs
+++ /dev/null
@@ -1 +0,0 @@
-int[    ,   ,        ] x;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12202-comma.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12202-comma.cs
deleted file mode 100644
index 29ab2c3e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12202-comma.cs
+++ /dev/null
@@ -1 +0,0 @@
-int[,,] x;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/19000-UNI-58354.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/19000-UNI-58354.cs
deleted file mode 100644
index 6c77de40..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/20010-UNI-32658.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/20010-UNI-32658.cs
deleted file mode 100644
index 145da65f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/20011-bug_1620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/20011-bug_1620.cs
deleted file mode 100644
index 3b837292..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60004-UNI-2684.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60004-UNI-2684.cs
deleted file mode 100644
index ff0b31f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60005-UNI-2685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60005-UNI-2685.cs
deleted file mode 100644
index ec671dd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60007-UNI-3083.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60007-UNI-3083.cs
deleted file mode 100644
index 5209dc72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60008-UNI-17253.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60008-UNI-17253.cs
deleted file mode 100644
index 9021a372..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60009-UNI-9917.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60009-UNI-9917.cs
deleted file mode 100644
index 5e352d10..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60011-UNI-11095.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60011-UNI-11095.mm
deleted file mode 100644
index 4f88df51..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60012-UNI-12303.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60012-UNI-12303.cs
deleted file mode 100644
index 01be8291..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60013-UNI-13955.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60013-UNI-13955.cs
deleted file mode 100644
index 940aa89b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60015-UNI-14131.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60015-UNI-14131.cs
deleted file mode 100644
index 9656bee8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60016-UNI-11662.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60016-UNI-11662.cs
deleted file mode 100644
index 9a49fdba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60018-UNI-18777.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60018-UNI-18777.cs
deleted file mode 100644
index 198d5be3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60019-UNI-18780.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60019-UNI-18780.cs
deleted file mode 100644
index 0eea713e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60020-UNI-18829.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60020-UNI-18829.cs
deleted file mode 100644
index a72ca87b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60023-UNI-18437.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60023-UNI-18437.cs
deleted file mode 100644
index d8178e73..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60024-UNI-19644.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60024-UNI-19644.cs
deleted file mode 100644
index eb0d4c9c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60026-UNI-19895.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60026-UNI-19895.cs
deleted file mode 100644
index 1fedd580..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60033-UNI-21730.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60033-UNI-21730.cs
deleted file mode 100644
index 6fcb8c16..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60036-UNI-11993.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60036-UNI-11993.cs
deleted file mode 100644
index bf703537..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60037-UNI-29933.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60037-UNI-29933.cs
deleted file mode 100644
index 943cbf35..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60040-UNI-30498_2.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60040-UNI-30498_2.cs
deleted file mode 100644
index 445a7c97..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs
deleted file mode 100644
index 2fc371c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs
deleted file mode 100644
index 4f66d541..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60044-UNI-37241.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60044-UNI-37241.cs
deleted file mode 100644
index 57d4ffeb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/cs/60045-add-nl-before-namespace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60045-add-nl-before-namespace.cs
deleted file mode 100644
index d9840704..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40000-HashMap.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40000-HashMap.d
deleted file mode 100644
index 74d0614b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40001-imports.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40001-imports.d
deleted file mode 100644
index 9f12a88e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40002-volatile.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40002-volatile.d
deleted file mode 100644
index 4dbd66dc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40003-volatile-1.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40003-volatile-1.d
deleted file mode 100644
index 2ef2634d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40004-volatile-2.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40004-volatile-2.d
deleted file mode 100644
index bc5a0de4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40005-volatile-3.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40005-volatile-3.d
deleted file mode 100644
index 039f788a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40006-Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40006-Lexer.d
deleted file mode 100644
index 86e1144a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40007-Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40007-Lexer.d
deleted file mode 100644
index 50f40a49..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40010-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40010-template.d
deleted file mode 100644
index eaad2b5d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40010-template.d
+++ /dev/null
@@ -1,29 +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.74.0/tests/expected/d/40011-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40011-template.d
deleted file mode 100644
index 5c106063..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40012-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40012-template.d
deleted file mode 100644
index dbe1fb85..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40012-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.74.0/tests/expected/d/40013-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40013-template.d
deleted file mode 100644
index ec69b8bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40013-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.74.0/tests/expected/d/40020-funcfunc.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40020-funcfunc.d
deleted file mode 100644
index de673e78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40021-tst01.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40021-tst01.d
deleted file mode 100644
index e19c7c8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40022-tst02.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40022-tst02.d
deleted file mode 100644
index aa138a86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40023-bug-indent.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40023-bug-indent.d
deleted file mode 100644
index 6071604d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40024-tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40024-tst03.d
deleted file mode 100644
index 2344510d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40025-tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40025-tst03.d
deleted file mode 100644
index 15811ebc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40026-wysiwyg_strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40026-wysiwyg_strings.d
deleted file mode 100644
index cfdec32a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40027-static_if_in_struct.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40027-static_if_in_struct.d
deleted file mode 100644
index be936335..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40030-delegate.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40030-delegate.d
deleted file mode 100644
index 5f7beceb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40035-enum.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40035-enum.d
deleted file mode 100644
index 24d0ef63..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40040-sort_import.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40040-sort_import.d
deleted file mode 100644
index db26c1e4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40050-strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40050-strings.d
deleted file mode 100644
index 4964ad7a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40051-numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40051-numbers.d
deleted file mode 100644
index 72d55727..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40052-numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40052-numbers.d
deleted file mode 100644
index 8cf51f29..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40060-casts.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40060-casts.d
deleted file mode 100644
index b1d6b50b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40061-const.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40061-const.d
deleted file mode 100644
index 8277f0c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40070-d_sp_paren.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40070-d_sp_paren.d
deleted file mode 100644
index cc38daae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40080-static_if.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40080-static_if.d
deleted file mode 100644
index 0eb3a1a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40090-square_indent_tab.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40090-square_indent_tab.d
deleted file mode 100644
index e9657860..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40100-1438.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40100-1438.d
deleted file mode 100644
index 66c47d3a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40201-invariant.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40201-invariant.d
deleted file mode 100644
index 3da6240f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40201-invariant.d
+++ /dev/null
@@ -1 +0,0 @@
-invariant (C)c;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40300-extern_.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40300-extern_.d
deleted file mode 100644
index 40131d6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40400-vbraces000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40400-vbraces000.d
deleted file mode 100644
index 616bb259..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40401-vbraces001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40401-vbraces001.d
deleted file mode 100644
index 6d7e96f6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40402-vbraces002.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40402-vbraces002.d
deleted file mode 100644
index c966d140..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40403-template_use.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40403-template_use.d
deleted file mode 100644
index 94cdbf6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40500-template_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40500-template_spacing000.d
deleted file mode 100644
index 627ca266..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40501-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40501-template_spacing001.d
deleted file mode 100644
index dc3242ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40502-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40502-template_spacing001.d
deleted file mode 100644
index 3c238a1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40503-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40503-template_spacing001.d
deleted file mode 100644
index 010cbe07..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40504-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40504-type_spacing000.d
deleted file mode 100644
index 1e47f131..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40505-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40505-type_spacing000.d
deleted file mode 100644
index 1e47f131..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/d/40506-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40506-type_spacing000.d
deleted file mode 100644
index e11e545b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/ecma/90000-example-1.es b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/ecma/90000-example-1.es
deleted file mode 100644
index 45f9b6cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80000-assert.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80000-assert.java
deleted file mode 100644
index fbc20ba7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80010-annotation1.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80010-annotation1.java
deleted file mode 100644
index 314a0b91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80011-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80011-annotation2.java
deleted file mode 100644
index 1acc459f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80012-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80012-annotation2.java
deleted file mode 100644
index 1acc459f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80013-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80013-annotation2.java
deleted file mode 100644
index 42f5a1df..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80014-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80014-annotation2.java
deleted file mode 100644
index 42f5a1df..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80020-foreach.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80020-foreach.java
deleted file mode 100644
index 69967517..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80030-variable_aligns.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80030-variable_aligns.java
deleted file mode 100644
index c73b62d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80040-try.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80040-try.java
deleted file mode 100644
index 78a55849..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80050-double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80050-double_brace.java
deleted file mode 100644
index e00246e1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80051-double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80051-double_brace.java
deleted file mode 100644
index 66183ada..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80060-synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80060-synchronized.java
deleted file mode 100644
index b8b70a6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80061-synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80061-synchronized.java
deleted file mode 100644
index 73fc9b1d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80062-sp_this_paren.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80062-sp_this_paren.java
deleted file mode 100644
index 1c189223..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80063-i1121.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80063-i1121.java
deleted file mode 100644
index 18567ec3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80064-long_cl_cmt.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80064-long_cl_cmt.java
deleted file mode 100644
index af7a1c7e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80065-Java8DoubleColon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80065-Java8DoubleColon.java
deleted file mode 100644
index ec594909..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80066-sp_after_for_colon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80066-sp_after_for_colon.java
deleted file mode 100644
index 38515aed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80067-doxy-javadoc-alignment.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80067-doxy-javadoc-alignment.java
deleted file mode 100644
index 6b9f748b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80068-nl_before_ignore_after_case.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80068-nl_before_ignore_after_case.java
deleted file mode 100644
index 50bfc274..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80068-nl_before_ignore_after_case.java
+++ /dev/null
@@ -1,19 +0,0 @@
-void func(void)
-{
-	switch (cond)
-	{
-	case CASE_F:
-		synchronized(thingy)
-		{
-			do_a();
-			do_b();
-		}
-		break;
-	}
-
-	synchronized(thingy)
-	{
-		do_a();
-		do_b();
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80100-sf567.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80100-sf567.java
deleted file mode 100644
index 9fc644b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80200-sp_before_byref.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80200-sp_before_byref.java
deleted file mode 100644
index 7927ee89..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80201-generics.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80201-generics.java
deleted file mode 100644
index 086786c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80202-generics_wildcard.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80202-generics_wildcard.java
deleted file mode 100644
index 358e333b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80203-generics_return_type.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80203-generics_return_type.java
deleted file mode 100644
index 1f2aa340..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80204-cast.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80204-cast.java
deleted file mode 100644
index 30d0dcc4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80205-sp_after_angle.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80205-sp_after_angle.java
deleted file mode 100644
index bd654485..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80206-annotation3.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80206-annotation3.java
deleted file mode 100644
index 3d84c04c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80300-Issue_670.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80300-Issue_670.java
deleted file mode 100644
index b0aa2cf0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80301-issue_672.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80301-issue_672.java
deleted file mode 100644
index 16a077a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80302-Issue_1845.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80302-Issue_1845.java
deleted file mode 100644
index 062c89d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80303-Issue_1122.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80303-Issue_1122.java
deleted file mode 100644
index 111ee739..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80304-Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80304-Issue_1124.java
deleted file mode 100644
index bca3cb33..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80305-Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80305-Issue_1124.java
deleted file mode 100644
index 0469fed1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/oc/10018-delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/10018-delete-space-oc.mm
deleted file mode 100644
index 8760241b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/10019-func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/10019-func-param-wrap-oc.mm
deleted file mode 100644
index 45601228..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/10020-align-objc-like-xcode.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/10020-align-objc-like-xcode.m
deleted file mode 100644
index 93066246..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/10021-double-indent-objc-dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/10021-double-indent-objc-dict.m
deleted file mode 100644
index a93bd81e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/10022-indent-objc-block.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/10022-indent-objc-block.m
deleted file mode 100644
index 4aab0fc0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50001-Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50001-Fraction.h
deleted file mode 100644
index b1e373c2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50002-Fraction.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50002-Fraction.m
deleted file mode 100644
index 4ad6dfc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50003-main.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50003-main.m
deleted file mode 100644
index ec082dc1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50004-string.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50004-string.m
deleted file mode 100644
index bbfeb51e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50005-Declarations.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50005-Declarations.h
deleted file mode 100644
index 3b65c41c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50006-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50006-exceptions.m
deleted file mode 100644
index 609d2086..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50007-misc.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50007-misc.m
deleted file mode 100644
index 4de222a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50008-protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50008-protocol.m
deleted file mode 100644
index 50c4314a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50009-literals.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50009-literals.mm
deleted file mode 100644
index 4bd99277..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50010-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50010-return_type.m
deleted file mode 100644
index 62275a52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50011-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50011-return_type.m
deleted file mode 100644
index 7cc95485..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50012-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50012-return_type.m
deleted file mode 100644
index 106c5466..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/oc/50015-receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50015-receiver.m
deleted file mode 100644
index dd6ee3d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50016-ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50016-ternary.m
deleted file mode 100644
index 42a573f4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50017-ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50017-ternary.m
deleted file mode 100644
index d53fc319..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50018-indent-inside-ternary-operator.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50018-indent-inside-ternary-operator.m
deleted file mode 100644
index 0b6e1fa3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50020-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50020-selector.m
deleted file mode 100644
index c53db6fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50021-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50021-selector.m
deleted file mode 100644
index 3442f700..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50022-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50022-selector.m
deleted file mode 100644
index 1d790cc9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50025-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50025-exceptions.m
deleted file mode 100644
index 609d2086..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50026-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50026-exceptions.m
deleted file mode 100644
index 150de092..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50030-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50030-sort_import.m
deleted file mode 100644
index e0cfcb88..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50031-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50031-sort_import.m
deleted file mode 100644
index e0cfcb88..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50032-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50032-sort_import.m
deleted file mode 100644
index 37b4d643..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50033-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50033-sort_import.m
deleted file mode 100644
index 7c2ab21f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50034-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50034-sort_import.m
deleted file mode 100644
index f8a42242..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50035-sort_import_group.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50035-sort_import_group.m
deleted file mode 100644
index 251829df..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50040-complex_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50040-complex_method.m
deleted file mode 100644
index 29467813..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50050-real_world_file.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50050-real_world_file.m
deleted file mode 100644
index 1f7370d7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50060-oc-split.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50060-oc-split.m
deleted file mode 100644
index a7bcd4de..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50061-bug_167.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50061-bug_167.m
deleted file mode 100644
index 28087bb4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50062-issue_2631.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50062-issue_2631.m
deleted file mode 100644
index a4404650..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50070-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50070-blocks.m
deleted file mode 100644
index 8b77ccda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50071-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50071-blocks.m
deleted file mode 100644
index 8b77ccda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50072-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50072-blocks.m
deleted file mode 100644
index 8b77ccda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50073-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50073-blocks.m
deleted file mode 100644
index 06a9cd78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50074-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50074-blocks.m
deleted file mode 100644
index 467387b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50075-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50075-blocks.m
deleted file mode 100644
index 8b77ccda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50076-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50076-blocks.m
deleted file mode 100644
index 8b77ccda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50077-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50077-more_blocks.m
deleted file mode 100644
index 75870d32..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50078-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50078-more_blocks.m
deleted file mode 100644
index 91d27d55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50079-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50079-more_blocks.m
deleted file mode 100644
index f6af5562..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50080-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50080-more_blocks.m
deleted file mode 100644
index 1fbb7c34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50081-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50081-more_blocks.m
deleted file mode 100644
index 1fbb7c34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50082-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50082-more_blocks.m
deleted file mode 100644
index 75870d32..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50083-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50083-more_blocks.m
deleted file mode 100644
index f6af5562..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50084-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50084-more_blocks.m
deleted file mode 100644
index 75870d32..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50085-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50085-block_in_method.m
deleted file mode 100644
index 7a91d13e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50086-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50086-block_in_method.m
deleted file mode 100644
index c5c9ae6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/oc/50090-kw.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50090-kw.m
deleted file mode 100644
index ef52dd8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50091-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50091-block_in_method.m
deleted file mode 100644
index 705435d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50095-box.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50095-box.m
deleted file mode 100644
index 45b0de1b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50100-bug_340.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50100-bug_340.m
deleted file mode 100644
index ec5135ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50110-msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50110-msg_align.m
deleted file mode 100644
index 041148c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50111-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50111-ns_enum.m
deleted file mode 100644
index 1b960272..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50112-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50112-ns_enum.m
deleted file mode 100644
index 1b960272..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50113-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50113-ns_enum.m
deleted file mode 100644
index 5c30d740..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50120-gh137.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50120-gh137.m
deleted file mode 100644
index ff41543a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50200-more_blocks_2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50200-more_blocks_2.m
deleted file mode 100644
index 8835454f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50201-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50201-blocks_align.m
deleted file mode 100644
index 505c9b99..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50202-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50202-blocks_align.m
deleted file mode 100644
index 439ac716..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50203-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50203-blocks_align.m
deleted file mode 100644
index 07bd3cf3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50204-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50204-blocks_align.m
deleted file mode 100644
index a2cefc1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50205-msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50205-msg_align.m
deleted file mode 100644
index f024b44c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50206-issue_2727.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50206-issue_2727.m
deleted file mode 100644
index 5639c298..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50207-issue_3031.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50207-issue_3031.mm
deleted file mode 100644
index 75e6f5ea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50300-msg.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50300-msg.m
deleted file mode 100644
index 79c1a60a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50400-for.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50400-for.m
deleted file mode 100644
index 35c34bce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50410-oc_cond_colon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50410-oc_cond_colon.m
deleted file mode 100644
index 8059a3c6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50411-attribute_specifier_seqs.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50411-attribute_specifier_seqs.mm
deleted file mode 100644
index 49dfaefa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50500-code_placeholder.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50500-code_placeholder.m
deleted file mode 100644
index f6a745ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50510-gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50510-gh293.m
deleted file mode 100644
index a1dffc49..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50511-gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50511-gh293.m
deleted file mode 100644
index 6e4c180a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50512-sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50512-sp_oc_catch.m
deleted file mode 100644
index 6040b071..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50513-sp_oc_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50513-sp_oc_boxed.m
deleted file mode 100644
index 916e9330..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50514-indent_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50514-indent_boxed.m
deleted file mode 100644
index 165ee244..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50515-sp_oc_synchronized.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50515-sp_oc_synchronized.m
deleted file mode 100644
index ffff5618..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50600-bug_i_477.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50600-bug_i_477.m
deleted file mode 100644
index 0e7cbb78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50601-bug_i_408.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50601-bug_i_408.m
deleted file mode 100644
index 700d159d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50602-bug_i_125-412.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50602-bug_i_125-412.m
deleted file mode 100644
index 4beec2d5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50603-gh511.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50603-gh511.m
deleted file mode 100644
index 2c86e32d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50604-bug_497.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50604-bug_497.m
deleted file mode 100644
index 121503b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50605-bug_404.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50605-bug_404.m
deleted file mode 100644
index 8244ebd3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50606-bug_1366.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50606-bug_1366.m
deleted file mode 100644
index f4058b1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/oc/50608-blocks_align2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50608-blocks_align2.m
deleted file mode 100644
index b37c1b4b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50609-negative_value.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50609-negative_value.m
deleted file mode 100644
index 9aa4dc80..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50610-nelem.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50610-nelem.m
deleted file mode 100644
index d42ce3b6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50611-for2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50611-for2.m
deleted file mode 100644
index 535bc50b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50612-chunk_ends_type1.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50612-chunk_ends_type1.m
deleted file mode 100644
index fb9bb4e1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50613-chunk_ends_type2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50613-chunk_ends_type2.m
deleted file mode 100644
index 64efc7e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50614-chunk_ends_type3.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50614-chunk_ends_type3.m
deleted file mode 100644
index 8f0ae62c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50615-block_literal_protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50615-block_literal_protocol.m
deleted file mode 100644
index 35879a0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50616-oc_msg_in_pp.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50616-oc_msg_in_pp.m
deleted file mode 100644
index 8496973b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50617-boxed_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50617-boxed_receiver.m
deleted file mode 100644
index e4c247fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50618-func_def.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50618-func_def.mm
deleted file mode 100644
index 49de2fea..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50619-cast.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50619-cast.m
deleted file mode 100644
index 1e588579..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50620-sp_after_angle.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50620-sp_after_angle.m
deleted file mode 100644
index 318071ba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50621-Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50621-Fraction.h
deleted file mode 100644
index 77403abd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c
deleted file mode 100644
index f17c10ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50623-extern-c-attribute.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50623-extern-c-attribute.m
deleted file mode 100644
index 1c752682..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50624-typeof.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50624-typeof.m
deleted file mode 100644
index 968aad5a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/oc/50626-chunk_ends_type4.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50626-chunk_ends_type4.m
deleted file mode 100644
index dd4d55fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50627-method_ends_semicolon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50627-method_ends_semicolon.m
deleted file mode 100644
index b1ca36fa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50628-macro-close-brace.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50628-macro-close-brace.m
deleted file mode 100644
index 0eb3fa81..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50629-pp_bool.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50629-pp_bool.m
deleted file mode 100644
index b1bf896c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m
deleted file mode 100644
index 5c07ea43..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50700-cmt_insert.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50700-cmt_insert.m
deleted file mode 100644
index ec94c42b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50701-cmt_insert2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50701-cmt_insert2.m
deleted file mode 100644
index 7a90cc57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50800-properties.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50800-properties.m
deleted file mode 100644
index fa9ca930..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50801-i1213.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50801-i1213.m
deleted file mode 100644
index f47e5964..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50802-available.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50802-available.m
deleted file mode 100644
index 5054043a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50803-indent_single_newline.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50803-indent_single_newline.m
deleted file mode 100644
index a70184e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50804-issue_2629.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50804-issue_2629.m
deleted file mode 100644
index 6d6cbf30..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50805-issue_2724.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50805-issue_2724.m
deleted file mode 100644
index 23241732..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50810-bug_841.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50810-bug_841.m
deleted file mode 100644
index 8e8a6713..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50811-bug_1674.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50811-bug_1674.m
deleted file mode 100644
index 7d23b230..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50812-bug_1683.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50812-bug_1683.m
deleted file mode 100644
index 3ee562c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50813-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/oc/50814-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/oc/50815-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/expected/oc/50816-issue_2675.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50816-issue_2675.m
deleted file mode 100644
index ccb80f6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50817-issue_2722.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50817-issue_2722.m
deleted file mode 100644
index 8919895a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50900-1927.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50900-1927.m
deleted file mode 100644
index 3ae39e47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50901-Issue_2172.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50901-Issue_2172.m
deleted file mode 100644
index efa73591..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50902-Issue_2289.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50902-Issue_2289.m
deleted file mode 100644
index 19fe5cdf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50903-Issue_681.oc b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50903-Issue_681.oc
deleted file mode 100644
index 1e71cdaa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50904-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50904-double_angle_space.m
deleted file mode 100644
index 0e6c0c0c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50905-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50905-double_angle_space.m
deleted file mode 100644
index 9636a38e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/50906-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50906-double_angle_space.m
deleted file mode 100644
index 5c16c25f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/oc/51000-sp_cond_ternary_short.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51000-sp_cond_ternary_short.m
deleted file mode 100644
index 6c1ce050..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51000-sp_cond_ternary_short.m
+++ /dev/null
@@ -1 +0,0 @@
-NSString *str = (otherString ?: @"this is the placeholder");
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51001-ns_enum-i.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51001-ns_enum-i.m
deleted file mode 100644
index e5caad06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51001-ns_enum-i.m
+++ /dev/null
@@ -1,2 +0,0 @@
-typedef NS_ENUM                  (NSUInteger, MyEnum) {MyValue1, MyValue2, MyValue3};
-typedef NS_OPTIONS(NSUInteger, MyBitmask) {MyBit1, MyBit2, MyBit3};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51002-sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51002-sp_oc_catch.m
deleted file mode 100644
index 391b8df8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51002-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.74.0/tests/expected/oc/51003-sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51003-sp_oc_catch.m
deleted file mode 100644
index c214c848..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51003-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.74.0/tests/expected/oc/51004-block_pointer.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51004-block_pointer.m
deleted file mode 100644
index ab51e3d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51004-block_pointer.m
+++ /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.74.0/tests/expected/pawn/60000-functions.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60000-functions.pawn
deleted file mode 100644
index 853c70ad..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/pawn/60001-comment.p b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60001-comment.p
deleted file mode 100644
index f63deb62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/pawn/60002-traffic.p b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60002-traffic.p
deleted file mode 100644
index a902e497..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/pawn/60003-tags.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60003-tags.pawn
deleted file mode 100644
index b21f7679..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/pawn/60004-enum.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60004-enum.pawn
deleted file mode 100644
index 7dd318f3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/pawn/60005-unbraced.p b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60005-unbraced.p
deleted file mode 100644
index 1a22a3af..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/pawn/60010-str-escape.p b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60010-str-escape.p
deleted file mode 100644
index 3aa54453..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/pawn/60020-switch-vsemi.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60020-switch-vsemi.sma
deleted file mode 100644
index a0c720f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/pawn/60030-crusty_ex-1.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60030-crusty_ex-1.sma
deleted file mode 100644
index 23e042dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/pawn/60040-preproc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60040-preproc.pawn
deleted file mode 100644
index 6df8101f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/pawn/60050-gh419.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60050-gh419.pawn
deleted file mode 100644
index 9db7b08f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/pawn/60100-Issue_2586.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60100-Issue_2586.pawn
deleted file mode 100644
index e3eed47c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60100-Issue_2586.pawn
+++ /dev/null
@@ -1,5 +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.74.0/tests/expected/pawn/60101-Issue_2665.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60101-Issue_2665.pawn
deleted file mode 100644
index 90fcbd07..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60101-Issue_2665.pawn
+++ /dev/null
@@ -1,3 +0,0 @@
-static Entrypoint()
-{
-}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/sql/02400-mysql.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/sql/02400-mysql.sqc
deleted file mode 100644
index ec8ad604..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/sql/02401-sta-select.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/sql/02401-sta-select.sqc
deleted file mode 100644
index 1142c3b9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/sql/02402-issue_527.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/sql/02402-issue_527.sqc
deleted file mode 100644
index 17ccfa3b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/vala/70000-list.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70000-list.vala
deleted file mode 100644
index 1893dcb5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/vala/70001-advanced.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70001-advanced.vala
deleted file mode 100644
index ca88a821..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/vala/70010-verbatim_str.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70010-verbatim_str.vala
deleted file mode 100644
index fb0824ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/vala/70011-verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70011-verbatim_str2.vala
deleted file mode 100644
index c607d7b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/vala/70012-verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70012-verbatim_str2.vala
deleted file mode 100644
index c253b86b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/vala/70020-preproc.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70020-preproc.vala
deleted file mode 100644
index 9cc1ba1a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/vala/70287-gh287.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70287-gh287.vala
deleted file mode 100644
index be39a9db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/vala/70300-Issue_2090.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70300-Issue_2090.vala
deleted file mode 100644
index 5b4e1716..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/expected/vala/70301-Issue_2270.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70301-Issue_2270.vala
deleted file mode 100644
index 2202627c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/fixtest.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/fixtest.sh
deleted file mode 100755
index 76fac4bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/imported.test b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/imported.test
deleted file mode 100644
index b20f0247..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/1225.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/1225.c
deleted file mode 100644
index c6533cb1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/Issue-2278.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue-2278.c
deleted file mode 100644
index 1ecfecf5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/Issue_2279.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_2279.c
deleted file mode 100644
index 88c0ae84..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_2360.c
deleted file mode 100644
index dd4530c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/Issue_2411.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_2411.c
deleted file mode 100644
index 40244488..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/Issue_2640.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_2640.c
deleted file mode 100644
index ba25bcbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/Issue_2845.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_2845.h
deleted file mode 100644
index 9f34b1dc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/Issue_3169.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3169.c
deleted file mode 100644
index bf67ca55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3169.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <stdint.h>
-
-void bar (void)
-{
-
-  int32_t result;
-  const int32_t other
-    = 7;
-}
-
-#define P(bits)               \
-  void foo(void)              \
-  {                           \
-                              \
-    int##bits##_t result15;     \
-    const int##bits##_t other \
-      = 7;                    \
-  }
-
-#define Q(value)          \
-  void baz(void)          \
-  {                       \
-                          \
-    int32_t result24; \
-    const int32_t other   \
-      = 7;                \
-  }
-
-P(32)
-Q(7)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3233.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3233.c
deleted file mode 100644
index 5cfdff8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3233.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "config.h"
-
-#include "nautilus-previewer.h"
-
-#define PREVIEWER2_DBUS_IFACE "org.gnome.NautilusPreviewer2"
-#define PREVIEWER_DBUS_PATH "/org/gnome/NautilusPreviewer"
-
-static GDBusProxy * previewer_v2_proxy = NULL;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3269.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3269.c
deleted file mode 100644
index 5b7de8e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3269.c
+++ /dev/null
@@ -1,17 +0,0 @@
-int main(void)
-{
-	int x = 0;
-
-	while (x < 5)
-	{
-		x++;
-	}
-
-	do
-	{
-		x++;
-	}
-	while (x < 5);
-
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3272.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3272.h
deleted file mode 100644
index 673c5a91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3272.h
+++ /dev/null
@@ -1,11 +0,0 @@
-//#define INLINE_BUSY_WAIT(ticks)            \
-//{                                          \
-//    volatile size_t busy_wait_counter = 0; \
-//    while (busy_wait_counter++ < ticks);   \
-//}
-
-// #define INLINE_BUSY_WAIT(ticks)            \
-// {                                          \
-//     volatile size_t busy_wait_counter = 0; \
-//     while (busy_wait_counter++ < ticks);   \
-// }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3274.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3274.c
deleted file mode 100644
index f8b9f789..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3274.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define FOO
-#define BAR()
-
-FOO
-BAR()
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3327.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3327.c
deleted file mode 100644
index 883c5436..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3327.c
+++ /dev/null
@@ -1,10 +0,0 @@
-int main(void)
-{
-#if 1
-#pragma GCC warning "This code won't compile"
-#define FOO 1
-#line 7
-#error
-#endif
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3339.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3339.c
deleted file mode 100644
index 9f445c1a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3339.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int main(int argc, char **argv)
-{
-	if (argc > 1)
-		return /*status*/0/*success*/;
-	else
-		return      /*status*/          1      /*failure*/;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3342.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3342.c
deleted file mode 100644
index 986aab70..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3342.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int main(int argc, char **argv)
-{
-	int x[argc * argc];
-	typedef int x_t[argc * argc];
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3343.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3343.c
deleted file mode 100644
index 3c21608b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3343.c
+++ /dev/null
@@ -1,10 +0,0 @@
-int x[] =
-{
-#if 1
-#define X1
-#include "x1.c"
-#else
-#define X2
-#include "x2.c"
-#endif
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3345.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3345.c
deleted file mode 100644
index eec63b28..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3345.c
+++ /dev/null
@@ -1,8 +0,0 @@
-int main(int argc, char **argv)
-{
-	int x = argc * argc;
-	int y[] = { argc * argc };
-	struct { int x; } z = { argc * argc };
-	enum { w = 5 * 5 };
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3351.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3351.c
deleted file mode 100644
index 889d731a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3351.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <stdio.h>
-
-void foo(unsigned flags, unsigned COMMENT) {
-	/* Discard file comment if any */
-	if ((flags & COMMENT) != 0) {
-	    while (getchar() != 0) /* null */ ;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3356.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3356.c
deleted file mode 100644
index de2dba21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3356.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* PR middle-end/46360 */
-
-__attribute__((gnu_inline, always_inline)) extern inline char *
-strncpy (char *dest, const char *src, SIZE_TYPE len)
-{
-return __builtin_strncpy (dest, src, len);
-}
-
-void
-foo (char *s)
-{
-strncpy (s, "", 0);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3362.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3362.c
deleted file mode 100644
index 7a8c08f3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3362.c
+++ /dev/null
@@ -1,15 +0,0 @@
-int main(int argc, char** argv)
-{
-	switch (argc)
-	{
-	case 1:
-		// return the number unchanged
-		return 1;
-	case 2:
-		// fall through
-	case 3:
-		return 5;
-	default:
-		return 10;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3366.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3366.c
deleted file mode 100644
index 769c2f94..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3366.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#define __CVTENDIAN1_H
-#define __CVTENDIAN2_H
-
-static int ConvertEndian(void *ptr, int bytes)
-{
-	switch(bytes)
-	{
-		default:
-			break;
-	}
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3370.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3370.c
deleted file mode 100644
index 79081331..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3370.c
+++ /dev/null
@@ -1,17 +0,0 @@
-int main(int argc, char** argv)
-{
-switch (argc)
-{
-// If FOO or BAR is defined, treat it specially
-#ifdef FOO
-case FOO:
-return 1;
-#endif
-#ifdef BAR
-case BAR:
-return 2;
-#endif
-default:
-return 100;
-}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3376.c
deleted file mode 100644
index 084e9c7d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3376.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int *ptr;
-int *(*func1)(void (*param), void (*));
-int *(*func2)(void (*callback)(void), void (*)(void));
-int *(* func3)(void (* callback)(void), void (* )(void));
-int *(*  func4)(void (*  callback)(void), void (*  )(void));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3377.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3377.c
deleted file mode 100644
index 99cb0d84..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3377.c
+++ /dev/null
@@ -1,9 +0,0 @@
-int main(void)
-{
-	int i = 0;
-	while (i < 10)
-		i++;
-	for (i = 0; i < 10; i++)
-		continue;
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/add_long_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/add_long_comment.c
deleted file mode 100644
index 5900de52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/align-equ.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-equ.c
deleted file mode 100644
index 374ccbfb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/align-proto-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-proto-vars.c
deleted file mode 100644
index e1dd71ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/align-proto.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-proto.c
deleted file mode 100644
index 64dfce00..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/align-string.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-string.c
deleted file mode 100644
index f652e88f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/align-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-struct-init.c
deleted file mode 100644
index 084994ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-typedef.c
deleted file mode 100644
index ae17eb4d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-var.c
deleted file mode 100644
index adbf8a98..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/align_attr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_attr.c
deleted file mode 100644
index 0f4cfee1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_func_proto_star_amp.h
deleted file mode 100644
index 17a7c5ce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_func_proto_star_amp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __LIBR_BACKENDS_H
-#define __LIBR_BACKENDS_H
-
-char szPath[512];
-char *pszFilePart;
-int ret;
-double *pd;
-		
-INTERNAL_FN libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-INTERNAL_FN void *data_pointer(libr_section *scn, libr_data *data);
-INTERNAL_FN size_t data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void *data_pointer(libr_section *scn, libr_data *data);
-size_t data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-void *data_pointer(libr_section *scn, libr_data *data);
-
-void *data_pointer(libr_section *scn, libr_data *data);
-size_t data_size(libr_section *scn, libr_data *data);
-
-libr_intstatus add_section(libr_file *file_handle, char *resource_name, libr_section **retscn);
-
-void *data_pointer(libr_section *scn, libr_data *data);
-
-size_t data_size(libr_section *scn, libr_data *data);
-
-#endif /* __LIBR_BACKENDS_H */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_keep_extra.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_keep_extra.c
deleted file mode 100644
index 2bc0f532..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/align_sf_call_span_418.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_sf_call_span_418.c
deleted file mode 100644
index 421b9547..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/align_sf_call_span_419.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_sf_call_span_419.c
deleted file mode 100644
index 421b9547..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/align_sf_call_thresh_416.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_sf_call_thresh_416.c
deleted file mode 100644
index f4f6606e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/align_sf_call_thresh_417.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_sf_call_thresh_417.c
deleted file mode 100644
index c3c881eb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/align_stack.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_stack.c
deleted file mode 100644
index 0f88df06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/asm.c
deleted file mode 100644
index 1fb5015c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/attribute.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/attribute.c
deleted file mode 100644
index babe229f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/backslash-newline-lex.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/backslash-newline-lex.c
deleted file mode 100644
index 0f20388c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/beautifier-off.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/beautifier-off.c
deleted file mode 100644
index 033179cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bits.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bits.c
deleted file mode 100644
index 9a12f484..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bool-pos.c
deleted file mode 100644
index d6887223..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/br_cmt.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/br_cmt.c
deleted file mode 100644
index 4e57d2de..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/brace-remove.c
deleted file mode 100644
index c62506e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/brace-remove2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/brace-remove2.c
deleted file mode 100644
index e5b73723..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/brace-remove3.c
deleted file mode 100644
index 9cde8bbd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/brace.c
deleted file mode 100644
index 31f3b42b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/braces-2.c
deleted file mode 100644
index a34d73d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/braces-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/braces-3.c
deleted file mode 100644
index 1f1a2066..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/braces-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/braces-4.c
deleted file mode 100644
index 385f4a8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/braces-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/braces-5.c
deleted file mode 100644
index c77cc912..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/braces.c
deleted file mode 100644
index 20733afc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bsnl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bsnl.c
deleted file mode 100644
index b2b38b8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bug_1041.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_1041.c
deleted file mode 100644
index 193c750b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bug_1196.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_1196.c
deleted file mode 100644
index 9fdabca6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bug_1702.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_1702.c
deleted file mode 100644
index bf74c8bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bug_1718.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_1718.c
deleted file mode 100644
index eaddc974..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bug_2331.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_2331.c
deleted file mode 100644
index f30c53d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bug_3156.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_3156.c
deleted file mode 100644
index 508a0098..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bug_489.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_489.c
deleted file mode 100644
index e83d351b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bug_671.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_671.c
deleted file mode 100644
index 01a3b02b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bug_i_222.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_i_222.c
deleted file mode 100644
index 4f0ded31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bug_i_771.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_i_771.c
deleted file mode 100644
index c933487d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bug_i_876.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_i_876.c
deleted file mode 100644
index ab2a05db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bugs-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-1.c
deleted file mode 100644
index 39050c07..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bugs-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-2.c
deleted file mode 100644
index 42bed259..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bugs-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-3.c
deleted file mode 100644
index 4f85044a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bugs-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-4.c
deleted file mode 100644
index e01c2c32..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bugs-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-5.c
deleted file mode 100644
index 626eb7e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bugs-6.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-6.c
deleted file mode 100644
index 99ebbdda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bugs-7.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-7.c
deleted file mode 100644
index a879aa17..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bugs-8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-8.c
deleted file mode 100644
index 8870a663..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/bugs.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs.c
deleted file mode 100644
index d75a4782..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/case-nl_before_return.c
deleted file mode 100644
index 67adaddd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/case.c
deleted file mode 100644
index ffceda0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/cast_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cast_brace.c
deleted file mode 100644
index 7ec7f67a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/casts.c
deleted file mode 100644
index f09f5c5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/clang-has_include.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/clang-has_include.h
deleted file mode 100644
index d153e70a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/cmt-align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt-align.c
deleted file mode 100644
index 658bac4d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt_multi.c
deleted file mode 100644
index 8e01c5fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/cmt_multi_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt_multi_utf8.c
deleted file mode 100644
index 05b01f84..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/cmt_nl_end.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt_nl_end.c
deleted file mode 100644
index 48929d07..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/cmt_reflow.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt_reflow.c
deleted file mode 100644
index 6c40e11b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt_right_align.c
deleted file mode 100644
index b707f0bb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/code_width.c
deleted file mode 100644
index 1b2fbbaa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/colon-asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/colon-asm.c
deleted file mode 100644
index 5125af19..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/comment-convert.c
deleted file mode 100644
index 4282ab0b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/comment-indent.c
deleted file mode 100644
index d5295d6e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cond.c
deleted file mode 100644
index aec2f0a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/custom_types_ssl.c
deleted file mode 100644
index 0454f81d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/define-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/define-if-indent.c
deleted file mode 100644
index 1ef47273..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/deref.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/deref.c
deleted file mode 100644
index 100464fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/directfb.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/directfb.h
deleted file mode 100644
index 3531fa21..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/dos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/dos.c
deleted file mode 100644
index 108c3b1c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/double-sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/double-sparen.c
deleted file mode 100644
index e76c3ea1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/double-sparen.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <stdio.h>
-
-int main() {
-	FILE *f;
-	if ((f = fopen("/dev/null", "r")))
-		puts("file is open");
-	return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/doxy-comment.c
deleted file mode 100644
index ef0414ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/else-if.c
deleted file mode 100644
index 06cc37f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/empty-for.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/empty-for.c
deleted file mode 100644
index d9fb686a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/endif.c
deleted file mode 100644
index fd621299..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/enum-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/enum-struct-init.c
deleted file mode 100644
index 6660e4a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/enum_comma_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/enum_comma_ifdef.c
deleted file mode 100644
index aa80cf48..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/enum_gallery.c
deleted file mode 100644
index 2be93194..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/extern.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/extern.c
deleted file mode 100644
index 3bcfcbe5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/fcn_indent.c
deleted file mode 100644
index ff9f812b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/fcn_indent_func_def_col1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/fcn_indent_func_def_col1.c
deleted file mode 100644
index 235731c2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/fcn_type.c
deleted file mode 100644
index d49d381d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/for-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/for-space.c
deleted file mode 100644
index 1064d493..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/forever.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/forever.c
deleted file mode 100644
index 94dc8ce1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/forever.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int main(void)
-{
-	for(; ;)
-		continue;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/freebsd.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/freebsd.c
deleted file mode 100644
index c9ef164f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/func_call_user.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/func_call_user.c
deleted file mode 100644
index 275d8c5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/func_call_user2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/func_call_user2.c
deleted file mode 100644
index 38ecb232..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/func_wrap.c
deleted file mode 100644
index 7589d03b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/funcfunc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/funcfunc.c
deleted file mode 100644
index ee717abc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/function-def.c
deleted file mode 100644
index 778d121f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/gh399.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/gh399.c
deleted file mode 100644
index 00f868a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/global-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/global-vars.c
deleted file mode 100644
index 9576341b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/hello.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/hello.c
deleted file mode 100644
index 5849783c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/i1270.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/i1270.c
deleted file mode 100644
index 4831a47a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/i1413.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/i1413.c
deleted file mode 100644
index 4287ca86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/i1564.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/i1564.c
deleted file mode 100644
index c906ef9b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/i2c-core.c
deleted file mode 100644
index 29bdb584..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/if_chain.c
deleted file mode 100644
index 948492dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/ifdef-indent.c
deleted file mode 100644
index 5043c01f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/ifdef-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/ifdef-nest.c
deleted file mode 100644
index 68baf1fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/include-guard.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/include-guard.h
deleted file mode 100644
index 03625573..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/include-guard.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef FOO
-#define FOO
-
-int foo();
-
-#ifdef BAR
-#define BAZ
-int bar();
-#endif
-#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/include_define.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/include_define.h
deleted file mode 100644
index 13380cac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/indent-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent-assign.c
deleted file mode 100644
index 58ed9c52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent-macro-brace.c
deleted file mode 100644
index 8c3f9941..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/indent-off-after-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent-off-after-assign.c
deleted file mode 100644
index d01f58c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/indent-vbrace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent-vbrace.c
deleted file mode 100644
index 8b48e235..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/indent_first_bool_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent_first_bool_expr.c
deleted file mode 100644
index ec68ac3a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/indent_ternary-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent_ternary-1.c
deleted file mode 100644
index b76e375b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/indent_ternary-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent_ternary-2.c
deleted file mode 100644
index 20f1df64..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/kw_subst.c
deleted file mode 100644
index 5d37f823..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/lvalue.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/lvalue.c
deleted file mode 100644
index 2f2cc17d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/mac.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/mac.c
deleted file mode 100644
index ce4e7937..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/macro-returns.c
deleted file mode 100644
index 0febb263..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/minus-minus.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/minus-minus.c
deleted file mode 100644
index 4eb69237..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/misc.c
deleted file mode 100644
index cd948007..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/mod-paren.c
deleted file mode 100644
index 14bb9836..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/mod_case_brace.c
deleted file mode 100644
index 4bd9abde..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/multi.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/multi.h
deleted file mode 100644
index 33acea34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/my_infile.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/my_infile.c
deleted file mode 100644
index 8b8cd113..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/negative_value.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/negative_value.c
deleted file mode 100644
index 6399fbef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/newline_after_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/newline_after_endif.c
deleted file mode 100644
index 2a0cbe62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/nl-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl-comment.c
deleted file mode 100644
index 70c49200..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/nl-cont.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl-cont.c
deleted file mode 100644
index 9f87950f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/nl-cont2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl-cont2.c
deleted file mode 100644
index b3f079e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/nl-semicolon.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl-semicolon.c
deleted file mode 100644
index 8e0f59d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/nl-ver-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl-ver-def.c
deleted file mode 100644
index 9684ed27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_assign.c
deleted file mode 100644
index b2495c13..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/nl_before_ignore_after_case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_before_ignore_after_case.c
deleted file mode 100644
index 51866fe4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_before_ignore_after_case.c
+++ /dev/null
@@ -1,48 +0,0 @@
-void func(void)
-{
-    switch (cond)
-    {
-        case CASE_A:
-            for (;;)
-                do_stuff();
-            break;
-
-        case CASE_B:
-            if (cond)
-                do_stuff();
-            break;
-
-        case CASE_C:
-            do {
-                do_stuff()
-            } while (cond);
-            break;
-
-        case CASE_D:
-            while(cond)
-                do_stuff();
-            break;
-
-        case CASE_E:
-            switch(cond)
-            {
-                case CASE_EE:
-                    break;
-            }
-            break;
-    }
-    for (;;)
-        do_stuff();
-    if (cond)
-        do_stuff();
-    do {
-        do_stuff()
-    } while (cond);
-    while(cond)
-        do_stuff();
-    switch(cond)
-    {
-        case CASE_A:
-            do_stuff();
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_before_return.c
deleted file mode 100644
index da5ed3eb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/nl_create_one_liner.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_create_one_liner.c
deleted file mode 100644
index 16887eca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_ds_struct_enum.c
deleted file mode 100644
index d19964ae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/nl_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_endif.c
deleted file mode 100644
index d738d74a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/nl_proto_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_proto_endif.c
deleted file mode 100644
index f50766b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_return_expr.c
deleted file mode 100644
index e917e399..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/one-liner-define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/one-liner-define.c
deleted file mode 100644
index fdb02e31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/one-liner-init.c
deleted file mode 100644
index 91d92d55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/one_liners.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/one_liners.c
deleted file mode 100644
index 1f6e0d3e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/paren-indent.c
deleted file mode 100644
index df5b1c14..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/paren_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/paren_indent.c
deleted file mode 100644
index 4b0ff447..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/parenthesized_indirect_call.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/parenthesized_indirect_call.c
deleted file mode 100644
index 3d5a6819..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/parenthesized_indirect_call.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-void hello(void)
-{
-        printf("Hello world!\n");
-}
-
-void (*get_hello(void))(void)
-{
-        return hello;
-}
-
-int main()
-{
-        (get_hello())();
-        return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pascal_ptr.c
deleted file mode 100644
index 5b0116ba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pos_compare.c
deleted file mode 100644
index b0942de0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pos_conditional.c
deleted file mode 100644
index 100545e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/pp-before-func-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp-before-func-def.c
deleted file mode 100644
index 948ce135..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp-if-indent.c
deleted file mode 100644
index cd9d6c4d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/pp-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp-nest.c
deleted file mode 100644
index b602471b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp-space.c
deleted file mode 100644
index 67cf3e55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/pp_concat_asn1.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp_concat_asn1.h
deleted file mode 100644
index 9874cf04..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/pp_ret.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp_ret.c
deleted file mode 100644
index c35e4294..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/pragma.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pragma.c
deleted file mode 100644
index a0dcd975..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/pragma_asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pragma_asm.c
deleted file mode 100644
index a7834613..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/preproc-if.c
deleted file mode 100644
index 71fbf792..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/return-compound-literal.c
deleted file mode 100644
index 8547c3a7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/return-multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/return-multi.c
deleted file mode 100644
index 846ca21c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/semicolons.c
deleted file mode 100644
index d7e2379a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/sf588.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sf588.c
deleted file mode 100644
index d1c5f1cc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/sf594.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sf594.c
deleted file mode 100644
index cd08cce6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/single_line_comment_after.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/single_line_comment_after.c
deleted file mode 100644
index 527b3e80..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/single_line_comment_after.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdio.h>
-
-int main(void)
-{
-    printf("Hello "); // This comment is short.
-
-    printf("world!\n");
-        // This comment is long, so I put it on the next line and indented it.
-
-    return 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sort_include.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sort_include.c
deleted file mode 100644
index 0f1956d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sp_after_sparen.c
deleted file mode 100644
index 8a86dd25..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sp_cmt_cpp_start.c
deleted file mode 100644
index b9b07287..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/sp_embed_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sp_embed_comment.c
deleted file mode 100644
index 88a54dff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/sp_func_call_user_inside_fparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/input/c/sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sparen-indent.c
deleted file mode 100644
index fe770681..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/string_prefixes.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/string_prefixes.c
deleted file mode 100644
index e901c9ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/string_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/string_utf8.c
deleted file mode 100644
index a473e1bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/string_utf8.c
+++ /dev/null
@@ -1 +0,0 @@
-char* x = "中国語 (�体)";
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/struct-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/struct-brace.c
deleted file mode 100644
index 7d08b4ca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/switch-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/switch-case.c
deleted file mode 100644
index add9fcfa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/switch.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/switch.c
deleted file mode 100644
index 5b760363..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/t3.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/t3.in.c
deleted file mode 100644
index e352f736..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/type-cast.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/type-cast.c
deleted file mode 100644
index 5760b466..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/type_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/type_wrap.c
deleted file mode 100644
index 13b74455..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/utf8-identifiers.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/utf8-identifiers.c
deleted file mode 100644
index e3281aac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/vardefcol.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/vardefcol.c
deleted file mode 100644
index bdb40e8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/various_colons.c
deleted file mode 100644
index 516a5a72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/vb-do.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/vb-do.c
deleted file mode 100644
index 1cefd1df..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/vb-pp.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/vb-pp.c
deleted file mode 100644
index 5ea209c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/vb-while.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/vb-while.c
deleted file mode 100644
index 22291748..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/whole_file_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/whole_file_ifdef.c
deleted file mode 100644
index bb16e116..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/c/xml.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/xml.c
deleted file mode 100644
index fe7afdf4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/2138.cpp
deleted file mode 100644
index e0379b43..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/2185.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/2185.cpp
deleted file mode 100644
index 6f874926..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/2203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/2203.cpp
deleted file mode 100644
index 4a2c05fa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/621_this-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/621_this-spacing.cpp
deleted file mode 100644
index bd28a5e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/622_ifdef-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/622_ifdef-indentation.cpp
deleted file mode 100644
index a6aface7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/623_caret-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/623_caret-spacing.cpp
deleted file mode 100644
index ad1ed6f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/633_decl-in-func-typedef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/633_decl-in-func-typedef.cpp
deleted file mode 100644
index 4e18c597..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/634_extern-c-no-block.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/634_extern-c-no-block.cpp
deleted file mode 100644
index bb6b14fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/DB.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/DB.cpp
deleted file mode 100644
index 1b8f4bc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/DefaultAndDelete.cpp
deleted file mode 100644
index 3c4f3b9e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/DoxygenComments.cpp
deleted file mode 100644
index dfa5a906..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Example.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Example.h
deleted file mode 100644
index deede79a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/I1112-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/I1112-1.cpp
deleted file mode 100644
index 365df31f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/I1112-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/I1112-2.cpp
deleted file mode 100644
index c3765ce4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/I1112-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/I1112-3.cpp
deleted file mode 100644
index 6c48cb63..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/I2102.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/I2102.cpp
deleted file mode 100644
index d8cf883a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/I2103.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/I2103.cpp
deleted file mode 100644
index ba6386dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1052.cpp
deleted file mode 100644
index 19461b71..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1167.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1167.cpp
deleted file mode 100644
index 6a9042c2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1184.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1184.cpp
deleted file mode 100644
index 7c69e7fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1460.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1460.h
deleted file mode 100644
index 63787999..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1511.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1511.cpp
deleted file mode 100644
index 2583c0e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1692.cpp
deleted file mode 100644
index 4a2c97b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1703.cpp
deleted file mode 100644
index bca40664..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1704.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1704.cpp
deleted file mode 100644
index 90cb2049..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1733.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1733.cpp
deleted file mode 100644
index 10be5586..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1734.cpp
deleted file mode 100644
index 31d08c29..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1737.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1737.cpp
deleted file mode 100644
index fd8b1384..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1753.cpp
deleted file mode 100644
index bf5530c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1813-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1813-2.cpp
deleted file mode 100644
index 9c02605a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1813-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1813-3.cpp
deleted file mode 100644
index 93e0799c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1813.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1813.cpp
deleted file mode 100644
index 0c07555d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1923.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1923.cpp
deleted file mode 100644
index e5b3ceeb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_1966.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1966.cpp
deleted file mode 100644
index 80b7ddc7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2020.cpp
deleted file mode 100644
index 94d0aa28..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2045.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2045.cpp
deleted file mode 100644
index 627eba3f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2085.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2085.cpp
deleted file mode 100644
index 581f4db4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2091.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2091.cpp
deleted file mode 100644
index 6e32d683..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2099.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2099.cpp
deleted file mode 100644
index 4726f44b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2101.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2101.cpp
deleted file mode 100644
index 3e07c686..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2138.cpp
deleted file mode 100644
index ad53fa57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2149.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2149.cpp
deleted file mode 100644
index 88fb2249..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2150.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2150.cpp
deleted file mode 100644
index 1e4d6bf5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2151.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2151.cpp
deleted file mode 100644
index dce02df3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2163.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2163.cpp
deleted file mode 100644
index 543b9827..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2166.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2166.cpp
deleted file mode 100644
index d9ac55c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2170.cpp
deleted file mode 100644
index beeffc7e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2186.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2186.cpp
deleted file mode 100644
index c9cbacda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2195.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2195.cpp
deleted file mode 100644
index 3573b20d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2219.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2219.cpp
deleted file mode 100644
index cb6e24bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2224.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2224.cpp
deleted file mode 100644
index 65382eb9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2229.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2229.cpp
deleted file mode 100644
index 9f575dc1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2232.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2232.cpp
deleted file mode 100644
index 7632ed27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2236.cpp
deleted file mode 100644
index 5dbc4fbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2250.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2250.cpp
deleted file mode 100644
index 9268c2e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2281.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2281.cpp
deleted file mode 100644
index 44b9e75f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2302.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2302.cpp
deleted file mode 100644
index 4763c574..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2305.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2305.cpp
deleted file mode 100644
index 1b35ac11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2319.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2319.cpp
deleted file mode 100644
index 8c0ae3e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2332.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2332.cpp
deleted file mode 100644
index 0bc9cf8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2343.cfg
deleted file mode 100644
index 955a1f9a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2343.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2343.cpp
deleted file mode 100644
index 837b0506..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2345-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2345-3.cpp
deleted file mode 100644
index 787ce29b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2345-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2345-4.cpp
deleted file mode 100644
index 9478d63e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2368.cpp
deleted file mode 100644
index 08d0556b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2383.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2383.cpp
deleted file mode 100644
index 356fd9af..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2386.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2386.cpp
deleted file mode 100644
index ac0b1dd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2387.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2387.cpp
deleted file mode 100644
index af00e16e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2428.cpp
deleted file mode 100644
index c919d5a5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2437.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2437.cpp
deleted file mode 100644
index 2a64bd8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2440.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2440.cpp
deleted file mode 100644
index c52c30da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2440_nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2440_nl.cpp
deleted file mode 100644
index c52c30da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2478.cpp
deleted file mode 100644
index fbcfec1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2561.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2561.cpp
deleted file mode 100644
index 15232fc4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2565.cpp
deleted file mode 100644
index 721d4d78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2570.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2570.cpp
deleted file mode 100644
index 44373e77..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2574.cpp
deleted file mode 100644
index fc79cd0d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2582.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2582.cpp
deleted file mode 100644
index adf9bfe9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2591.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2591.cpp
deleted file mode 100644
index 01ed232e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2594.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2594.cpp
deleted file mode 100644
index 798a719a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2596.cpp
deleted file mode 100644
index d2517e8b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2604.cpp
deleted file mode 100644
index e73c67a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2668.cpp
deleted file mode 100644
index 1e2f5d02..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2672-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2672-a.cpp
deleted file mode 100644
index d29d2c47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2672-b.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2672-b.cpp
deleted file mode 100644
index f484d4ff..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2688.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2688.cpp
deleted file mode 100644
index 0b394620..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2689.cpp
deleted file mode 100644
index ef3b5a4b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2692.cpp
deleted file mode 100644
index 4173ad5d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2703.cpp
deleted file mode 100644
index ec4554e9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2726.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2726.cpp
deleted file mode 100644
index 7b76eb43..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2734.cpp
deleted file mode 100644
index 7b85c0ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2735.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2735.cpp
deleted file mode 100644
index f83e3536..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2742.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2742.cpp
deleted file mode 100644
index 9d76fe44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2752.cpp
deleted file mode 100644
index 237c8ce1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2752.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int main() {}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2757.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2757.cpp
deleted file mode 100644
index 3c84969b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2758.cpp
deleted file mode 100644
index 1ac9a86e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2759.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2759.cpp
deleted file mode 100644
index cbe9c4a5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2771.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2771.cpp
deleted file mode 100644
index ab7c285f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2794.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2794.cpp
deleted file mode 100644
index 03f2ae4c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2795.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2795.cpp
deleted file mode 100644
index 6cb7e112..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2823.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2823.cpp
deleted file mode 100644
index eb0228c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2831.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2831.cpp
deleted file mode 100644
index f2dc1717..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2836.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2836.cpp
deleted file mode 100644
index 44272d56..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2873.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2873.cpp
deleted file mode 100644
index af3020d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2879.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2879.cpp
deleted file mode 100644
index 294c5e85..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2886.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2886.cpp
deleted file mode 100644
index 0474c710..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2890.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2890.cpp
deleted file mode 100644
index cea47724..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2902.cpp
deleted file mode 100644
index ae10d5a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2902.cpp
+++ /dev/null
@@ -1 +0,0 @@
-enum empty {};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2907.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2907.cpp
deleted file mode 100644
index 9d42a72d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2910.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2910.cpp
deleted file mode 100644
index 82c2bec9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2914.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2914.cpp
deleted file mode 100644
index c2cd8b59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2921.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2921.cpp
deleted file mode 100644
index 43e19e96..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2930.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2930.cpp
deleted file mode 100644
index 9b130982..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_2942.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2942.cpp
deleted file mode 100644
index e5bc781f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2942.cpp
+++ /dev/null
@@ -1 +0,0 @@
-if (p == b);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2949.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2949.cpp
deleted file mode 100644
index d37d7ac3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3010.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3010.cpp
deleted file mode 100644
index b546e7be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3018.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3018.cpp
deleted file mode 100644
index ddbb473e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3025.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3025.cpp
deleted file mode 100644
index 9e64526e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3034.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3034.cpp
deleted file mode 100644
index b91f431d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3040.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3040.cpp
deleted file mode 100644
index fe9aed25..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3044.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3044.cpp
deleted file mode 100644
index 739b1305..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3048.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3048.cpp
deleted file mode 100644
index 678d6ce4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3052.cpp
deleted file mode 100644
index cb468be3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3054-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3054-2.cpp
deleted file mode 100644
index 77d0d337..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3054.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3054.cpp
deleted file mode 100644
index 2d8b38d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3055-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3055-a.cpp
deleted file mode 100644
index 85c9b7e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3055.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3055.cpp
deleted file mode 100644
index 4d66bbf3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3058.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3058.cpp
deleted file mode 100644
index f94e88e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3061_0nl.cpp
deleted file mode 100644
index 2a76b5a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3061_1nl.cpp
deleted file mode 100644
index fd369e24..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3061_2nl.cpp
deleted file mode 100644
index 25906e08..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3080.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3080.cpp
deleted file mode 100644
index 75c6072b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3097.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3097.cpp
deleted file mode 100644
index 3959e85a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3097.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-void foo()
-{
-    for( unsigned p = 0; p < np;
-         ++p )
-    {
-      double* o = bar[p];
-    }
-    int x = 42;
-}
-
-void bar()
-{
-    // hello
-    int x  = 42;
-    if( x ) foo;
-    type::value_t y = 0;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3113.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3113.cpp
deleted file mode 100644
index 63090f4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_3164.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3164.cpp
deleted file mode 100644
index 79fd6508..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3164.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <cassert>
-#include <rt>
-#include <cassert> // comment
-#include <cass>
-#include <cassert> /* comment B */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3176.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3176.cpp
deleted file mode 100644
index 2384027d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3176.cpp
+++ /dev/null
@@ -1 +0,0 @@
-SecureStorage::~SecureStorage() = default;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3197.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3197.h
deleted file mode 100644
index f1ba44b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3197.h
+++ /dev/null
@@ -1,4 +0,0 @@
-vec_           &                    operator+=(vec_   &  , const vec_   &);
-
-
-int       xyz(int a, int b);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3198.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3198.cpp
deleted file mode 100644
index 8dd234b7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3198.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-enum class Flags : std::int64_t
-{
-    MyFlag
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3203.cpp
deleted file mode 100644
index 47b37eee..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3203.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <vector>
-
-class A
-{
-public:
-    int a;
-    int b;
-
-    std::vector<int*> v =
-    {
-        &a,
-        &b
-    };
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3205.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3205.cpp
deleted file mode 100644
index 99767289..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3205.cpp
+++ /dev/null
@@ -1 +0,0 @@
-vec_& operator+=(vec_&, const vec_&);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3220.cpp
deleted file mode 100644
index ba42b013..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3220.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-int *   b;
-auto Func2(Model    *      model) -> Color                  *  *    const;
-auto Func2(Model   *   model) -> Color   *   *        const {
-        return nullptr;
-}
-int    *    Funcf(Model   *   model, int   *  *);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3237.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3237.cpp
deleted file mode 100644
index 17e84d9c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3237.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-void f()
-{
-        CPoint pt( aaa * bbb );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3252.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3252.cpp
deleted file mode 100644
index b435f4e2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3252.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void (*x)(void);
-
-typedef struct
-{
-void (*y)(void);
-} z;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3309.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3309.cpp
deleted file mode 100644
index d6dd1dac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3309.cpp
+++ /dev/null
@@ -1 +0,0 @@
-template<typename ...               ARGS> void test(ARGS&&... args) {}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3321.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3321.h
deleted file mode 100644
index 8e74beb2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3321.h
+++ /dev/null
@@ -1,4 +0,0 @@
-auto l1 = []() {};
-auto l2 = [&]() {};
-auto l3 = []() noexcept {};
-auto l4 = [&]() noexcept {};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_931.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_931.cpp
deleted file mode 100644
index 90084874..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Issue_995-do.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_995-do.cpp
deleted file mode 100644
index 05eca611..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/NewLine.cpp
deleted file mode 100644
index 9c7f1ee9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/NewLine0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/NewLine0.cpp
deleted file mode 100644
index 01e7cc97..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp
deleted file mode 100644
index b0e13d6a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Q_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Q_2.cpp
deleted file mode 100644
index ee6239f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Q_EMIT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Q_EMIT.cpp
deleted file mode 100644
index d3ef9396..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Q_FOREACH.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Q_FOREACH.cpp
deleted file mode 100644
index 37156618..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Q_FOREVER.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Q_FOREVER.cpp
deleted file mode 100644
index a0fb07d5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp
deleted file mode 100644
index 5a4c8e7d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/STUCK_macro-difficulties.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/STUCK_macro-difficulties.cpp
deleted file mode 100644
index ea1c724e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/Timestamp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Timestamp.h
deleted file mode 100644
index 60dc3791..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-10496.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-10496.cpp
deleted file mode 100644
index 3228cf2a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-12046.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-12046.cpp
deleted file mode 100755
index 9cc7b13f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1288.cpp
deleted file mode 100644
index 38ded76c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-1334.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1334.cpp
deleted file mode 100644
index 278cd1a2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-1335.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1335.cpp
deleted file mode 100644
index 2f3ad2a2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-1337.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1337.cpp
deleted file mode 100644
index 59635c19..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-1339.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1339.cpp
deleted file mode 100644
index 255db223..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1340.cpp
deleted file mode 100644
index 2f743294..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-1344.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1344.cpp
deleted file mode 100644
index c898df76..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-1346.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1346.cpp
deleted file mode 100644
index 0261a306..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-1347.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1347.cpp
deleted file mode 100644
index ac2184f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-1350.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1350.cpp
deleted file mode 100644
index 7353e915..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-1356.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1356.cpp
deleted file mode 100644
index 8a1aab54..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-1358.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1358.cpp
deleted file mode 100644
index 770bf0c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-16283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-16283.cpp
deleted file mode 100644
index 7f042642..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-18439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-18439.cpp
deleted file mode 100644
index 0c40e831..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-18777.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-18777.cpp
deleted file mode 100644
index 0f177fdc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-1980.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1980.cpp
deleted file mode 100644
index 97940716..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-1981.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1981.cpp
deleted file mode 100644
index a20f4c43..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-1983.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1983.cpp
deleted file mode 100644
index e7d9de6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-19894.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-19894.cpp
deleted file mode 100644
index ef5fe7cf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-2049.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-2049.cpp
deleted file mode 100644
index 7c64f76a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-21506.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21506.cpp
deleted file mode 100644
index a8c5f2df..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-21509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21509.cpp
deleted file mode 100644
index bde48ee7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-21510.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21510.cpp
deleted file mode 100644
index ea406fbe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-21727.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21727.cpp
deleted file mode 100644
index 991d2631..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-21728.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21728.cpp
deleted file mode 100644
index 658fba68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-21729.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21729.cpp
deleted file mode 100644
index 4b8d1d59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-2650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-2650.cpp
deleted file mode 100644
index b9ced773..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-2680.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-2680.cpp
deleted file mode 100644
index b6aa5bd7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-2683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-2683.cpp
deleted file mode 100755
index 5da60d3f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-29935.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-29935.cpp
deleted file mode 100644
index a6cf3fc5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-30088.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-30088.cpp
deleted file mode 100644
index 1fd5c1fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-30628.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-30628.cpp
deleted file mode 100644
index ffa60026..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-32657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-32657.cpp
deleted file mode 100644
index 9151231a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-38381.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-38381.cpp
deleted file mode 100644
index 701b55b2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-64325.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-64325.cpp
deleted file mode 100644
index c4005d7c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/UNI-9650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-9650.cpp
deleted file mode 100644
index f6dba01b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/al.cpp
deleted file mode 100644
index 3c232dec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align-330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align-330.cpp
deleted file mode 100644
index 0ba91720..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align-assign-mixed.cpp
deleted file mode 100644
index 2e55d59d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align-star-amp-pos.cpp
deleted file mode 100644
index 29a7a23a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align_across_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_across_braces.cpp
deleted file mode 100644
index f47f0c80..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align_assign_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_assign_func_proto.cpp
deleted file mode 100644
index 0c816099..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align_asterisk_after_type_cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_asterisk_after_type_cast.cpp
deleted file mode 100644
index 4b325b1e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align_class-constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_class-constr.cpp
deleted file mode 100644
index 2be3c8e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_class.cpp
deleted file mode 100644
index d47e77bb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align_constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_constr.cpp
deleted file mode 100644
index 1a22f6d9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align_continuation_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_continuation_left_shift.cpp
deleted file mode 100644
index c0c066b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align_default_after_override.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_default_after_override.cpp
deleted file mode 100644
index de21686c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_fcall.cpp
deleted file mode 100644
index c27ed9d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_func_params.cpp
deleted file mode 100644
index a90155fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_func_proto_thresh.cpp
deleted file mode 100644
index df6b4dca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_func_proto_thresh2.cpp
deleted file mode 100644
index b0960a11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_left_shift.cpp
deleted file mode 100644
index 3cf7a744..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align_left_shift2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_left_shift2.cpp
deleted file mode 100644
index c90ae71f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align_right_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_right_comment.cpp
deleted file mode 100644
index 43a2a70f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_var_def_thresh.cpp
deleted file mode 100644
index 3942f227..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/alt_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/alt_tokens.cpp
deleted file mode 100644
index fcaf1392..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/anonymous_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/anonymous_enum.cpp
deleted file mode 100644
index 0cf8426d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/attribute_specifier_seqs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/attribute_specifier_seqs.cpp
deleted file mode 100644
index 744b3404..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/av.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/av.h
deleted file mode 100644
index 7a90197c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bit-colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bit-colon.cpp
deleted file mode 100644
index b593255b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bom.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bom.cpp
deleted file mode 100644
index 7ee7e7e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bool.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bool.cpp
deleted file mode 100644
index 30d4cb29..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/brace_brace_init_lst.cpp
deleted file mode 100644
index 2a5254f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/braced_init_list.cpp
deleted file mode 100644
index e245f34c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/braced_init_template_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/braced_init_template_decltype.cpp
deleted file mode 100644
index bfd5ef86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/braces_align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/braces_align.cpp
deleted file mode 100644
index ca99edc6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/braces_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/braces_empty.cpp
deleted file mode 100644
index 583c7fa1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1001.cpp
deleted file mode 100644
index b0ce9a06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1002.cpp
deleted file mode 100644
index 713018e4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1003.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1003.cpp
deleted file mode 100644
index 7495b93d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1004.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1004.cpp
deleted file mode 100644
index 3287be1c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1005.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1005.cpp
deleted file mode 100644
index 01a457d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1020.cpp
deleted file mode 100644
index ec80e915..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1027.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1027.cpp
deleted file mode 100644
index 5ccafd2b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1032.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1032.cpp
deleted file mode 100644
index 80078efe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1068.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1068.cpp
deleted file mode 100644
index 74fbc8e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1108.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1108.cpp
deleted file mode 100644
index 573a9810..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1112.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1112.cpp
deleted file mode 100644
index e6537641..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1127.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1127.cpp
deleted file mode 100644
index 9ee98743..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1134.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1134.cpp
deleted file mode 100644
index 369b70f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1139.cpp
deleted file mode 100644
index 47463232..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1158.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1158.cpp
deleted file mode 100644
index e92da160..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1160.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1160.cpp
deleted file mode 100644
index 8dc7a9d1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1161.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1161.cpp
deleted file mode 100644
index 535c3be7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1169.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1169.cpp
deleted file mode 100644
index aa56008a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1170.cpp
deleted file mode 100644
index 35dd772f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1235.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1235.cpp
deleted file mode 100644
index b9ff78a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1236.cpp
deleted file mode 100644
index 8acaaed2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1249.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1249.cpp
deleted file mode 100644
index 975dc82c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1288.cpp
deleted file mode 100644
index 94444cf9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1289.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1289.cpp
deleted file mode 100644
index 42663477..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1296.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1296.cpp
deleted file mode 100644
index 699025fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1315.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1315.cpp
deleted file mode 100644
index 080c9233..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1321.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1321.cpp
deleted file mode 100644
index c381f91c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1324.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1324.cpp
deleted file mode 100644
index 5df154f3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1338.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1338.cpp
deleted file mode 100644
index 04b4cd8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1340.cpp
deleted file mode 100644
index 680d6d51..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1346.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1346.h
deleted file mode 100644
index 21fe1c44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1349.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1349.cpp
deleted file mode 100644
index aa1938e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1395.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1395.cpp
deleted file mode 100644
index 00694ce9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1402.cpp
deleted file mode 100644
index 9b001a44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1403.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1403.cpp
deleted file mode 100644
index 71f67f75..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1432.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1432.cpp
deleted file mode 100644
index 575a21c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1439.cpp
deleted file mode 100644
index d560522b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1452.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1452.cpp
deleted file mode 100755
index d7fcf753..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1462.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1462.cpp
deleted file mode 100644
index 5170b9a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1607.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1607.cpp
deleted file mode 100644
index 9e4e47d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1649.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1649.cpp
deleted file mode 100644
index 4ab5eea8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1649.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-Foo()
-noexcept ()
-{}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1689.cpp
deleted file mode 100644
index 795bb572..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1691.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1691.cpp
deleted file mode 100644
index 2d5d1204..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1717.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1717.cpp
deleted file mode 100644
index a1adcf5f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1758-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1758-f.cpp
deleted file mode 100644
index b324fbda..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1758.cpp
deleted file mode 100644
index b0f35107..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_1854.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1854.cpp
deleted file mode 100644
index 29cc2774..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1854.cpp
+++ /dev/null
@@ -1 +0,0 @@
-while (*p++ = ' ') ;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1862.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1862.cpp
deleted file mode 100644
index 78958bb1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_2285.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2285.cpp
deleted file mode 100644
index 14a85090..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_2322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2322.cpp
deleted file mode 100644
index f9768c40..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_2371.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2371.cpp
deleted file mode 100644
index 26444ad3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_2402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2402.cpp
deleted file mode 100644
index 92731c19..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_2433_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2433_1.cpp
deleted file mode 100644
index d19718f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_2433_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2433_2.cpp
deleted file mode 100644
index 9da12944..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_33056.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_33056.cpp
deleted file mode 100644
index 1339ede1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_472.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_472.cpp
deleted file mode 100644
index 753d9519..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_481.cpp
deleted file mode 100644
index 03c4a828..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_484.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_484.cpp
deleted file mode 100644
index 4c582e86..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_485.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_485.cpp
deleted file mode 100644
index 4865da64..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_488.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_488.cpp
deleted file mode 100644
index 382beced..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_495.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_495.cpp
deleted file mode 100644
index f356c302..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_612.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_612.cpp
deleted file mode 100644
index 38253f15..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_631.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_631.cpp
deleted file mode 100644
index e110d383..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_633.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_633.cpp
deleted file mode 100644
index 5b672b47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_634.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_634.cpp
deleted file mode 100644
index febbf7b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_643.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_643.cpp
deleted file mode 100644
index 55e3e309..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_651.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_651.cpp
deleted file mode 100644
index b36e182a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_653.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_653.cpp
deleted file mode 100644
index 1bf853d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_653.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- *
- **Some comment
- */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_654.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_654.cpp
deleted file mode 100644
index 8baaeb1c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_657.cpp
deleted file mode 100644
index 230b96b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_662.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_662.cpp
deleted file mode 100644
index f8b0f8a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_663.cpp
deleted file mode 100644
index 869320c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_664.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_664.cpp
deleted file mode 100644
index 148201b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_666.cpp
deleted file mode 100644
index 00adec83..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_670.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_670.cpp
deleted file mode 100644
index e9229a8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_670.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_670.h
deleted file mode 100644
index ea503b10..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_671.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_671.h
deleted file mode 100644
index 8ff7bfca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_858.cpp
deleted file mode 100644
index 512d2e45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_902.cpp
deleted file mode 100644
index eb51f587..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_1000.cpp
deleted file mode 100644
index 06da6b3e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_197.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_197.cpp
deleted file mode 100644
index e86698fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_322.cpp
deleted file mode 100644
index bc7e687f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_323.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_323.cpp
deleted file mode 100644
index ea141156..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_359.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_359.cpp
deleted file mode 100644
index 294e3afb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_405.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_405.cpp
deleted file mode 100644
index eda9b0dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_409.cpp
deleted file mode 100644
index b3b51488..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_411.cpp
deleted file mode 100644
index 647570f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_478.cpp
deleted file mode 100644
index 857d48f7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_481.cpp
deleted file mode 100644
index 2a4e6b8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_503.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_503.cpp
deleted file mode 100644
index 3c5951a8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_512.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_512.cpp
deleted file mode 100644
index 3b4de434..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_525.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_525.cpp
deleted file mode 100644
index d0773475..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_552.cpp
deleted file mode 100644
index 5a0704de..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_568.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_568.cpp
deleted file mode 100644
index 7b93e223..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_575.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_575.cpp
deleted file mode 100644
index 3ef21f1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_596.cpp
deleted file mode 100644
index 88f77e34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_646.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_646.cpp
deleted file mode 100644
index f89b6416..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_663.cpp
deleted file mode 100644
index 2a473bc7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_666.cpp
deleted file mode 100644
index 00adec83..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_682.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_682.h
deleted file mode 100644
index 8f1fc31f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_687.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_687.cpp
deleted file mode 100644
index 0f9e8155..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_752.cpp
deleted file mode 100644
index b0b77452..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_753.cpp
deleted file mode 100644
index 07cc31fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_793.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_793.cpp
deleted file mode 100644
index 6777bfa5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_825.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_825.cpp
deleted file mode 100644
index d3f89db7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_889.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_889.cpp
deleted file mode 100644
index 270f0695..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_928.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_928.cpp
deleted file mode 100644
index d2878656..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_938.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_938.h
deleted file mode 100644
index b13997a6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_999.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_999.cpp
deleted file mode 100644
index 2a5d64a4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/bug_i_width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_width.cpp
deleted file mode 100644
index 08f7888e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/byref-2.cpp
deleted file mode 100644
index 0ef61cde..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/byref-2.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int   &    aa(int   &   x,int  &   b);
-// sp_before_byref_func, sp_after_byref_func, sp_before_byref, sp_after_byref, sp_before_byref, sp_after_byref
-int        aa(int    &   x,int    &)
-// sp_before_byref, sp_after_byref, sp_before_unnamed_byref
-{
-	b = aa(x,b);
-	c = aa(&    y,&d);     // sp_addr
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/byref-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/byref-3.cpp
deleted file mode 100644
index 28da2d74..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/byref.cpp
deleted file mode 100644
index 85669bc6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/call_brace_init_lst.cpp
deleted file mode 100644
index 11f92ee3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/case-brace-remove.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/case-brace-remove.cpp
deleted file mode 100644
index 421ff658..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cast.cpp
deleted file mode 100644
index d558e7f6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/casts.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/casts.cpp
deleted file mode 100644
index 0bcab0d9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/class-addr.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/class-addr.h
deleted file mode 100644
index ea539afa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/class-implementation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/class-implementation.cpp
deleted file mode 100644
index 05eb69cf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/class-init.cpp
deleted file mode 100644
index af06e31a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/class.h
deleted file mode 100644
index 0048604d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/cmt-cpp-cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt-cpp-cont.cpp
deleted file mode 100644
index 8885e36b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/cmt-reflow.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt-reflow.cpp
deleted file mode 100644
index adb5a6ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/cmt_backslash_eol.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_backslash_eol.cpp
deleted file mode 100644
index e56aec25..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp
deleted file mode 100644
index 32ff32d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_indent.cpp
deleted file mode 100644
index 542a0fd2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/cmt_indent_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_indent_pp.h
deleted file mode 100644
index 25253f09..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_insert.cpp
deleted file mode 100644
index a5ae87d5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/cmt_right.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_right.cpp
deleted file mode 100644
index 121ea044..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/cmt_trailing_single_line_c_to_cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_trailing_single_line_c_to_cpp.cpp
deleted file mode 100644
index 1f3cff49..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_trailing_single_line_c_to_cpp.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-int main(int argc, char **argv){
-
-	// C-style comments on same line with actual code
-	// ----------------------------------------------
-
-	int a = 5; /* Trailing, single-line C-style comment */
-
-	int b = /* Single-line C-style comment in the middle */ 5;
-
-	/* Single-line C-style comment at beginning of line */ int c =  5;
-
-	int d = 5; /* Trailing
-	              Multi-line
-	              C-style
-	              comment */
-
-# define A_MACRO \
-	do { \
-		if (true) { \
-			int e = 5; /* Trailing single-line C-style comment inside macro*/ \
-		} \
-	} while (0)
-
-
-	// C-style comments with no actual code on the same line
-	// -----------------------------------------------------
-
-	/* Single-line C-style comment. */
-
-	/* Multi-line
-	 * C-style
-	 * comment.
-	 * */
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/comma.cpp
deleted file mode 100644
index e101145a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/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.74.0/tests/input/cpp/comment-align-multiline.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/comment-align-multiline.cpp
deleted file mode 100644
index 73dab5ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/comment-align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/comment-align.cpp
deleted file mode 100644
index 403bf773..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/const_throw.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/const_throw.cpp
deleted file mode 100644
index f0d1773d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/constr_colon.cpp
deleted file mode 100644
index 6c0706e5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/constructor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/constructor.cpp
deleted file mode 100644
index 46abf36a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/conversion_operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/conversion_operator.cpp
deleted file mode 100644
index 27b52dac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/cout.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cout.cpp
deleted file mode 100644
index c3c9366d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/cpp17.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cpp17.cpp
deleted file mode 100644
index ba463284..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/cpp_move.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cpp_move.cpp
deleted file mode 100644
index cec9beb8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/ctor-var.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/ctor-var.cpp
deleted file mode 100644
index 2551d8bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/custom-open-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/custom-open-2.cpp
deleted file mode 100644
index 422cb1bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/custom-open.cpp
deleted file mode 100644
index 1544fd74..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/define-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/define-indentation.cpp
deleted file mode 100644
index 69e924ee..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/delete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/delete.cpp
deleted file mode 100644
index fff916e3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/deref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/deref.cpp
deleted file mode 100644
index abfb70c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/digraph.cpp
deleted file mode 100644
index 57cfddf5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/disable_macro.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/disable_macro.cpp
deleted file mode 100644
index cb9fc307..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/dont-detab-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/dont-detab-strings.cpp
deleted file mode 100644
index fd622c3c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/dont-process-defines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/dont-process-defines.cpp
deleted file mode 100644
index a0a58f85..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/eat_blanks_after_codewidth.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/eat_blanks_after_codewidth.cpp
deleted file mode 100644
index 8753aee2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/eigen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/eigen.cpp
deleted file mode 100644
index 4e228311..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/enum.cpp
deleted file mode 100644
index 7f87591e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/enum_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/enum_class.h
deleted file mode 100644
index 2ba9933f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/enum_comma.h
deleted file mode 100644
index 42ce2c53..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/enum_comment_wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/enum_comment_wrap.cpp
deleted file mode 100644
index 736e6718..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/enum_shr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/enum_shr.cpp
deleted file mode 100644
index 8bde6273..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/exception.cpp
deleted file mode 100644
index 7f29676e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/extern_c.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/extern_c.h
deleted file mode 100644
index e4943e50..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/extern_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/extern_func.cpp
deleted file mode 100644
index 24e90a37..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/first_len_minimum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/first_len_minimum.cpp
deleted file mode 100644
index 0a729f01..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/fix_for_relational_operators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/fix_for_relational_operators.cpp
deleted file mode 100644
index 0014b110..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/for_auto.cpp
deleted file mode 100644
index c62548f8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/for_long.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/for_long.cpp
deleted file mode 100644
index 7685f614..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/for_loop_head.cpp
deleted file mode 100644
index cbfacf62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/foreach.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/foreach.cpp
deleted file mode 100644
index cfbe7963..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/friends.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/friends.cpp
deleted file mode 100644
index 1b073b45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func-param-wrap-oc.mm
deleted file mode 100644
index 16f98ce9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_call.cpp
deleted file mode 100644
index 6467560f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/func_call_chain.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_call_chain.cpp
deleted file mode 100644
index 7e2f3931..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/func_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_class.cpp
deleted file mode 100644
index 64a11509..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/func_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_class.h
deleted file mode 100644
index 168b0b3d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/func_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_param.cpp
deleted file mode 100644
index 24b187c1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/func_param_indent_leading_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_param_indent_leading_comma.cpp
deleted file mode 100644
index 8c62d49b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/function-def.cpp
deleted file mode 100644
index 7f5e05c4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/functype_param.cpp
deleted file mode 100644
index 5d2ff4fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/gcc_case_ellipsis.cpp
deleted file mode 100644
index 1b0b4088..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/gh555.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/gh555.cpp
deleted file mode 100644
index feb059d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/goto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/goto.cpp
deleted file mode 100644
index 0f50d182..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/i1082.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1082.cpp
deleted file mode 100644
index 06680c0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/i1165.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1165.cpp
deleted file mode 100644
index c3123b59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/i1181.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1181.cpp
deleted file mode 100644
index 1a959d34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/i1207.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1207.cpp
deleted file mode 100644
index 0c8e1c92..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/i1218.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1218.cpp
deleted file mode 100644
index d4d05106..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/i1464.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1464.cpp
deleted file mode 100644
index e4005841..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/i1466.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1466.cpp
deleted file mode 100644
index 912488b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/i1509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1509.cpp
deleted file mode 100644
index d3e79ff6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/i1509_bug_1112_correction.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1509_bug_1112_correction.cpp
deleted file mode 100644
index 1470d613..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/i1516.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1516.cpp
deleted file mode 100644
index e1fe3f77..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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();
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1536.cpp
deleted file mode 100644
index 2c33ec58..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/i1565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1565.cpp
deleted file mode 100644
index 5cb66589..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/i1617.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1617.cpp
deleted file mode 100644
index 1901e3db..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/i1768.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1768.cpp
deleted file mode 100644
index 7fa82285..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/i2033.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i2033.cpp
deleted file mode 100644
index fd27cf6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/i2116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i2116.cpp
deleted file mode 100644
index 8011f572..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i2116.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-void f()
-{}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i683.cpp
deleted file mode 100644
index 4d95c7ce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/if-constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/if-constexpr.cpp
deleted file mode 100644
index 76f37f92..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/if_chain_braces.cpp
deleted file mode 100644
index b544f2bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/if_constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/if_constexpr.cpp
deleted file mode 100644
index 032f74ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/ifcomment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/ifcomment.cpp
deleted file mode 100644
index 52f508f6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent-c.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent-c.cpp
deleted file mode 100644
index 56633d0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent-inside-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent-inside-ternary-operator.cpp
deleted file mode 100644
index 6cd779a3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent-misc.cpp
deleted file mode 100644
index 78a924f4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent-off.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent-off.cpp
deleted file mode 100644
index 79a7ad65..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent.cpp
deleted file mode 100644
index a8c4a514..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_braces_no.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_braces_no.h
deleted file mode 100644
index c5b39b37..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_comma_brace_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_comma_brace_func.cpp
deleted file mode 100644
index d417b5be..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_comma_brace_glob.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_comma_brace_glob.cpp
deleted file mode 100644
index 8e01afc6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_comment_align_thresh.cpp
deleted file mode 100644
index 7ddfacbf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_ctor_init.cpp
deleted file mode 100644
index d9fefe24..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_ctor_members_twice.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_ctor_members_twice.cpp
deleted file mode 100644
index 4fbd1b4c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_namespace.h
deleted file mode 100644
index f97bd324..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_namespace2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_namespace2.h
deleted file mode 100644
index db2ce47d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_namespace_single_indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_namespace_single_indent.h
deleted file mode 100644
index 97d57444..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_off_after_return.cpp
deleted file mode 100644
index 58e24797..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_param.cpp
deleted file mode 100644
index c194141b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_paren_after_func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_paren_after_func_call.cpp
deleted file mode 100644
index 96b38fba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_paren_after_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_paren_after_func_decl.cpp
deleted file mode 100644
index ff8c3e44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_paren_after_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_paren_after_func_def.cpp
deleted file mode 100644
index 703e0422..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_shift.cpp
deleted file mode 100644
index 54684fa7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_switch_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_switch_pp.cpp
deleted file mode 100644
index 1b76e218..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_var_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_var_def.cpp
deleted file mode 100644
index 394cfb63..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_var_def_cont.cpp
deleted file mode 100644
index d273ae52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/init-list-call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/init-list-call.cpp
deleted file mode 100644
index 70451ac4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/init_align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/init_align.h
deleted file mode 100644
index ff1dcc9b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/initlist_leading_commas.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/initlist_leading_commas.cpp
deleted file mode 100644
index 83188d77..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/interface-keyword-in-cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/interface-keyword-in-cpp.cpp
deleted file mode 100644
index bc039e18..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_1752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1752.cpp
deleted file mode 100644
index e3be4d50..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_1778.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1778.cpp
deleted file mode 100644
index 4eea46e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_1782.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1782.cpp
deleted file mode 100644
index c12b83d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_1804.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1804.cpp
deleted file mode 100644
index 2923a4a2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1916.cpp
deleted file mode 100644
index 4c819605..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_1919.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1919.cpp
deleted file mode 100644
index 187065d6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_1946.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1946.cpp
deleted file mode 100644
index 9682da68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_1985.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1985.cpp
deleted file mode 100644
index 4e5685a1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_2000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2000.cpp
deleted file mode 100644
index aa324f2e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_2001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2001.cpp
deleted file mode 100644
index 39b9446d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_2124-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2124-1.cpp
deleted file mode 100644
index 8c582cf9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_2124-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2124-2.cpp
deleted file mode 100644
index 8c582cf9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_2209-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2209-1.cpp
deleted file mode 100644
index a1ebb1a7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_2209-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2209-2.cpp
deleted file mode 100644
index 5725d3d7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2623.cpp
deleted file mode 100644
index 5834e4b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_3116-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3116-2.cpp
deleted file mode 100644
index 6e007772..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3116.cpp
deleted file mode 100644
index 96167df1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_3330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3330.cpp
deleted file mode 100644
index 37062480..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3330.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-class Spaceship
-{
-public:
-	Spaceship():shields(100)
-	{
-	}
-
-	int shields;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3368.cpp
deleted file mode 100644
index 2158086c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3368.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-class Spaceship
-{
-public:
-	template<class T>
-	Spaceship<T>():shields(100)
-	{
-	}
-
-	int shields;
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3378.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3378.cpp
deleted file mode 100644
index 319c3151..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3378.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-class Foo
-{
-    public:
-	int bar()
-	{
-one:
- two:
-  three:
-   four:
-    five:
-     six:
-      seven:
-       eight:
-        nine:
-         ten:
-          eleven:
-           twelve:
-            thirteen:
-             fourteen:
-              fifteen:
-               sixteen:
-                seventeen:
-                 eighteen:
-                  nineteen:
-                   twenty:
-		return 0;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_523.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_523.cpp
deleted file mode 100644
index d203e398..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_547_for_each.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_547_for_each.cpp
deleted file mode 100644
index cfbe7963..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_564.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_564.cpp
deleted file mode 100644
index 0c289a8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_574-i.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_574-i.cpp
deleted file mode 100644
index c7730a54..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_574-i.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-class A

-{

-void check( int  strList       =        13);

-};

-int A      =            5;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_574.cpp
deleted file mode 100644
index 96e910ca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_624_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_624_angle.cpp
deleted file mode 100644
index 255db223..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_633_typename.cpp
deleted file mode 100644
index e99742ef..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/issue_672.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_672.cpp
deleted file mode 100644
index 6d8dde90..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/kw_subst.cpp
deleted file mode 100644
index e57868e2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/kw_subst2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/kw_subst2.cpp
deleted file mode 100644
index d167cc1c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lambda.cpp
deleted file mode 100644
index 5262d00f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/lambda2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lambda2.cpp
deleted file mode 100644
index d641c281..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/lambda_brace_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lambda_brace_list.cpp
deleted file mode 100644
index da3db41f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/lambda_in_one_liner.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lambda_in_one_liner.cpp
deleted file mode 100644
index c740c4bd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/lambda_selfcalling.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lambda_selfcalling.cpp
deleted file mode 100644
index 543290fa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/lineEndings-Mac.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lineEndings-Mac.cpp
deleted file mode 100644
index 608952c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/lineEndings-Unix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lineEndings-Unix.cpp
deleted file mode 100644
index cdbf7653..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/lineEndings-Win.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lineEndings-Win.cpp
deleted file mode 100644
index 20fa083a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/long_br_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/long_br_cmt.cpp
deleted file mode 100644
index a7638876..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/long_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/long_namespace.cpp
deleted file mode 100644
index 89fe4435..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/macro_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/macro_spaces.cpp
deleted file mode 100644
index c27c6b5d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc.cpp
deleted file mode 100644
index 8a73b431..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc2.cpp
deleted file mode 100644
index f1be4478..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/misc3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc3.cpp
deleted file mode 100644
index c7c10d6c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/misc4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc4.cpp
deleted file mode 100644
index 725fa160..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/misc5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc5.cpp
deleted file mode 100644
index 570a4a76..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/misc6.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc6.cpp
deleted file mode 100644
index 95cc0383..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/mod_remove_empty_return-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/mod_remove_empty_return-2.cpp
deleted file mode 100644
index eb949c45..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/mod_remove_empty_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/mod_remove_empty_return.cpp
deleted file mode 100644
index ca3105da..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/ms-style-ref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/ms-style-ref.cpp
deleted file mode 100644
index 213393b9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/multi_line.cpp
deleted file mode 100644
index df5f3a84..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/namespace_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/namespace_namespace.cpp
deleted file mode 100644
index cf6f921e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/new_op.cpp
deleted file mode 100644
index 828215e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl-class.h
deleted file mode 100644
index 128974b7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl-namespace.h
deleted file mode 100644
index a436fcb7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_assign_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_assign_leave_one_liners.cpp
deleted file mode 100644
index cf3325f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_before_after.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_after.h
deleted file mode 100644
index fb77edf1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_brace_open_test.cpp
deleted file mode 100644
index 6e3daf66..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_brace_open_test.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-int foo1() { int i; if (true) { i=2; }}
-
-namespace { int foo1() { int i; if (true) { i=2; }}}
-
-class bar {
-  int foo1() { int i; i = 1; if (true) { i=2; }}
-  int foo2() { int i; i = 1; if (true) { i=2; }}
-}
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-static const kjs_double_t NaN_Bytes = {{0x7f, 0xf8, 0, 0, 0, 0, 0, 0}};
-
-#ifdef __cplusplus
-}
-#endif
-
-static struct LanguageForEncoding {
-	const char *index; int data;
-} const language_for_encoding[] = { {"iso 8859-1", 13}, {"iso 8859-15", 13} }
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_func_body_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_func_body_def.cpp
deleted file mode 100644
index c7cab4c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_before_struct_scoped_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_struct_scoped_enum.cpp
deleted file mode 100644
index f4065b20..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_struct_scoped_enum.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-int main();
-
-enum struct Baz
-{
-     Abc = 4
-   , Def = 1
-};
-
-Baz decide( Baz, Baz ) noexcept;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_struct_struct.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_struct_struct.cpp
deleted file mode 100644
index edac027c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_struct_struct.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <string>
-
-struct Foo
-{
-   std::string name;
-   int value;
-};
-
-struct Bar
-{
-   Foo* parent;
-   int modifier;
-};
-
-void baz( Foo*, Bar* );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_brace_brace.cpp
deleted file mode 100644
index b698546a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp
deleted file mode 100644
index 6250d752..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp
deleted file mode 100644
index 6250d752..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp
deleted file mode 100644
index 6250d752..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp
deleted file mode 100644
index 6250d752..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_for_leave_one_liners.cpp
deleted file mode 100644
index 382d2815..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func.cpp
deleted file mode 100644
index e27d7e55..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_func_call_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_call_empty.cpp
deleted file mode 100644
index 6678ee18..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_call_paren.cpp
deleted file mode 100644
index 309a65a9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_func_call_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_call_paren_empty.cpp
deleted file mode 100644
index 6678ee18..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_decl.cpp
deleted file mode 100644
index 91a7184f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_func_def_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_def_paren_empty.cpp
deleted file mode 100644
index f1ba8607..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_func_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_paren_empty.cpp
deleted file mode 100644
index 19965aac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_scope_name.cpp
deleted file mode 100644
index d221e974..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_type_name.cpp
deleted file mode 100644
index 26e49663..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_inside_namespace.cpp
deleted file mode 100644
index 4bdcb394..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_max_blank_in_func.cpp
deleted file mode 100644
index c87e6e68..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/noexcept.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/noexcept.cpp
deleted file mode 100644
index e6ea9116..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/noexcept.cpp
+++ /dev/null
@@ -1 +0,0 @@
-foo()noexcept;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/not_lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/not_lambda.cpp
deleted file mode 100644
index a9c65439..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/op_sym_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/op_sym_empty.cpp
deleted file mode 100644
index 4b79ca9e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/operator.cpp
deleted file mode 100644
index 6f2a7f03..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/operator_proto.cpp
deleted file mode 100644
index b14935ee..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/out-668.cpp
deleted file mode 100644
index 0dac74c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/output.cpp
deleted file mode 100644
index 4563c43b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/override_virtual.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/override_virtual.cpp
deleted file mode 100644
index 537454b1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/parameter-packs.cpp
deleted file mode 100644
index 6d734b1f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/patch_32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/patch_32.cpp
deleted file mode 100644
index 8d9e222e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/patch_32.cpp
+++ /dev/null
@@ -1 +0,0 @@
-//! test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pos_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pos_assign.cpp
deleted file mode 100644
index af55296b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pos_assign.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-static const unsigned char radiooff_light_bits[] =
-{
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x08, 0x00, 0x10, 0x00, 0x10,
-	0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x08, 0x00, 0x08, 0x0c, 0x06,
-	0xf0, 0x01
-};
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pos_bool_in_template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pos_bool_in_template.h
deleted file mode 100644
index ef01470e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pos_shift.cpp
deleted file mode 100644
index 4d55a541..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp-define-indent.cpp
deleted file mode 100644
index 8ec5657f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/pp-pragma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp-pragma.cpp
deleted file mode 100644
index 75b3c46d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/pp_indent_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp_indent_brace.cpp
deleted file mode 100644
index 86ed0a8f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/pp_indent_case.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp_indent_case.cpp
deleted file mode 100644
index da61641a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/pp_indent_extern.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp_indent_extern.cpp
deleted file mode 100644
index 76cfc4bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/pp_indent_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp_indent_func_def.cpp
deleted file mode 100644
index 7a0bcecf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp_multi_comment.cpp
deleted file mode 100644
index 98418c46..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/proto-wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/proto-wrap.cpp
deleted file mode 100644
index 35e8bea3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/ptr-star.cpp
deleted file mode 100644
index ff0ab369..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/qt-1.cpp
deleted file mode 100644
index e318c1aa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/qtargs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/qtargs.cpp
deleted file mode 100644
index 5037d792..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/region.cpp
deleted file mode 100644
index 28447084..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/return_braced_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/return_braced_init.cpp
deleted file mode 100644
index cf86baeb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/return_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/return_init_list.cpp
deleted file mode 100644
index f58dfee5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/returns.cpp
deleted file mode 100644
index 1085bd72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/returns.cpp
+++ /dev/null
@@ -1,34 +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 foo6(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}
-#define case6(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};
-	case 6:
-		return/**/6;
-	default:
-		return;
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sef.cpp
deleted file mode 100644
index add2fc4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/semi.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/semi.cpp
deleted file mode 100644
index 9f7832cd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/semi.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-for ( i = 1         ; i < 10                      ; i++)
-{
-        a = i   ;
-}
-for (          ;                       ;    )
-{
-        a = i  ;   b = j; 
-        a = i  ;          /* comment */
-        a = i    ;          // comment
-}
-if (p == b)                     ;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/semicolon-removal-after-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/semicolon-removal-after-ternary-operator.cpp
deleted file mode 100644
index a344480b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/semicolons.cpp
deleted file mode 100644
index 52796f75..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf.2886991.cpp
deleted file mode 100644
index 97dfe0cf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sf.3266678.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf.3266678.cpp
deleted file mode 100644
index 69f877ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sf.3315874.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf.3315874.h
deleted file mode 100644
index 58921bc5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sf557.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf557.cpp
deleted file mode 100644
index c7ba93cc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sf562.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf562.cpp
deleted file mode 100644
index 15ee8e79..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sf567.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf567.cpp
deleted file mode 100644
index 0c1d5fc9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sf574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf574.cpp
deleted file mode 100644
index 3f5a98d4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sf583.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf583.cpp
deleted file mode 100644
index 8eba4d1e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sf593.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf593.cpp
deleted file mode 100644
index 1fc0ded8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sim.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sim.h
deleted file mode 100644
index 29c52879..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_after_angle.cpp
deleted file mode 100644
index 18788919..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_after_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_after_constr_colon.cpp
deleted file mode 100644
index caea467a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_after_decltype.cpp
deleted file mode 100644
index 18448555..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_after_type.cpp
deleted file mode 100644
index 6f235d22..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_angle_paren.cpp
deleted file mode 100644
index 911aa53b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_arith_additive.cpp
deleted file mode 100644
index ab2096c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_balance_nested_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_balance_nested_parens.cpp
deleted file mode 100644
index dc5f5e8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_before_byref_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_before_byref_func.cpp
deleted file mode 100644
index 7dd9c14a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_before_case_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_before_case_colon.cpp
deleted file mode 100644
index 0c534fe0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_before_case_colon.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-int foo(abc_t d)
-{
-  switch (d) 
-  {
-    case A:
-      return 0;
-    case B:
-      return 1;
-    case C:
-      return 2;
-  }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_before_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_before_constr_colon.cpp
deleted file mode 100644
index 796522c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/input/cpp/sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_brace_brace.cpp
deleted file mode 100644
index bb730d61..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_brace_catch.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_brace_catch.cpp
deleted file mode 100644
index 7b4bdc5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cmt_cpp_region.cpp
deleted file mode 100644
index b70ef6b1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_cmt_cpp_start.cc b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cmt_cpp_start.cc
deleted file mode 100644
index 6a9b203b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cond_question.cpp
deleted file mode 100644
index cec6c827..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cond_question.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//example file
-int b;
-int t;
-int f;
-int a = b           ?           t           :           f;
-int a = b           ?                      :           f;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cparen_oparen.cpp
deleted file mode 100644
index 83c60dd4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp
deleted file mode 100644
index e25d0496..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_decltype.cpp
deleted file mode 100644
index 3e2f7e47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_endif_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_endif_cmt.cpp
deleted file mode 100644
index 9e5b2db8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_endif_cmt.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.74.0/tests/input/cpp/sp_enum_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_enum_assign.cpp
deleted file mode 100644
index 2ebab438..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_enum_assign.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-typedef enum
-{
-        A                       =                 0,
-        B = 1 << 0,
-        C = 1 << 1
-};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_enum_colon.cpp
deleted file mode 100644
index a23c6afd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_func_call_paren.cpp
deleted file mode 100644
index 90798ef9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_inside_braces_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_inside_braces_enum.cpp
deleted file mode 100644
index 8386e215..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_inside_braces_enum.cpp
+++ /dev/null
@@ -1 +0,0 @@
-enum {    IDD = IDD_ATCS_MGR_DLG   };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_paren_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_paren_brace.cpp
deleted file mode 100644
index 4ac73f87..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_paren_brace.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-void *stopper_for_apply = (int[])               {0};
-//                               ^ here
-
-template<typename T, typename U>
-auto add(T t, U u) -> decltype(t + u)                {
-//                                   ^ here
-	return t + u;
-}
-
-void f()noexcept()               {
-//                ^ here
-}
-
-#define FOO5(x) for(;;) (!(x))                { *(volatile int*)0 = 1; }
-//                            ^ here
-
-(struct foo)      {...}
-//          ^ here
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp
deleted file mode 100644
index fff4aff4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_throw_paren.cpp
deleted file mode 100644
index f45f1a9a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_type_func.cpp
deleted file mode 100644
index 30e058e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/squeeze_ifdef.cpp
deleted file mode 100644
index 42699d1d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/static.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/static.h
deleted file mode 100644
index 8121fef1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/stdcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/stdcall.cpp
deleted file mode 100644
index a2353599..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/string_replace_tab_chars.cpp
deleted file mode 100644
index 3534461b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/strings.cpp
deleted file mode 100644
index 1cfea449..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/tab-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/tab-0.cpp
deleted file mode 100644
index 474aba08..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/tab-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/tab-1.cpp
deleted file mode 100644
index dc7a65c4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/templ_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/templ_class.h
deleted file mode 100644
index 0f102244..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/templates.cpp
deleted file mode 100644
index 737599bf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/templates.cpp
+++ /dev/null
@@ -1,186 +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;
-int 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.74.0/tests/input/cpp/templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/templates2.cpp
deleted file mode 100644
index 46d41560..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/templates3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/templates3.cpp
deleted file mode 100644
index 55b11d26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/templates4.cpp
deleted file mode 100644
index 10b96e4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/toggle_processing_cmt.cpp
deleted file mode 100644
index 6f49594d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/toggle_processing_cmt2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/toggle_processing_cmt2.cpp
deleted file mode 100644
index 6b4a0a39..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/trailing_return.cpp
deleted file mode 100644
index de061955..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/try-catch-nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/try-catch-nl.cpp
deleted file mode 100644
index 447f3cbd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/type_brace_init_lst.cpp
deleted file mode 100644
index 53e74de2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/uniform_initialization.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/uniform_initialization.cpp
deleted file mode 100644
index 37a131e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/using-alias-in-define.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/using-alias-in-define.cpp
deleted file mode 100644
index 82854287..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/var_def_gap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/var_def_gap.cpp
deleted file mode 100644
index 0cca962b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/variadic-template.h
deleted file mode 100644
index f522097c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cpp/wacky-template.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/wacky-template.cpp
deleted file mode 100644
index 99e01b6e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/1822.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/1822.cs
deleted file mode 100644
index a4269bd9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/615_nested-usings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/615_nested-usings.cs
deleted file mode 100644
index 14a31507..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/620_getset-brace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/620_getset-brace.cs
deleted file mode 100644
index f6ee6342..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/621_this-spacing.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/621_this-spacing.cs
deleted file mode 100644
index bd28a5e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/625_where-constraints.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/625_where-constraints.cs
deleted file mode 100644
index 09274ab9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/input/cs/Issue_2705.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/Issue_2705.cs
deleted file mode 100644
index 9a1b3172..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-11095.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-11095.mm
deleted file mode 100755
index 34ed4050..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-11662.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-11662.cs
deleted file mode 100755
index 9a49fdba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-11993.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-11993.cs
deleted file mode 100644
index 6bc6529a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-12303.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-12303.cs
deleted file mode 100755
index 01be8291..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-1288.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1288.cs
deleted file mode 100644
index 70554a02..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-1333.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1333.mm
deleted file mode 100644
index 5c91693c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-1338.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1338.cs
deleted file mode 100644
index d10b4893..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-1343.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1343.cs
deleted file mode 100644
index 852fe640..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-1345.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1345.cs
deleted file mode 100644
index e218e6a2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-13955.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-13955.cs
deleted file mode 100755
index 940aa89b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-14131.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-14131.cs
deleted file mode 100755
index c8c3c918..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-17253.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-17253.cs
deleted file mode 100644
index 7342d82c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-18437.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-18437.cs
deleted file mode 100644
index aab6c498..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-18777.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-18777.cs
deleted file mode 100644
index 198d5be3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-18780.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-18780.cs
deleted file mode 100755
index 0eea713e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-18829.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-18829.cs
deleted file mode 100755
index 62c9f8fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-1919.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1919.cs
deleted file mode 100644
index 956fd0f8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-19644.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-19644.cs
deleted file mode 100644
index da76bfbc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-1975.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1975.cs
deleted file mode 100644
index af678a93..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-1977.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1977.cs
deleted file mode 100644
index e4b1b375..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-1978.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1978.cs
deleted file mode 100644
index 14cbdc7d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-19895.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-19895.cs
deleted file mode 100644
index a22c6fa8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-2007.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2007.cs
deleted file mode 100644
index 2e9f163a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-2008.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2008.cs
deleted file mode 100644
index eeb649dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-2020.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2020.cs
deleted file mode 100644
index 37d9ef23..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-2021.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2021.cs
deleted file mode 100644
index 2b08fafe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-21730.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-21730.cs
deleted file mode 100644
index 6fcb8c16..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-2505.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2505.cs
deleted file mode 100644
index a17e6a5e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-2506.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2506.cs
deleted file mode 100644
index 7bdbb81a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-2684.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2684.cs
deleted file mode 100644
index 0c91b081..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-2685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2685.cs
deleted file mode 100644
index 4c11f20b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-29933.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-29933.cs
deleted file mode 100644
index ed96bc87..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-30498_2.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-30498_2.cs
deleted file mode 100644
index ba0d8515..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-3083.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-3083.cs
deleted file mode 100644
index 5209dc72..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-32658.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-32658.cs
deleted file mode 100644
index 145da65f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-3484.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-3484.cs
deleted file mode 100644
index 1235aa91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-36862.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-36862.cs
deleted file mode 100644
index cb3cb448..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-37241.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-37241.cs
deleted file mode 100644
index b2097c4f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-40685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-40685.cs
deleted file mode 100644
index a2f37547..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-58354.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-58354.cs
deleted file mode 100644
index 6c77de40..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/UNI-9917.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-9917.cs
deleted file mode 100755
index 5bd9dc64..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/add-nl-before-namespace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/add-nl-before-namespace.cs
deleted file mode 100644
index 93a2cf04..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/argtypes.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/argtypes.mm
deleted file mode 100644
index fd2ff142..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/asm.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/asm.h.mm
deleted file mode 100644
index 97c0edd3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/bug_1591.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_1591.cs
deleted file mode 100644
index ac62df9e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/bug_1620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_1620.cs
deleted file mode 100644
index 0c9d4eb9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/bug_1637.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_1637.cs
deleted file mode 100644
index 1f46d1bc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/bug_1650.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_1650.cs
deleted file mode 100644
index 5c52aece..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/bug_600.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_600.cs
deleted file mode 100644
index 3d93d861..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/bug_620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_620.cs
deleted file mode 100644
index f6ee6342..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/bug_i_679.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_i_679.cs
deleted file mode 100644
index 199ad7e6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/bug_i_935.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_i_935.cs
deleted file mode 100644
index d2c8ec95..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/casting.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/casting.mm
deleted file mode 100644
index c8022c7b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/cmt_backslash_eol.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/cmt_backslash_eol.cs
deleted file mode 100644
index e56aec25..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/comma.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/comma.cs
deleted file mode 100644
index 794410f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/comma.cs
+++ /dev/null
@@ -1 +0,0 @@
-int[    ,   ,        ] x;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/definesalign.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/definesalign.h.mm
deleted file mode 100644
index a249d1aa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/delegate.cs
deleted file mode 100644
index 3a4b103c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/delete-space-oc.mm
deleted file mode 100644
index 66e24dc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/exception-filters.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/exception-filters.cs
deleted file mode 100644
index 1e3abca3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/fncall_as_ctor_in_attr.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/fncall_as_ctor_in_attr.cs
deleted file mode 100644
index cf52b46f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/func-param-wrap-oc.mm
deleted file mode 100644
index 16f98ce9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/generics.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/generics.cs
deleted file mode 100644
index 7bbe04c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/getset.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/getset.cs
deleted file mode 100644
index 59aaa5bc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/gs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/gs.cs
deleted file mode 100644
index 16adc604..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/ifcolalign.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/ifcolalign.cs
deleted file mode 100644
index d2e40c78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/ifcomment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/ifcomment.cs
deleted file mode 100644
index 6663a6ca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/indent-multistring-coulmn1.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/indent-multistring-coulmn1.cs
deleted file mode 100644
index 56bdf473..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/inttypes.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/inttypes.h.mm
deleted file mode 100644
index 6e093789..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/logger.cs
deleted file mode 100644
index defede8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/mdarray_space.cs
deleted file mode 100644
index e5338c11..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/misc-failures.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/misc-failures.cs
deleted file mode 100644
index 857c06f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/input/cs/mod_full_paren_if_bool.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/mod_full_paren_if_bool.cs
deleted file mode 100644
index 6bcd9201..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/new-constraint-paren-space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/new-constraint-paren-space.cs
deleted file mode 100644
index 209f2721..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/newlines.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/newlines.mm
deleted file mode 100644
index 31a46376..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/nullable_prop.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/nullable_prop.cs
deleted file mode 100644
index 21c4f7b0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/objc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/objc.mm
deleted file mode 100644
index 7f0e706a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/oneline_property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/oneline_property.cs
deleted file mode 100644
index 1d7a2c26..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/operator-null-conditional.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/operator-null-conditional.cs
deleted file mode 100644
index 530bdd27..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/operator_null-coalescing-assignment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/operator_null-coalescing-assignment.cs
deleted file mode 100644
index 416e6afc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/pp-ignore.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/pp-ignore.mm
deleted file mode 100644
index 2673008c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/preserveTabs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/preserveTabs.cs
deleted file mode 100644
index c9583dcd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/property.cs
deleted file mode 100644
index 85e08bae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/region.cs
deleted file mode 100644
index 4f8667f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/remove_semi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/remove_semi.cs
deleted file mode 100644
index 2e6d5a98..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/sf607.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sf607.cs
deleted file mode 100644
index f0617c19..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sf607.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-int P {

-	get {

-	}

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sf628.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sf628.cs
deleted file mode 100644
index 803c9962..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/simple.cs
deleted file mode 100644
index 30acd134..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/sort_using.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sort_using.cs
deleted file mode 100644
index 881b4d5b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/sort_using_categ.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sort_using_categ.cs
deleted file mode 100644
index 173e42bb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/sp_between_new_paren.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sp_between_new_paren.cs
deleted file mode 100644
index f5d8381d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/squeeze-paren-close-Option.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/squeeze-paren-close-Option.cs
deleted file mode 100644
index 37203f4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/string_multi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/string_multi.cs
deleted file mode 100644
index 9e715e51..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/strings.cs
deleted file mode 100644
index 6794e762..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/tcf.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/tcf.cs
deleted file mode 100644
index f3ac3664..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/unsafe.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/unsafe.cs
deleted file mode 100644
index 5dc90cb4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/utf16be.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16be.cs
deleted file mode 100644
index 13da3090..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16be.cs
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16be_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16be_no_bom.cs
deleted file mode 100644
index 33587b97..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16be_no_bom.cs
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16le.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16le.cs
deleted file mode 100644
index 3f16b9d0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16le.cs
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16le_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16le_no_bom.cs
deleted file mode 100644
index 4a7f9ccc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16le_no_bom.cs
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/var-member.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/var-member.cs
deleted file mode 100644
index 0f7ffb23..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/verbatim_strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/verbatim_strings.cs
deleted file mode 100644
index 47c3ed4c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/cs/when.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/when.cs
deleted file mode 100644
index 2785b894..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/1438.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/1438.d
deleted file mode 100644
index 10a43753..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/HashMap.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/HashMap.d
deleted file mode 100644
index 618b3e59..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/Lexer.d
deleted file mode 100644
index 004d9d8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/bug-indent.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/bug-indent.d
deleted file mode 100644
index 321ab6f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/casts.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/casts.d
deleted file mode 100644
index 42d54916..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/const.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/const.d
deleted file mode 100644
index 778957fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/d_sp_paren.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/d_sp_paren.d
deleted file mode 100644
index 2b28a7f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/delegate.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/delegate.d
deleted file mode 100644
index 0115ae00..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/enum.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/enum.d
deleted file mode 100644
index 804ef27c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/extern_.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/extern_.d
deleted file mode 100644
index a583b08e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/funcfunc.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/funcfunc.d
deleted file mode 100644
index ee717abc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/imports.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/imports.d
deleted file mode 100644
index 758fefb7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/invariant.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/invariant.d
deleted file mode 100644
index 46a8efdc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/invariant.d
+++ /dev/null
@@ -1 +0,0 @@
-invariant (C) c;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/numbers.d
deleted file mode 100644
index e51bf8ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/sort_import.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/sort_import.d
deleted file mode 100644
index d929f8e8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/square_indent_tab.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/square_indent_tab.d
deleted file mode 100644
index 1dee3a17..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/static_if.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/static_if.d
deleted file mode 100644
index 24e6eaba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/static_if_in_struct.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/static_if_in_struct.d
deleted file mode 100644
index be936335..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/strings.d
deleted file mode 100644
index a62adec3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/template.d
deleted file mode 100644
index fe5a162c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/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.74.0/tests/input/d/template_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/template_spacing000.d
deleted file mode 100644
index 627ca266..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/template_spacing001.d
deleted file mode 100644
index 745e5b36..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/template_use.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/template_use.d
deleted file mode 100644
index 94cdbf6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/tst01.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/tst01.d
deleted file mode 100644
index 3a3728f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/tst02.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/tst02.d
deleted file mode 100644
index 0b428d60..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/tst03.d
deleted file mode 100644
index 611f12f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/type_spacing000.d
deleted file mode 100644
index e11e545b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/vbraces000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/vbraces000.d
deleted file mode 100644
index d2f1b642..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/vbraces001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/vbraces001.d
deleted file mode 100644
index a59ab020..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/vbraces002.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/vbraces002.d
deleted file mode 100644
index 5e45e999..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/volatile-1.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/volatile-1.d
deleted file mode 100644
index c9f41d3f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/volatile-2.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/volatile-2.d
deleted file mode 100644
index bc5a0de4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/volatile-3.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/volatile-3.d
deleted file mode 100644
index 039f788a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/volatile.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/volatile.d
deleted file mode 100644
index c42d1893..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/d/wysiwyg_strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/wysiwyg_strings.d
deleted file mode 100644
index cfdec32a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/ecma/example-1.es b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/ecma/example-1.es
deleted file mode 100644
index 0bc9b775..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/Issue_1122.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/Issue_1122.java
deleted file mode 100644
index 5712f9ee..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/Issue_1124.java
deleted file mode 100644
index dcea4172..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/Issue_1845.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/Issue_1845.java
deleted file mode 100644
index cc7656ba..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/Issue_670.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/Issue_670.java
deleted file mode 100644
index 52d64f1e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/Java8DoubleColon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/Java8DoubleColon.java
deleted file mode 100644
index ec594909..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/annotation1.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/annotation1.java
deleted file mode 100644
index d7417542..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/annotation2.java
deleted file mode 100644
index 596c2562..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/annotation3.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/annotation3.java
deleted file mode 100644
index 3d84c04c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/assert.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/assert.java
deleted file mode 100644
index 8076663b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/cast.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/cast.java
deleted file mode 100644
index 8f2d983b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/double_brace.java
deleted file mode 100644
index 8ba15c47..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/doxy-javadoc-alignment.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/doxy-javadoc-alignment.java
deleted file mode 100644
index 838d765c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/foreach.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/foreach.java
deleted file mode 100644
index e475dc29..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/generics.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/generics.java
deleted file mode 100644
index 729013ce..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/generics_return_type.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/generics_return_type.java
deleted file mode 100644
index 818ac721..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/generics_wildcard.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/generics_wildcard.java
deleted file mode 100644
index 358e333b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/i1121.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/i1121.java
deleted file mode 100644
index 18567ec3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/issue_672.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/issue_672.java
deleted file mode 100644
index 2f632625..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/leading-tabs-for-java-lambda.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/leading-tabs-for-java-lambda.java
deleted file mode 100644
index 19b6df0f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/long_cl_cmt.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/long_cl_cmt.java
deleted file mode 100644
index 45e5252b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/nl_before_ignore_after_case.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/nl_before_ignore_after_case.java
deleted file mode 100644
index a84e8847..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/nl_before_ignore_after_case.java
+++ /dev/null
@@ -1,18 +0,0 @@
-void func(void)
-{
-    switch (cond)
-    {
-        case CASE_F:
-            synchronized(thingy)
-            {
-                do_a();
-                do_b();
-            }
-            break;
-    }
-    synchronized(thingy)
-    {
-        do_a();
-        do_b();
-    }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/sf567.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/sf567.java
deleted file mode 100644
index 68a63221..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/sp_after_angle.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/sp_after_angle.java
deleted file mode 100644
index 1e11c4c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/sp_after_for_colon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/sp_after_for_colon.java
deleted file mode 100644
index fecd1833..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/sp_before_byref.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/sp_before_byref.java
deleted file mode 100644
index 7927ee89..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/sp_this_paren.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/sp_this_paren.java
deleted file mode 100644
index 628b327f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/synchronized.java
deleted file mode 100644
index 369394b8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/try.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/try.java
deleted file mode 100644
index aea6a7f3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/java/variable_aligns.java b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/variable_aligns.java
deleted file mode 100644
index 76c6131c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/1927.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/1927.m
deleted file mode 100644
index 9f8d7a7b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/Declarations.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Declarations.h
deleted file mode 100644
index e1ad3c6b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Fraction.h
deleted file mode 100644
index 364b1de8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/Fraction.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Fraction.m
deleted file mode 100644
index 20994f34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/Issue_2172.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Issue_2172.m
deleted file mode 100644
index 02584e91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/Issue_2289.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Issue_2289.m
deleted file mode 100644
index c046cb1e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/Issue_681.oc b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Issue_681.oc
deleted file mode 100644
index fb4c6685..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/align-objc-like-xcode.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/align-objc-like-xcode.m
deleted file mode 100644
index 6852ac12..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/attribute_specifier_seqs.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/attribute_specifier_seqs.mm
deleted file mode 100644
index c9b6f24d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/available.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/available.m
deleted file mode 100644
index 8216d17f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/block_in_method.m
deleted file mode 100644
index e0dfcd76..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/block_literal_protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/block_literal_protocol.m
deleted file mode 100644
index 02d1cfca..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/block_pointer.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/block_pointer.m
deleted file mode 100644
index 9c7ac70b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/block_pointer.m
+++ /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.74.0/tests/input/oc/blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/blocks.m
deleted file mode 100644
index 617e0b78..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/blocks_align.m
deleted file mode 100644
index 2ddf75c6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/blocks_align2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/blocks_align2.m
deleted file mode 100644
index f4e875c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/box.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/box.m
deleted file mode 100644
index 98a3516a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/boxed_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/boxed_receiver.m
deleted file mode 100644
index 3460b920..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/bug_1366.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_1366.m
deleted file mode 100644
index 5e81ed4a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/bug_167.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_167.m
deleted file mode 100644
index e404e2aa..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/bug_1674.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_1674.m
deleted file mode 100644
index 82c20161..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/bug_1683.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_1683.m
deleted file mode 100644
index 3ee562c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/bug_340.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_340.m
deleted file mode 100644
index ea9f8201..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/bug_404.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_404.m
deleted file mode 100644
index 3ecb87f0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/bug_497.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_497.m
deleted file mode 100644
index a976d43d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/bug_841.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_841.m
deleted file mode 100644
index dea826d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/bug_i_125-412.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_i_125-412.m
deleted file mode 100644
index c92d2e66..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/bug_i_408.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_i_408.m
deleted file mode 100644
index c8a3a450..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/bug_i_477.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_i_477.m
deleted file mode 100644
index a1a81749..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/c-cpp-oc-wrapper.c b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/c-cpp-oc-wrapper.c
deleted file mode 100644
index 663a4cc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/cast.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/cast.m
deleted file mode 100644
index daa9cb6d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/chunk_ends_type1.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/chunk_ends_type1.m
deleted file mode 100644
index fb9bb4e1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/chunk_ends_type2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/chunk_ends_type2.m
deleted file mode 100644
index 27e31cdc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/chunk_ends_type3.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/chunk_ends_type3.m
deleted file mode 100644
index 8d8676c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/chunk_ends_type4.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/chunk_ends_type4.m
deleted file mode 100644
index dd4d55fe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/cmt_insert.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/cmt_insert.m
deleted file mode 100644
index 58a4c894..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/cmt_insert2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/cmt_insert2.m
deleted file mode 100644
index 4a31e975..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/code_placeholder.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/code_placeholder.m
deleted file mode 100644
index 6245bfa4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/complex_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/complex_method.m
deleted file mode 100644
index b22c34b6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/delete-space-oc.mm
deleted file mode 100644
index 66e24dc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/double-indent-objc-dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/double-indent-objc-dict.m
deleted file mode 100644
index f94e5105..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/double_angle_space.m
deleted file mode 100644
index f7164498..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/exceptions.m
deleted file mode 100644
index c8d6f6f2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/extern-c-attribute.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/extern-c-attribute.m
deleted file mode 100644
index fb84ce73..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/for.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/for.m
deleted file mode 100644
index fc159fc6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/for2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/for2.m
deleted file mode 100644
index 535bc50b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/func-param-wrap-oc.mm
deleted file mode 100644
index 16f98ce9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/func_def.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/func_def.mm
deleted file mode 100644
index b3655728..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/gh137.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/gh137.m
deleted file mode 100644
index 779e0f2f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/gh293.m
deleted file mode 100644
index bb4cb52c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/gh511.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/gh511.m
deleted file mode 100644
index cee32794..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/i1213.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/i1213.m
deleted file mode 100644
index f47e5964..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/indent-inside-ternary-operator.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/indent-inside-ternary-operator.m
deleted file mode 100644
index ff979acf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/indent-objc-block.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/indent-objc-block.m
deleted file mode 100644
index b882abf5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/indent_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/indent_boxed.m
deleted file mode 100644
index c7df968f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/indent_oc_inside_msg_sel.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/indent_oc_inside_msg_sel.m
deleted file mode 100644
index f20cd048..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/indent_single_newline.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/indent_single_newline.m
deleted file mode 100644
index 27e79e8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/issue_2629.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2629.m
deleted file mode 100644
index e690ea58..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/issue_2631.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2631.m
deleted file mode 100644
index 7989b020..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/issue_2675.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2675.m
deleted file mode 100644
index 1d4cafe2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/issue_2722.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2722.m
deleted file mode 100644
index 65dcb131..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/issue_2724.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2724.m
deleted file mode 100644
index 51c90671..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/issue_2727.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2727.m
deleted file mode 100644
index f15542f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/issue_3031.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_3031.mm
deleted file mode 100644
index 028d55d9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/kw.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/kw.m
deleted file mode 100644
index a4d25624..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/literals.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/literals.mm
deleted file mode 100644
index 98522f3d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/macro-close-brace.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/macro-close-brace.m
deleted file mode 100644
index 0eb3fa81..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/main.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/main.m
deleted file mode 100644
index f2fdf16a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/method_ends_semicolon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/method_ends_semicolon.m
deleted file mode 100644
index e3c5637e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/misc.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/misc.m
deleted file mode 100644
index 5038a14c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/more_blocks.m
deleted file mode 100644
index eab01db0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/more_blocks_2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/more_blocks_2.m
deleted file mode 100644
index 55636ae5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/msg.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/msg.m
deleted file mode 100644
index cca460f9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/msg_align.m
deleted file mode 100644
index 3b61a051..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/negative_value.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/negative_value.m
deleted file mode 100644
index 9aa4dc80..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/nelem.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/nelem.m
deleted file mode 100644
index d42ce3b6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.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.74.0/tests/input/oc/ns_enum-i.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/ns_enum-i.m
deleted file mode 100644
index e5caad06..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/ns_enum-i.m
+++ /dev/null
@@ -1,2 +0,0 @@
-typedef NS_ENUM                  (NSUInteger, MyEnum) {MyValue1, MyValue2, MyValue3};
-typedef NS_OPTIONS(NSUInteger, MyBitmask) {MyBit1, MyBit2, MyBit3};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/ns_enum.m
deleted file mode 100644
index cdd729d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/oc-split.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/oc-split.m
deleted file mode 100644
index 3b656bfc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/oc_cond_colon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/oc_cond_colon.m
deleted file mode 100644
index 50cf56b5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/oc_msg_in_pp.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/oc_msg_in_pp.m
deleted file mode 100644
index 8496973b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/pp_bool.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/pp_bool.m
deleted file mode 100644
index b1bf896c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/properties.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/properties.m
deleted file mode 100644
index 4de60057..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/protocol.m
deleted file mode 100644
index 31a8b86f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/react_native.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/react_native.m
deleted file mode 100644
index eadf314f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/real_world_file.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/real_world_file.m
deleted file mode 100644
index 26ec3cb2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/receiver.m
deleted file mode 100644
index 274d4130..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/return_type.m
deleted file mode 100644
index 62a5c246..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/selector.m
deleted file mode 100644
index a5a89475..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sort_import.m
deleted file mode 100644
index 1a227b7e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/sort_import_group.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sort_import_group.m
deleted file mode 100644
index 9e14f0fc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/sp_after_angle.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_after_angle.m
deleted file mode 100644
index 259d2011..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/sp_after_oc_msg_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_after_oc_msg_receiver.m
deleted file mode 100644
index aad36be5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_before_oc_proto_list.m
deleted file mode 100644
index c0d96bdb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/sp_cond_ternary_short.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_cond_ternary_short.m
deleted file mode 100644
index 6c1ce050..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_cond_ternary_short.m
+++ /dev/null
@@ -1 +0,0 @@
-NSString *str = (otherString ?: @"this is the placeholder");
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_inside_braces_oc_dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_inside_braces_oc_dict.m
deleted file mode 100644
index 272a2f28..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/sp_oc_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_oc_boxed.m
deleted file mode 100644
index 0c6948c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_oc_catch.m
deleted file mode 100644
index fe04844d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/sp_oc_classname_paren-r.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_oc_classname_paren-r.m
deleted file mode 100644
index 1076bbb3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/sp_oc_synchronized.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_oc_synchronized.m
deleted file mode 100644
index e4de748b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/string.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/string.m
deleted file mode 100644
index f3fca80f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/ternary.m
deleted file mode 100644
index 3fdddd93..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/oc/typeof.m b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/typeof.m
deleted file mode 100644
index d5183a1d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/pawn/Issue_2586.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/Issue_2586.pawn
deleted file mode 100644
index 89558691..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/pawn/Issue_2665.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/Issue_2665.pawn
deleted file mode 100644
index ddcb045a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/Issue_2665.pawn
+++ /dev/null
@@ -1,3 +0,0 @@
-static Entrypoint()
-{
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/comment.p b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/comment.p
deleted file mode 100644
index 785521ac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/pawn/crusty_ex-1.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/crusty_ex-1.sma
deleted file mode 100644
index 35ee0515..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/pawn/enum.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/enum.pawn
deleted file mode 100644
index 588efc35..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/pawn/functions.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/functions.pawn
deleted file mode 100644
index cdda5e05..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/pawn/gh419.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/gh419.pawn
deleted file mode 100644
index 9db7b08f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/pawn/preproc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/preproc.pawn
deleted file mode 100644
index e15d360e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/pawn/rpn_calc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/rpn_calc.pawn
deleted file mode 100644
index 2965d9c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/pawn/str-escape.p b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/str-escape.p
deleted file mode 100644
index 5600eae3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/pawn/switch-vsemi.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/switch-vsemi.sma
deleted file mode 100644
index c2efacfb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/pawn/tags.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/tags.pawn
deleted file mode 100644
index 56bdd2b9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/pawn/test1.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/test1.pawn
deleted file mode 100644
index ecefe6e0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/pawn/traffic.p b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/traffic.p
deleted file mode 100644
index f5cf0f7f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/pawn/unbraced.p b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/unbraced.p
deleted file mode 100644
index 10c41663..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/sql/issue_527.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/sql/issue_527.sqc
deleted file mode 100644
index 5514ff31..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/sql/mysql.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/sql/mysql.sqc
deleted file mode 100644
index 197c2847..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/sql/sta-select.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/sql/sta-select.sqc
deleted file mode 100644
index 863edf5b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/vala/Issue_2090.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/Issue_2090.vala
deleted file mode 100644
index 22698792..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/vala/Issue_2270.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/Issue_2270.vala
deleted file mode 100644
index 7bb897d8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/vala/advanced.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/advanced.vala
deleted file mode 100644
index 2b85c031..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/vala/gh287.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/gh287.vala
deleted file mode 100644
index fcb6fca6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/vala/list.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/list.vala
deleted file mode 100644
index e9b48acc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/vala/preproc.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/preproc.vala
deleted file mode 100644
index 3ab2ccc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/vala/verbatim_str.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/verbatim_str.vala
deleted file mode 100644
index 11f19c01..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/input/vala/verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/verbatim_str2.vala
deleted file mode 100644
index 9d8798b7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/java.test b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/java.test
deleted file mode 100644
index 9085dc14..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/java.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Test cases specifically for the Java language.
-#
-# Range: 80000 - 89999
-# test.name  config.file  input.file
-
-80000  java/ben_099.cfg                                  java/assert.java
-80010  java/annotation.cfg                               java/annotation1.java
-80011  common/empty.cfg                                  java/annotation2.java
-80012  java/nl_after_annotation-f.cfg                    java/annotation2.java
-80013  java/nl_between_annotation-f.cfg                  java/annotation2.java
-80014  java/annotation.cfg                               java/annotation2.java
-80020  java/java_foreach.cfg                             java/foreach.java
-80030  common/indent_var_def.cfg                         java/variable_aligns.java
-80040  common/empty.cfg                                  java/try.java
-80050  java/jdbi-r.cfg                                   java/double_brace.java
-80051  java/jdbi-f.cfg                                   java/double_brace.java
-80060  java/java_synchronized_1.cfg                      java/synchronized.java
-80061  java/java_synchronized_2.cfg                      java/synchronized.java
-80062  java/sp_this_paren.cfg                            java/sp_this_paren.java
-80063  common/empty.cfg                                  java/i1121.java
-80064  java/mod_add_long_class_closebrace_comment-1.cfg  java/long_cl_cmt.java
-80065  common/empty.cfg                                  java/Java8DoubleColon.java
-80066  java/sp_after_for_colon.cfg                       java/sp_after_for_colon.java
-80067  java/doxy-javadoc-alignment.cfg                   java/doxy-javadoc-alignment.java
-80068  common/nl_before_ignore_after_case.cfg            java/nl_before_ignore_after_case.java
-
-80100  common/align_same_func_call_params-t.cfg          java/sf567.java
-
-80200  common/sp_before_byref-r.cfg                      java/sp_before_byref.java
-80201  java/template_angles.cfg                          java/generics.java
-80202  common/aet.cfg                                    java/generics_wildcard.java
-80203  common/aet.cfg                                    java/generics_return_type.java
-80204  common/aet.cfg                                    java/cast.java
-80205  common/aet.cfg                                    java/sp_after_angle.java
-80206  common/aet.cfg                                    java/annotation3.java
-
-80300  java/Issue_670.cfg                                java/Issue_670.java
-80301  common/issue_672.cfg                              java/issue_672.java
-80302  java/Issue_1845.cfg                               java/Issue_1845.java
-80303  java/Issue_1122.cfg                               java/Issue_1122.java
-80304  java/Issue_1124-f.cfg                             java/Issue_1124.java
-80305  java/Issue_1124-r.cfg                             java/Issue_1124.java
-80306  java/leading-tabs-for-java-lambda.cfg             java/leading-tabs-for-java-lambda.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/objective-c.test b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/objective-c.test
deleted file mode 100644
index f9d84477..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/objective-c.test
+++ /dev/null
@@ -1,187 +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  oc/oc1.cfg                               oc/Fraction.h                   OC
-50002  oc/oc2.cfg                               oc/Fraction.m
-50003  oc/oc2.cfg                               oc/main.m
-50004  oc/oc4.cfg                               oc/string.m
-50005  oc/oc5.cfg                               oc/Declarations.h               OC
-50006  oc/oc6.cfg                               oc/exceptions.m
-50007  oc/oc7.cfg                               oc/misc.m
-50008  oc/oc8.cfg                               oc/protocol.m
-50009  oc/oc9.cfg                               oc/literals.mm
-
-50010  oc/sp_after_oc_return_type_add.cfg       oc/return_type.m
-50011  oc/sp_after_oc_return_type_force.cfg     oc/return_type.m
-50012  oc/sp_after_oc_return_type_remove.cfg    oc/return_type.m
-
-50014  oc/sp_oc_classname_paren-r.cfg           oc/sp_oc_classname_paren-r.m
-50015  oc/oc10.cfg                              oc/receiver.m
-
-50016  oc/oc11.cfg                              oc/ternary.m
-50017  oc/ternary_short.cfg                     oc/ternary.m
-
-50018  common/indent_inside_ternary_operator.cfg  oc/indent-inside-ternary-operator.m
-
-50020  oc/sp_after_oc_at_sel_add.cfg            oc/selector.m
-50021  oc/sp_after_oc_at_sel_force.cfg          oc/selector.m
-50022  oc/sp_after_oc_at_sel_remove.cfg         oc/selector.m
-
-50025  oc/oc6.cfg                               oc/exceptions.m
-50026  oc/sp_after_throw_remove.cfg             oc/exceptions.m
-
-50030  common/sort_imports.cfg                                  oc/sort_import.m
-50031  oc/mod_sort_incl_import_prioritize_filename.cfg          oc/sort_import.m
-50032  oc/mod_sort_incl_import_ignore_extension.cfg             oc/sort_import.m
-50033  oc/mod_sort_incl_import_prioritize_extensionless.cfg     oc/sort_import.m
-50034  oc/mod_sort_incl_import_prioritize_angle_over_quotes.cfg oc/sort_import.m
-50035  oc/mod_sort_incl_import_grouping_enabled.cfg             oc/sort_import_group.m
-
-50040  oc/objc_complex_method.cfg               oc/complex_method.m
-
-50050  oc/objc_complex_method.cfg               oc/real_world_file.m
-
-50060  oc/align_oc_msg_colon_span-1.cfg         oc/oc-split.m
-50061  oc/bug_167.cfg                           oc/bug_167.m
-
-50062  common/aet.cfg                           oc/issue_2631.m
-
-50070  oc/blocks.cfg                            oc/blocks.m
-50071  oc/sp_before_oc_block_caret_force.cfg    oc/blocks.m
-50072  oc/sp_before_oc_block_caret_remove.cfg   oc/blocks.m
-50073  oc/sp_after_oc_block_caret_add.cfg       oc/blocks.m
-50074  oc/sp_after_oc_block_caret_force.cfg     oc/blocks.m
-50075  oc/blocks.cfg                            oc/blocks.m
-50076  oc/sp_before_oc_block_caret_remove.cfg   oc/blocks.m
-
-50077  oc/blocks.cfg                            oc/more_blocks.m
-50078  oc/sp_before_oc_block_caret_force.cfg    oc/more_blocks.m
-50079  oc/sp_before_oc_block_caret_remove.cfg   oc/more_blocks.m
-50080  oc/sp_after_oc_block_caret_add.cfg       oc/more_blocks.m
-50081  oc/sp_after_oc_block_caret_force.cfg     oc/more_blocks.m
-50082  oc/blocks.cfg                            oc/more_blocks.m
-50083  oc/sp_before_oc_block_caret_remove.cfg   oc/more_blocks.m
-50084  oc/nl_brace_square.cfg                   oc/more_blocks.m
-50085  oc/nl_after_func_body-3.cfg              oc/block_in_method.m
-50086  oc/issue_2643.cfg                        oc/block_in_method.m
-50087  oc/indent_oc_inside_msg_sel.cfg          oc/indent_oc_inside_msg_sel.m
-
-50090  oc/oc12.cfg                              oc/kw.m
-50091  oc/issue_2656.cfg                        oc/block_in_method.m
-
-50095  oc/oc13.cfg                              oc/box.m
-50100  oc/bug_340.cfg                           oc/bug_340.m
-
-50110  oc/oc14.cfg                              oc/msg_align.m
-50111  common/del_semicolon.cfg                 oc/ns_enum.m
-50112  common/empty.cfg                         oc/ns_enum.m
-50113  oc/sp_enum_paren-r.cfg                   oc/ns_enum.m
-
-50120  oc/gh137.cfg                             oc/gh137.m
-
-50200  oc/sp_block_as_argument.cfg              oc/more_blocks_2.m
-50201  oc/sp_block_as_argument.cfg              oc/blocks_align.m
-50202  oc/sp_block_as_argument2.cfg             oc/blocks_align.m
-50203  oc/sp_block_as_argument3.cfg             oc/blocks_align.m
-50204  oc/sp_block_as_argument4.cfg             oc/blocks_align.m
-50205  oc/sp_block_as_argument5.cfg             oc/msg_align.m
-50206  common/aet.cfg                           oc/issue_2727.m
-50207  oc/issue_3031.cfg                        oc/issue_3031.mm
-
-50300  oc/sp_after_send_oc_colon-f.cfg          oc/msg.m
-
-50400  oc/oc16.cfg                              oc/for.m
-
-50410  oc/oc_cond_colon.cfg                     oc/oc_cond_colon.m              OC+
-50411  common/attribute_specifier_seqs.cfg      oc/attribute_specifier_seqs.mm  OC+
-
-50500  oc/oc17.cfg                              oc/code_placeholder.m
-
-50510  oc/gh293.a.cfg                           oc/gh293.m
-50511  oc/gh293.b.cfg                           oc/gh293.m
-50512  oc/sp_oc_catch.cfg                       oc/sp_oc_catch.m
-50513  oc/sp_oc_boxed.cfg                       oc/sp_oc_boxed.m
-50514  oc/indent_boxed.cfg                      oc/indent_boxed.m
-50515  oc/sp_oc_synchronized.cfg                oc/sp_oc_synchronized.m
-
-50600  oc/nl_oc_block_brace-f.cfg               oc/bug_i_477.m
-50601  common/empty.cfg                         oc/bug_i_408.m
-50602  oc/bug_i_125-412.cfg                     oc/bug_i_125-412.m
-50603  oc/oc18.cfg                              oc/gh511.m
-50604  oc/objc_bug_497.cfg                      oc/bug_497.m
-50605  common/empty.cfg                         oc/bug_404.m
-50606  oc/oc19.cfg                              oc/bug_1366.m
-50607  common/aet-sp_after_oc_msg_receiver.cfg  oc/sp_after_oc_msg_receiver.m
-50608  common/aet.cfg                           oc/blocks_align2.m
-50609  common/sp_arith-f.cfg                    oc/negative_value.m
-50610  common/aet.cfg                           oc/nelem.m
-50611  common/aet.cfg                           oc/for2.m
-50612  common/aet.cfg                           oc/chunk_ends_type1.m
-50613  common/aet.cfg                           oc/chunk_ends_type2.m
-50614  common/aet.cfg                           oc/chunk_ends_type3.m
-50615  common/aet.cfg                           oc/block_literal_protocol.m
-50616  common/aet.cfg                           oc/oc_msg_in_pp.m
-50617  common/aet.cfg                           oc/boxed_receiver.m
-50618  common/aet-func_def.cfg                  oc/func_def.mm
-50619  common/aet.cfg                           oc/cast.m
-50620  common/aet.cfg                           oc/sp_after_angle.m
-50621  common/aet.cfg                           oc/Fraction.h
-50622  common/aet.cfg                           oc/c-cpp-oc-wrapper.c
-50623  common/aet.cfg                           oc/extern-c-attribute.m
-50624  common/aet.cfg                           oc/typeof.m
-50625  common/aet-sp_inside_braces_oc_dict.cfg  oc/sp_inside_braces_oc_dict.m
-50626  common/aet.cfg                           oc/chunk_ends_type4.m
-50627  common/aet.cfg                           oc/method_ends_semicolon.m
-50628  common/aet.cfg                           oc/macro-close-brace.m
-50629  common/aet.cfg                           oc/pp_bool.m
-
-50630  oc/nl_func_call_args_multi_line_ignore_closures.cfg oc/nl_func_call_args_multi_line_ignore_closures.m
-
-50700  common/cmt_insert-0.cfg                  oc/cmt_insert.m
-50701  common/cmt_insert-0.cfg                  oc/cmt_insert2.m
-
-50800  oc/obj-c-properties.cfg                  oc/properties.m
-50801  common/empty.cfg                         oc/i1213.m
-50802  oc/obj-c-available.cfg                   oc/available.m
-50803  oc/indent_single_newline.cfg             oc/indent_single_newline.m
-
-50804  common/aet.cfg                           oc/issue_2629.m
-50805  common/aet.cfg                           oc/issue_2724.m
-
-50810  oc/bug_841.cfg                           oc/bug_841.m
-50811  oc/oc_bug_1674.cfg                       oc/bug_1674.m
-50812  oc/oc_bug_1683.cfg                       oc/bug_1683.m
-
-50813  oc/sp_before_oc_proto_list_add.cfg       oc/sp_before_oc_proto_list.m
-50814  oc/sp_before_oc_proto_list_force.cfg     oc/sp_before_oc_proto_list.m
-50815  oc/sp_before_oc_proto_list_remove.cfg    oc/sp_before_oc_proto_list.m
-
-50816  oc/issue_2675.cfg                        oc/issue_2675.m
-50817  common/aet.cfg                           oc/issue_2722.m
-
-50900  oc/1927.cfg                              oc/1927.m
-50901  oc/Issue_2172.cfg                        oc/Issue_2172.m
-50902  common/empty.cfg                         oc/Issue_2289.m
-50903  oc/Issue_681.cfg                         oc/Issue_681.oc
-
-50904  oc/double_angle_space_1.cfg              oc/double_angle_space.m
-50905  oc/double_angle_space_2.cfg              oc/double_angle_space.m
-50906  oc/double_angle_space_3.cfg              oc/double_angle_space.m
-
-# test the options sp_ with the value "ignore"
-51000  oc/sp_cond_ternary_short.cfg             oc/sp_cond_ternary_short.m
-51001  oc/sp_enum_paren-i.cfg                   oc/ns_enum-i.m
-51002  oc/sp_oc_catch-i.cfg                     oc/sp_oc_catch.m
-51003  oc/sp_oc_catch-r.cfg                     oc/sp_oc_catch.m
-51004  oc/block_pointer.cfg                     oc/block_pointer.m
-
-#
-# adopt tests from UT
-10018  oc/delete-space-oc.cfg                   oc/delete-space-oc.mm
-10019  common/empty.cfg                         oc/func-param-wrap-oc.mm
-10020  oc/align-objc-like-xcode.cfg             oc/align-objc-like-xcode.m
-10021  oc/double-indent-objc-dict.cfg           oc/double-indent-objc-dict.m
-10022  oc/indent-objc-block.cfg                 oc/indent-objc-block.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/pawn.test b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/pawn.test
deleted file mode 100644
index 7946465e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/pawn.test
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Test cases specifically for the Pawn language.
-#
-# Range: 60000 - 69999
-# test.name  config.file  input.file
-
-60000  pawn/pawn.cfg                        pawn/functions.pawn
-60001  pawn/pawn.cfg                        pawn/comment.p
-60002  pawn/pawn.cfg                        pawn/traffic.p
-60003  pawn/pawn.cfg                        pawn/tags.pawn
-60004  pawn/pawn.cfg                        pawn/enum.pawn
-60005  pawn/pawn.cfg                        pawn/unbraced.p
-
-60010  pawn/pawn-escape.cfg                 pawn/str-escape.p
-
-60020  pawn/pawn-escape.cfg                 pawn/switch-vsemi.sma
-
-60030  pawn/amxmodx.cfg                     pawn/crusty_ex-1.sma
-
-60040  pawn/amxmodx.cfg                     pawn/preproc.pawn
-
-60050  pawn/mod_full_brace_function-f.cfg   pawn/gh419.pawn
-
-60100  pawn/Issue_2586.cfg                  pawn/Issue_2586.pawn
-60101  pawn/Issue_2665.cfg                  pawn/Issue_2665.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/run_format_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/run_format_tests.py
deleted file mode 100755
index 671188c2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/run_sources_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/run_sources_tests.py
deleted file mode 100755
index ebbc6623..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/run_test.py b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/run_test.py
deleted file mode 100755
index 7b5a9d57..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/staging.test b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/staging.test
deleted file mode 100644
index e71faddf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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~ staging/UNI-58354.cfg                cs/UNI-58354.cs     CS
-39000~ staging/UNI-64325.cfg                cpp/UNI-64325.cpp   CPP
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/__init__.py b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/__init__.py
deleted file mode 100644
index bf83b667..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/test_uncrustify/ansicolor.py b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/ansicolor.py
deleted file mode 100644
index 44d6dbd5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/test_uncrustify/config.py b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/config.py
deleted file mode 100644
index 4370816d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/test_uncrustify/failure.py b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/failure.py
deleted file mode 100644
index 0972930f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/test_uncrustify/selector.py b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/selector.py
deleted file mode 100644
index 93646257..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/test_uncrustify/test.py b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/test.py
deleted file mode 100644
index f621f40f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/test.py
+++ /dev/null
@@ -1,296 +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]))
-        #out_file.write(
-        #    ('set_tests_properties({}\n' +
-        #     '  PROPERTIES DEPENDS "sources_format"\n)\n').format(
-        #         self.test_name))
-
-    # -------------------------------------------------------------------------
-    def run(self, args):
-        for p in self.test_passes:
-            p.run(args)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/utilities.py b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/utilities.py
deleted file mode 100644
index 2d930222..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/tests.vpj b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/tests.vpj
deleted file mode 100644
index a5ed4fd3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/vala.test b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/vala.test
deleted file mode 100644
index 56fbf00f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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  vala/ben_100.cfg                     vala/list.vala
-70001  vala/ben_101.cfg                     vala/advanced.vala
-70010  vala/ben_102.cfg                     vala/verbatim_str.vala
-70011  vala/ben_103.cfg                     vala/verbatim_str2.vala
-70012  common/ben2.cfg                      vala/verbatim_str2.vala
-70020  vala/ben_104.cfg                     vala/preproc.vala
-70287  vala/ben_105.cfg                     vala/gh287.vala
-70300  vala/Issue_2090.cfg                  vala/Issue_2090.vala
-70301  vala/Issue_2270.cfg                  vala/Issue_2270.vala