Bring that Whole New World to the Old Continent too

Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6e3e905b94b8764e99491e608122261.

1 files changed, 35 insertions, 44 deletions

diff --git a/platform/android/os_android.h b/platform/android/os_android.h
index 68b50b208..f035edc88 100644
--- a/platform/android/os_android.h
+++ b/platform/android/os_android.h
@@ -29,57 +29,54 @@
 #ifndef OS_ANDROID_H
 #define OS_ANDROID_H
 
-#include "os/input.h"
 #include "drivers/unix/os_unix.h"
+#include "main/input_default.h"
+#include "os/input.h"
 #include "os/main_loop.h"
-#include "servers/physics/physics_server_sw.h"
-#include "servers/spatial_sound/spatial_sound_server_sw.h"
-#include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h"
 #include "servers/audio/audio_server_sw.h"
+#include "servers/physics/physics_server_sw.h"
 #include "servers/physics_2d/physics_2d_server_sw.h"
 #include "servers/physics_2d/physics_2d_server_wrap_mt.h"
+#include "servers/spatial_sound/spatial_sound_server_sw.h"
+#include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h"
 #include "servers/visual/rasterizer.h"
-#include "main/input_default.h"
 
 //#ifdef USE_JAVA_FILE_ACCESS
 
-
 #ifdef ANDROID_NATIVE_ACTIVITY
 
-#include <android/sensor.h>
 #include <android/log.h>
+#include <android/sensor.h>
 #include <android_native_app_glue.h>
 
 #else
 
-
 #endif
 
 #include "audio_driver_jandroid.h"
 #include "audio_driver_opensl.h"
 
-typedef void (*GFXInitFunc)(void *ud,bool gl2);
-typedef int (*OpenURIFunc)(const String&);
+typedef void (*GFXInitFunc)(void *ud, bool gl2);
+typedef int (*OpenURIFunc)(const String &);
 typedef String (*GetDataDirFunc)();
 typedef String (*GetLocaleFunc)();
 typedef String (*GetModelFunc)();
 typedef int (*GetScreenDPIFunc)();
 typedef String (*GetUniqueIDFunc)();
-typedef void (*ShowVirtualKeyboardFunc)(const String&);
+typedef void (*ShowVirtualKeyboardFunc)(const String &);
 typedef void (*HideVirtualKeyboardFunc)();
 typedef void (*SetScreenOrientationFunc)(int);
 typedef String (*GetSystemDirFunc)(int);
 
-typedef void (*VideoPlayFunc)(const String&);
+typedef void (*VideoPlayFunc)(const String &);
 typedef bool (*VideoIsPlayingFunc)();
 typedef void (*VideoPauseFunc)();
 typedef void (*VideoStopFunc)();
 typedef void (*SetKeepScreenOnFunc)(bool p_enabled);
-typedef void (*AlertFunc)(const String&, const String&);
+typedef void (*AlertFunc)(const String &, const String &);
 
 class OS_Android : public OS_Unix {
 public:
-
 	struct TouchPos {
 		int id;
 		Point2 pos;
@@ -102,13 +99,12 @@ public:
 	};
 
 private:
-
 	Vector<TouchPos> touch;
 
 	Point2 last_mouse;
 	unsigned int last_id;
 	GFXInitFunc gfx_init_func;
-	void*gfx_init_ud;
+	void *gfx_init_ud;
 
 	bool use_gl2;
 	bool use_reload_hooks;
@@ -133,11 +129,11 @@ private:
 	AudioDriverOpenSL audio_driver_android;
 #endif
 
-	const char* gl_extensions;
+	const char *gl_extensions;
 
 	InputDefault *input;
 	VideoMode default_videomode;
-	MainLoop * main_loop;
+	MainLoop *main_loop;
 
 	OpenURIFunc open_uri_func;
 	GetDataDirFunc get_data_dir_func;
@@ -158,47 +154,44 @@ private:
 	AlertFunc alert_func;
 
 public:
-
 	// functions used by main to initialize/deintialize the OS
 	virtual int get_video_driver_count() const;
-	virtual const char * get_video_driver_name(int p_driver) const;
+	virtual const char *get_video_driver_name(int p_driver) const;
 
 	virtual VideoMode get_default_video_mode() const;
 
 	virtual int get_audio_driver_count() const;
-	virtual const char * get_audio_driver_name(int p_driver) const;
+	virtual const char *get_audio_driver_name(int p_driver) const;
 
 	virtual void initialize_core();
-	virtual void initialize(const VideoMode& p_desired,int p_video_driver,int p_audio_driver);
+	virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver);
 
-	virtual void set_main_loop( MainLoop * p_main_loop );
+	virtual void set_main_loop(MainLoop *p_main_loop);
 	virtual void delete_main_loop();
 
 	virtual void finalize();
 
-
 	typedef int64_t ProcessID;
 
-	static OS* get_singleton();
-
-	virtual void vprint(const char* p_format, va_list p_list, bool p_stderr=false);
-	virtual void print(const char *p_format, ... );
-	virtual void alert(const String& p_alert,const String& p_title="ALERT!");
+	static OS *get_singleton();
 
