Clang format and manual style fixes.

.clang-format

@@ -1,36 +1,9 @@
 ---
-BasedOnStyle: WebKit
-Cpp11BracedListStyle: 'true'
-IndentWrappedFunctionNames: 'true'
-KeepEmptyLinesAtTheStartOfBlocks: 'true'
-Language: Cpp
-SpacesInAngles: 'false'
-TabWidth: '2'
-UseTab: Never
-SortIncludes: false
-PointerAlignment: Left
-AlignAfterOpenBracket: DontAlign
-BreakBeforeBraces: Custom
-BraceWrapping:
-  AfterClass: true
-  AfterEnum: true
-  AfterStruct: true
-  AfterFunction: true
-  AfterNamespace: false
-  AfterStruct: true
-  AfterUnion: true
-  AfterExternBlock: true
-  BeforeCatch: true
-  BeforeElse: true
-  IndentBraces: false
-  SplitEmptyFunction: false
-  AfterControlStatement: true
-IndentWidth: 2
-AccessModifierOffset: -2
-AllowShortFunctionsOnASingleLine: false
-AllowShortIfStatementsOnASingleLine: true
-SpaceBeforeParens: ControlStatements
-ConstructorInitializerIndentWidth: 2
-ColumnLimit: 90
+BasedOnStyle: Mozilla
 
+# Reflowing comments interfers with .rst identation
+ReflowComments: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakAfterDefinitionReturnType: None
+IndentPPDirectives: AfterHash
 ...

CONTRIBUTING.rst

@@ -40,6 +40,9 @@ Fork the repository and make changes on your fork in a feature branch:
    your intentions, and name it ``XXXX-something`` where XXXX is the number
    of the issue.
 
+Code must be formatted according to our ```.clang-format``` file, using
+the clang-format tool.
+
 Submit unit tests for your changes.
 
 Update the documentation when creating or modifying features. Test your

doc/src/tutorial/driver/main.cpp

@@ -36,8 +36,11 @@
   #ifndef WIN32_LEAN_AND_MEAN
     #define WIN32_LEAN_AND_MEAN
   #endif
+// clang-format off
+// Do not re-order include directives, it would break MinGW builds.
   #include <windows.h>
   #include <strsafe.h>
+// clang-format on
 #else
   #error Unsupported platform
 #endif

format_code.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+find . -type d -name third_party -prune -o -name '*.cpp' -o -name '*.h' | xargs clang-format -i -style=file

framework/doc/snippets/uServices-registration/main.cpp

@@ -58,7 +58,7 @@ class MyServiceFactory : public ServiceFactory
 {
   virtual InterfaceMapConstPtr GetService(const Bundle& /*bundle*/, const ServiceRegistrationBase& /*registration*/)
   {
-    return MakeInterfaceMap<InterfaceA>(std::make_shared<MyService>());;
+    return MakeInterfaceMap<InterfaceA>(std::make_shared<MyService>());
   }
 
   virtual void UngetService(const Bundle& /*bundle*/, const ServiceRegistrationBase& /*registration*/,

framework/include/cppmicroservices/BundleEvent.h

@@ -28,7 +28,8 @@
 #include <iostream>
 #include <memory>
 
-US_MSVC_PUSH_DISABLE_WARNING(4251) // 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'
+// 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'
+US_MSVC_PUSH_DISABLE_WARNING(4251)
 
 namespace cppmicroservices {
 

framework/src/util/SharedLibrary.cpp

@@ -34,8 +34,11 @@
   #ifndef WIN32_LEAN_AND_MEAN
     #define WIN32_LEAN_AND_MEAN
   #endif
-  #include <windows.h>
-  #include <strsafe.h>
+  // clang-format off
+  // Do not re-order include directives, it would break MinGW builds.
+#  include <windows.h>
+#  include <strsafe.h>
+  // clang-format on
 #else
   #error Unsupported platform
 #endif

framework/test/driver/ResourceCompilerTest.cpp

@@ -62,7 +62,9 @@ int runExecutable(const std::string& executable)
   int ret = std::system(executable.c_str());
 
   // WEXITSTATUS uses an old c-sytle cast
+  // clang-format off
 US_GCC_PUSH_DISABLE_WARNING(old-style-cast)
+  // clang-format on
   return WEXITSTATUS(ret);
 US_GCC_POP_WARNING
 }

tools/shell/Shell.cpp

@@ -29,7 +29,10 @@
 
 #include "linenoise.h"
 
+// clang-format off
 US_GCC_PUSH_DISABLE_WARNING(array-bounds)
+// clang-format on
+
 #include "optionparser.h"
 US_GCC_POP_WARNING