Update clang-format style

.clang-format

@@ -3,7 +3,22 @@
 # https://clang.llvm.org/docs/ClangFormatStyleOptions.html
 # https://github.com/01org/parameter-framework/blob/master/.clang-format
 
-#
+# Tested on: clang-format version 6.0.1
+
+
+# Common settings
+BasedOnStyle:  WebKit
+TabWidth:        4
+IndentWidth:     4
+UseTab:          Always
+ColumnLimit: 100
+
+# Other languages JavaScript, Proto
+
+---
+Language: Cpp
+
+# http://releases.llvm.org/6.0.1/tools/clang/docs/ClangFormatStyleOptions.html#disabling-formatting-on-a-piece-of-code
 # int formatted_code;
 # // clang-format off
 #     void    unformatted_code  ;
@@ -11,8 +26,8 @@
 # void formatted_code_again;
 
 DisableFormat:   false
+Standard: Cpp11
 
-BasedOnStyle:  WebKit
 AccessModifierOffset: -4
 AlignAfterOpenBracket: true
 AlignConsecutiveAssignments: false
@@ -47,17 +62,21 @@ BraceWrapping: {
     BeforeCatch : 'true'
     BeforeElse : 'true'
     IndentBraces : 'false'
+    AfterExternBlock : 'true'
+    SplitEmptyFunction : 'false'
+    SplitEmptyRecord : 'false'
+    SplitEmptyNamespace : 'true'
 }
 
 BreakAfterJavaFieldAnnotations: true
-# BreakBeforeInheritanceComma: true
+BreakBeforeInheritanceComma: false
 BreakBeforeBinaryOperators: None
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: true
 BreakStringLiterals: true
-ColumnLimit:     100
+
 CommentPragmas:  '^ IWYU pragma:'
-#CompactNamespaces: false
+CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
@@ -66,13 +85,11 @@ DerivePointerAlignment: false
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
 IndentCaseLabels: false
-IndentWidth:     4
-#FixNamespaceComments: true
+FixNamespaceComments: true
 IndentWrappedFunctionNames: false
 KeepEmptyLinesAtTheStartOfBlocks: true
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
-Language: Cpp
 JavaScriptQuotes: Double
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
@@ -83,8 +100,7 @@ PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
-ReflowComments: false
-SortIncludes: true
+
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Left
@@ -99,6 +115,13 @@ SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 SpaceAfterTemplateKeyword: true
-Standard:        Cpp11
-TabWidth:        4
-UseTab:          ForIndentation
+
+SortUsingDeclarations: true
+SortIncludes: true
+
+# Comments are for developers, they should arrange them
+ReflowComments: false
+
+IncludeBlocks: Preserve
+IndentPPDirectives: AfterHash
+---