[doc] Remove unused clang format dev script

Also, update the clang format file to reflect the current coding style mentioned in the developer notes.
Booss13 · Jan 28, 2017 · fa5137c · fa5137c
1 parent a7ea2f8
commit fa5137c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 71 deletions.
diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md
@@ -8,11 +8,6 @@ check-doc.py
 Check if all command line args are documented. The return value indicates the
 number of undocumented args.
 
-clang-format.py
-===============
-
-A script to format cpp source code according to [.clang-format](../../src/.clang-format). This should only be applied to new files or files which are currently not actively developed on. Also, git subtrees are not subject to formatting.
-
 clang-format-diff.py
 ===================
 
@@ -24,6 +19,7 @@ the script should be called from the git root folder as follows.
 ```
 git diff -U0 HEAD~1.. | ./contrib/devtools/clang-format-diff.py -p1 -i -v
 ```
+
 copyright\_header.py
 ====================
 

diff --git a/contrib/devtools/clang-format.py b/contrib/devtools/clang-format.py
diff --git a/doc/developer-notes.md b/doc/developer-notes.md
@@ -4,10 +4,11 @@ Developer Notes
 Various coding styles have been used during the history of the codebase,
 and the result is not very consistent. However, we're now trying to converge to
 a single style, so please use it in new code. Old code will be converted
-gradually.
+gradually and you are encouraged to use the provided
+[clang-format-diff script](/contrib/devtools/README.md#clang-format-diffpy)
+to clean up the patch automatically before submitting a pull request.
+
 - Basic rules specified in [src/.clang-format](/src/.clang-format).
-  Use a recent clang-format to format automatically using one of the [dev scripts]
-  (/contrib/devtools/README.md#clang-formatpy).
   - Braces on new lines for namespaces, classes, functions, methods.
   - Braces on the same line for everything else.
   - 4 space indentation (no tabs) for every block except namespaces.

diff --git a/src/.clang-format b/src/.clang-format
@@ -6,7 +6,7 @@ AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: false
 AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: true
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: true