+	virtual void vprint(const char *p_format, va_list p_list, bool p_stderr = false);
+	virtual void print(const char *p_format, ...);
+	virtual void alert(const String &p_alert, const String &p_title = "ALERT!");
 
 	virtual void set_mouse_show(bool p_show);
 	virtual void set_mouse_grab(bool p_grab);
 	virtual bool is_mouse_grab_enabled() const;
 	virtual Point2 get_mouse_pos() const;
 	virtual int get_mouse_button_state() const;
-	virtual void set_window_title(const String& p_title);
+	virtual void set_window_title(const String &p_title);
 
 	//virtual void set_clipboard(const String& p_text);
 	//virtual String get_clipboard() const;
 
-	virtual void set_video_mode(const VideoMode& p_video_mode,int p_screen=0);
-	virtual VideoMode get_video_mode(int p_screen=0) const;
-	virtual void get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen=0) const;
+	virtual void set_video_mode(const VideoMode &p_video_mode, int p_screen = 0);
+	virtual VideoMode get_video_mode(int p_screen = 0) const;
+	virtual void get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen = 0) const;
 
 	virtual void set_keep_screen_on(bool p_enabled);
 
@@ -221,10 +214,10 @@ public:
 	virtual bool has_touchscreen_ui_hint() const;
 
 	virtual bool has_virtual_keyboard() const;
-	virtual void show_virtual_keyboard(const String& p_existing_text,const Rect2& p_screen_rect=Rect2());
+	virtual void show_virtual_keyboard(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2());
 	virtual void hide_virtual_keyboard();
 
-	void set_opengl_extensions(const char* p_gl_extensions);
+	void set_opengl_extensions(const char *p_gl_extensions);
 	void set_display_size(Size2 p_size);
 
 	void reload_gfx();
@@ -238,20 +231,19 @@ public:
 	virtual String get_resource_dir() const;
 	virtual String get_locale() const;
 	virtual String get_model_name() const;
-	virtual int get_screen_dpi(int p_screen=0) const;
+	virtual int get_screen_dpi(int p_screen = 0) const;
 
 	virtual String get_unique_ID() const;
 
 	virtual String get_system_dir(SystemDir p_dir) const;
 
-
-	void process_accelerometer(const Vector3& p_accelerometer);
-	void process_magnetometer(const Vector3& p_magnetometer);
-	void process_gyroscope(const Vector3& p_gyroscope);
-	void process_touch(int p_what,int p_pointer, const Vector<TouchPos>& p_points);
+	void process_accelerometer(const Vector3 &p_accelerometer);
+	void process_magnetometer(const Vector3 &p_magnetometer);
+	void process_gyroscope(const Vector3 &p_gyroscope);
+	void process_touch(int p_what, int p_pointer, const Vector<TouchPos> &p_points);
 	void process_joy_event(JoystickEvent p_event);
 	void process_event(InputEvent p_event);
-	void init_video_mode(int p_video_width,int p_video_height);
+	void init_video_mode(int p_video_width, int p_video_height);
 
 	virtual Error native_video_play(String p_path, float p_volume);
 	virtual bool native_video_is_playing();
@@ -262,9 +254,8 @@ public:
 	virtual String get_joy_guid(int p_device) const;
 	void joy_connection_changed(int p_device, bool p_connected, String p_name);
 
-	OS_Android(GFXInitFunc p_gfx_init_func,void*p_gfx_init_ud, OpenURIFunc p_open_uri_func, GetDataDirFunc p_get_data_dir_func,GetLocaleFunc p_get_locale_func,GetModelFunc p_get_model_func, GetScreenDPIFunc p_get_screen_dpi_func, ShowVirtualKeyboardFunc p_show_vk, HideVirtualKeyboardFunc p_hide_vk,  SetScreenOrientationFunc p_screen_orient,GetUniqueIDFunc p_get_unique_id,GetSystemDirFunc p_get_sdir_func, VideoPlayFunc p_video_play_func, VideoIsPlayingFunc p_video_is_playing_func, VideoPauseFunc p_video_pause_func, VideoStopFunc p_video_stop_func, SetKeepScreenOnFunc p_set_keep_screen_on_func, AlertFunc p_alert_func, bool p_use_apk_expansion);
+	OS_Android(GFXInitFunc p_gfx_init_func, void *p_gfx_init_ud, OpenURIFunc p_open_uri_func, GetDataDirFunc p_get_data_dir_func, GetLocaleFunc p_get_locale_func, GetModelFunc p_get_model_func, GetScreenDPIFunc p_get_screen_dpi_func, ShowVirtualKeyboardFunc p_show_vk, HideVirtualKeyboardFunc p_hide_vk, SetScreenOrientationFunc p_screen_orient, GetUniqueIDFunc p_get_unique_id, GetSystemDirFunc p_get_sdir_func, VideoPlayFunc p_video_play_func, VideoIsPlayingFunc p_video_is_playing_func, VideoPauseFunc p_video_pause_func, VideoStopFunc p_video_stop_func, SetKeepScreenOnFunc p_set_keep_screen_on_func, AlertFunc p_alert_func, bool p_use_apk_expansion);
 	~OS_Android();
-
 };
 
 #endif