Christian Ridderström e30f3d76d2 Bulk cleanup/fix incorrect annotation at the end of namespaces. ... This commit does a bulk fix of incorrect annotations (comments) at the end of namespaces. The commit was generated by initially running clang-format, and then from the diff of the result extracting the hunks corresponding to fixes of namespace comments. The changes being applied and all the results have been manually reviewed. The source code successfully builds on macOS. Further details on the steps below, in case they're of interest to someone else in the future. 1. Checkout a fresh and up to date version of src/ git pull && git checkout -- src && git status src 2. Ensure there's a suitable .clang-format in place, i.e. with options to fix the comment at the end of namespaces, including: FixNamespaceComments: true SpacesBeforeTrailingComments: 1 and that clang-format is >= 5.0.0, by doing e.g.: clang-format -dump-config | grep Comments: clang-format --version 3. Apply clang-format to the source: clang-format -i $(find src -name "*.cpp" -or -name "*.h") 4. Create and filter out hunks related to fixing the namespace git diff -U0 src > tmp.patch grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace.patch 5. Filter out hunks corresponding to simple fixes into to a separate patch: pcregrep -M -e '^diff[^\n]+\nindex[^\n]+\n--- [^\n]+\n\+\+\+ [^\n]+\n' \ -e '^@@ -[0-9]+ \+[0-9]+ @@[^\n]*\n-\}[^\n]*\n\+\}[^\n]*\n' \ fix_namespace.patch > fix_namespace_simple.patch 6. Manually review the simple patch and then apply it, after first restoring the source. git checkout -- src patch -p1 < fix_namespace_simple.path 7. Manually review the (simple) changes and then stage the changes git diff src git add src 8. Again apply clang-format and filter out hunks related to any remaining fixes to the namespace, this time filter with more context. There will be fewer hunks as all the simple cases have already been handled: clang-format -i $(find src -name "*.cpp" -or -name "*.h") git diff src > tmp.patch grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace2.patch 9. Manually review/edit the resulting patch file to remove hunks for files which need to be dealt with manually, noting the file names and line numbers. Then restore files to as before applying clang-format and apply the patch: git checkout src patch -p1 < fix_namespace2.patch 10. Manually fix the files noted in the previous step. Stage files, review changes and commit.		2017-07-23 13:11:54 +02:00
..
regfiles	Make output of check_Length.cpp more human readable.	2017-04-10 09:57:40 +02:00
boost.cpp
check_ExternalTransforms.cpp
check_layout.cmake	Check_layout tests: Check also stderr	2017-04-13 11:18:05 +02:00
check_layout.cpp	Bulk cleanup/fix incorrect annotation at the end of namespaces.	2017-07-23 13:11:54 +02:00
check_Length.cpp	Preferences shows current zoom instead of preference's default zoom (#10455)	2017-05-07 14:17:54 +02:00
check_ListingsCaption.cpp
CMakeLists.txt	Check_layout tests: Check also stderr	2017-04-13 11:18:05 +02:00
dummy_functions.cpp	Bulk cleanup/fix incorrect annotation at the end of namespaces.	2017-07-23 13:11:54 +02:00
test_ExternalTransforms
test_layout
test_Length
test_ListingsCaption