Skip to content
Permalink
Browse files

Minor objective-c code style improvements

  • Loading branch information
slime73 committed Nov 20, 2014
1 parent 650ace8 commit feb2ab1e85e7d78438b00b84d9fc23c288e5650e
@@ -113,7 +113,7 @@ - (void)postFinishLaunch
- (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,
@@ -141,18 +141,18 @@ void UIKit_GL_SwapWindow(_THIS, SDL_Window * window)
}

/* 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 @@ void UIKit_GL_SwapWindow(_THIS, SDL_Window * window)
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) {
@@ -112,8 +112,8 @@ - (id)initWithFrame:(CGRect)frame

eaglLayer.opaque = YES;
eaglLayer.drawableProperties = @{
kEAGLDrawablePropertyRetainedBacking: @(retained),
kEAGLDrawablePropertyColorFormat: colorFormat
kEAGLDrawablePropertyRetainedBacking:@(retained),
kEAGLDrawablePropertyColorFormat:colorFormat
};

/* Set the appropriate scale (for retina display support) */
@@ -52,7 +52,7 @@ @implementation SDL_uikitview {

- (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 @@ - (id)initWithFrame:(CGRect)frame

- (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 @@ - (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
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 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
/* 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 @@ - (void)initializeKeyboard
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 @@ - (BOOL)textField:(UITextField *)_textField shouldChangeCharactersInRange:(NSRan
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;

0 comments on commit feb2ab1

Please sign in to comment.