Merge pull request #14332 from akien-mga/clang-format

Update style for clang-format 5.0.0, new min required version

8 files changed, 22 insertions, 21 deletions

diff --git a/modules/gdnative/arvr/arvr_interface_gdnative.cpp b/modules/gdnative/arvr/arvr_interface_gdnative.cpp
index 9b0d1ebb3..29e4775e6 100644
--- a/modules/gdnative/arvr/arvr_interface_gdnative.cpp
+++ b/modules/gdnative/arvr/arvr_interface_gdnative.cpp
@@ -219,7 +219,7 @@ extern "C" {
 void GDAPI godot_arvr_register_interface(const godot_arvr_interface_gdnative *p_interface) {
 	Ref<ARVRInterfaceGDNative> new_interface;
 	new_interface.instance();
-	new_interface->set_interface((godot_arvr_interface_gdnative * const)p_interface);
+	new_interface->set_interface((godot_arvr_interface_gdnative *const)p_interface);
 	ARVRServer::get_singleton()->add_interface(new_interface);
 }
 
diff --git a/modules/gdnative/gdnative.cpp b/modules/gdnative/gdnative.cpp
index 21c24fabd..9c0041cbe 100644
--- a/modules/gdnative/gdnative.cpp
+++ b/modules/gdnative/gdnative.cpp
@@ -144,7 +144,7 @@ bool GDNative::initialize() {
 		}
 	}
 
-	Error err = OS::get_singleton()->open_dynamic_library(path, native_handle,true);
+	Error err = OS::get_singleton()->open_dynamic_library(path, native_handle, true);
 	if (err != OK) {
 		return false;
 	}
diff --git a/modules/gdnative/gdnative.h b/modules/gdnative/gdnative.h
index bb260bdd1..993cd0ece 100644
--- a/modules/gdnative/gdnative.h
+++ b/modules/gdnative/gdnative.h
@@ -106,8 +106,8 @@ struct GDNativeCallRegistry {
 		return singleton;
 	}
 
-	inline GDNativeCallRegistry()
-		: native_calls() {}
+	inline GDNativeCallRegistry() :
+			native_calls() {}
 
 	Map<StringName, native_call_cb> native_calls;
 
diff --git a/modules/gdnative/nativescript/api_generator.cpp b/modules/gdnative/nativescript/api_generator.cpp
index f9d699fb5..653445c2d 100644
--- a/modules/gdnative/nativescript/api_generator.cpp
+++ b/modules/gdnative/nativescript/api_generator.cpp
@@ -468,8 +468,6 @@ static List<String> generate_c_api_json(const List<ClassAPI> &p_api) {
 	return source;
 }
 
-//
-
 #endif
 
 /*
diff --git a/modules/gdnative/nativescript/nativescript.cpp b/modules/gdnative/nativescript/nativescript.cpp
index c2c7c27f2..965de062e 100644
--- a/modules/gdnative/nativescript/nativescript.cpp
+++ b/modules/gdnative/nativescript/nativescript.cpp
@@ -437,11 +437,11 @@ NativeScript::~NativeScript() {
 #endif
 }
 
-//
-//
-// ScriptInstance stuff
-//
-//
+	//
+	//
+	// ScriptInstance stuff
+	//
+	//
 
 #define GET_SCRIPT_DESC() script->get_script_desc()
 
diff --git a/modules/gdnative/nativescript/nativescript.h b/modules/gdnative/nativescript/nativescript.h
index f0f14e2f3..30fa400cb 100644
--- a/modules/gdnative/nativescript/nativescript.h
+++ b/modules/gdnative/nativescript/nativescript.h
@@ -76,12 +76,12 @@ struct NativeScriptDesc {
 
 	bool is_tool;
 
-	inline NativeScriptDesc()
-		: methods(),
-		  properties(),
-		  signals_(),
-		  base(),
-		  base_native_type() {
+	inline NativeScriptDesc() :
+			methods(),
+			properties(),
+			signals_(),
+			base(),
+			base_native_type() {
 		zeromem(&create_func, sizeof(godot_instance_create_func));
 		zeromem(&destroy_func, sizeof(godot_instance_destroy_func));
 	}
diff --git a/modules/gdnative/pluginscript/pluginscript_language.cpp b/modules/gdnative/pluginscript/pluginscript_language.cpp
index 40feb5ae4..e358c2fb6 100644
--- a/modules/gdnative/pluginscript/pluginscript_language.cpp
+++ b/modules/gdnative/pluginscript/pluginscript_language.cpp
@@ -410,8 +410,8 @@ void PluginScriptLanguage::unlock() {
 #endif
 }
 
-PluginScriptLanguage::PluginScriptLanguage(const godot_pluginscript_language_desc *desc)
-	: _desc(*desc) {
+PluginScriptLanguage::PluginScriptLanguage(const godot_pluginscript_language_desc *desc) :
+		_desc(*desc) {
 	_resource_loader = memnew(ResourceFormatLoaderPluginScript(this));
 	_resource_saver = memnew(ResourceFormatSaverPluginScript(this));
 
diff --git a/modules/gdnative/pluginscript/pluginscript_script.cpp b/modules/gdnative/pluginscript/pluginscript_script.cpp
index 4169b07f6..0b71b3b10 100644
--- a/modules/gdnative/pluginscript/pluginscript_script.cpp
+++ b/modules/gdnative/pluginscript/pluginscript_script.cpp
@@ -423,8 +423,11 @@ ScriptInstance::RPCMode PluginScript::get_rset_mode(const StringName &p_variable
 	}
 }
 
-PluginScript::PluginScript()
-	: _data(NULL), _tool(false), _valid(false), _script_list(this) {
+PluginScript::PluginScript() :
+		_data(NULL),
+		_tool(false),
+		_valid(false),
+		_script_list(this) {
 }
 
 void PluginScript::init(PluginScriptLanguage *language) {