Minor objective-c code style improvements iOS-improvements
authorAlex Szpakowski <slime73@gmail.com>
Thu, 20 Nov 2014 18:45:04 -0400
branchiOS-improvements
changeset 9524 9de159f9cefd
parent 9523 9cbd69cac7ed
child 9525 64e3f446d6d7
Minor objective-c code style improvements
src/video/uikit/SDL_uikitappdelegate.m
src/video/uikit/SDL_uikitopengles.m
src/video/uikit/SDL_uikitopenglview.m
src/video/uikit/SDL_uikitview.m
--- a/src/video/uikit/SDL_uikitappdelegate.m	Thu Nov 20 17:19:26 2014 -0400
+++ b/src/video/uikit/SDL_uikitappdelegate.m	Thu Nov 20 18:45:04 2014 -0400
@@ -113,7 +113,7 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     /* Set working directory to resource path */
-    [[NSFileManager defaultManager] changeCurrentDirectoryPath: [[NSBundle mainBundle] resourcePath]];
+    [[NSFileManager defaultManager] changeCurrentDirectoryPath:[[NSBundle mainBundle] resourcePath]];
 
     /* register a callback for the idletimer hint */
     SDL_AddHintCallback(SDL_HINT_IDLE_TIMER_DISABLED,
--- a/src/video/uikit/SDL_uikitopengles.m	Thu Nov 20 17:19:26 2014 -0400
+++ b/src/video/uikit/SDL_uikitopengles.m	Thu Nov 20 18:45:04 2014 -0400
@@ -141,18 +141,18 @@
         }
 
         /* construct our view, passing in SDL's OpenGL configuration data */
-        view = [[SDL_uikitopenglview alloc] initWithFrame: frame
-                                                    scale: scale
-                                            retainBacking: _this->gl_config.retained_backing
-                                                    rBits: _this->gl_config.red_size
-                                                    gBits: _this->gl_config.green_size
-                                                    bBits: _this->gl_config.blue_size
-                                                    aBits: _this->gl_config.alpha_size
-                                                depthBits: _this->gl_config.depth_size
-                                              stencilBits: _this->gl_config.stencil_size
-                                                     sRGB: _this->gl_config.framebuffer_srgb_capable
-                                             majorVersion: _this->gl_config.major_version
-                                               shareGroup: share_group];
+        view = [[SDL_uikitopenglview alloc] initWithFrame:frame
+                                                    scale:scale
+                                            retainBacking:_this->gl_config.retained_backing
+                                                    rBits:_this->gl_config.red_size
+                                                    gBits:_this->gl_config.green_size
+                                                    bBits:_this->gl_config.blue_size
+                                                    aBits:_this->gl_config.alpha_size
+                                                depthBits:_this->gl_config.depth_size
+                                              stencilBits:_this->gl_config.stencil_size
+                                                     sRGB:_this->gl_config.framebuffer_srgb_capable
+                                             majorVersion:_this->gl_config.major_version
+                                               shareGroup:share_group];
         if (!view) {
             return NULL;
         }
@@ -162,7 +162,7 @@
         if (view.viewcontroller != nil) {
             view.viewcontroller.view = view;
         }
-        [uiwindow addSubview: view];
+        [uiwindow addSubview:view];
 
         /* The view controller needs to be the root in order to control rotation on iOS 6.0 */
         if (uiwindow.rootViewController == nil) {
--- a/src/video/uikit/SDL_uikitopenglview.m	Thu Nov 20 17:19:26 2014 -0400
+++ b/src/video/uikit/SDL_uikitopenglview.m	Thu Nov 20 18:45:04 2014 -0400
@@ -112,8 +112,8 @@
 
         eaglLayer.opaque = YES;
         eaglLayer.drawableProperties = @{
-            kEAGLDrawablePropertyRetainedBacking: @(retained),
-            kEAGLDrawablePropertyColorFormat: colorFormat
+            kEAGLDrawablePropertyRetainedBacking:@(retained),
+            kEAGLDrawablePropertyColorFormat:colorFormat
         };
 
         /* Set the appropriate scale (for retina display support) */
--- a/src/video/uikit/SDL_uikitview.m	Thu Nov 20 17:19:26 2014 -0400
+++ b/src/video/uikit/SDL_uikitview.m	Thu Nov 20 18:45:04 2014 -0400
@@ -52,7 +52,7 @@
 
 - (id)initWithFrame:(CGRect)frame
 {
-    if (self = [super initWithFrame: frame]) {
+    if (self = [super initWithFrame:frame]) {
 #if SDL_IPHONE_KEYBOARD
         [self initializeKeyboard];
 #endif
@@ -69,7 +69,7 @@
 
 - (CGPoint)touchLocation:(UITouch *)touch shouldNormalize:(BOOL)normalize
 {
-    CGPoint point = [touch locationInView: self];
+    CGPoint point = [touch locationInView:self];
 
     if (normalize) {
         CGRect bounds = self.bounds;
@@ -123,7 +123,7 @@
         at once, or perhaps in other circumstances.  Usually (it seems)
         all active touches are canceled.
     */
-    [self touchesEnded: touches withEvent: event];
+    [self touchesEnded:touches withEvent:event];
 }
 
 - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
@@ -154,7 +154,7 @@
 /* Set ourselves up as a UITextFieldDelegate */
 - (void)initializeKeyboard
 {
-    textField = [[UITextField alloc] initWithFrame: CGRectZero];
+    textField = [[UITextField alloc] initWithFrame:CGRectZero];
     textField.delegate = self;
     /* placeholder so there is something to delete! */
     textField.text = @" ";
@@ -171,7 +171,7 @@
     textField.hidden = YES;
     keyboardVisible = NO;
     /* add the UITextField (hidden) to our view */
-    [self addSubview: textField];
+    [self addSubview:textField];
     
     _uikit_keyboard_init();
 }
@@ -204,7 +204,7 @@
         int i;
         for (i = 0; i < [string length]; i++) {
 
-            unichar c = [string characterAtIndex: i];
+            unichar c = [string characterAtIndex:i];
 
             Uint16 mod = 0;
             SDL_Scancode code;