summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-07-30 22:53:40 +0200
committerRémi Verschelde <rverschelde@gmail.com>2017-07-30 22:53:40 +0200
commit76005a8e75d4e63ad0477e11dbc8cc1c86666875 (patch)
treee177bf6b716fe267ac39ec3047ff0a2156e0a59b /platform
parent55494073081bd111dc6af8502f77cf344c64b56c (diff)
Style: Apply clang-format on all files
Thus fixing some invalid changes that had still made it to the master branch.
Diffstat (limited to 'platform')
-rw-r--r--platform/iphone/gl_view.mm2
-rw-r--r--platform/iphone/ios.mm2
-rw-r--r--platform/osx/audio_driver_osx.cpp3
3 files changed, 3 insertions, 4 deletions
diff --git a/platform/iphone/gl_view.mm b/platform/iphone/gl_view.mm
index 4b137b7ffa..f2778e8165 100644
--- a/platform/iphone/gl_view.mm
+++ b/platform/iphone/gl_view.mm
@@ -29,8 +29,8 @@
/*************************************************************************/
#import "gl_view.h"
-#include "core/project_settings.h"
#include "core/os/keyboard.h"
+#include "core/project_settings.h"
#include "os_iphone.h"
#include "servers/audio_server.h"
diff --git a/platform/iphone/ios.mm b/platform/iphone/ios.mm
index e9c164393b..6c95903241 100644
--- a/platform/iphone/ios.mm
+++ b/platform/iphone/ios.mm
@@ -36,7 +36,7 @@ void iOS::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_rate_url", "app_id"), &iOS::get_rate_url);
};
-void iOS::alert(const char* p_alert, const char* p_title) {
+void iOS::alert(const char *p_alert, const char *p_title) {
UIAlertView *alert = [[[UIAlertView alloc] initWithTitle:[NSString stringWithUTF8String:p_title] message:[NSString stringWithUTF8String:p_alert] delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil, nil] autorelease];
[alert show];
}
diff --git a/platform/osx/audio_driver_osx.cpp b/platform/osx/audio_driver_osx.cpp
index 05d23a9398..d7a91b1653 100644
--- a/platform/osx/audio_driver_osx.cpp
+++ b/platform/osx/audio_driver_osx.cpp
@@ -257,7 +257,6 @@ AudioDriverOSX::AudioDriverOSX() {
samples_in = NULL;
};
-AudioDriverOSX::~AudioDriverOSX() {
-};
+AudioDriverOSX::~AudioDriverOSX(){};
#endif