Commit 95f30c7a48af4e9d9e20cfa2ac5a1fcfefa2f1c3
2022-01-12T10:12:54
fix compiler warnings in video/uikit
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60
diff --git a/src/video/uikit/SDL_uikitevents.m b/src/video/uikit/SDL_uikitevents.m
index 5253aa7..b7ef0bf 100644
--- a/src/video/uikit/SDL_uikitevents.m
+++ b/src/video/uikit/SDL_uikitevents.m
@@ -87,7 +87,7 @@ static id keyboard_disconnect_observer = nil;
static void OnGCKeyboardConnected(GCKeyboard *keyboard) API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0))
{
keyboard_connected = SDL_TRUE;
- keyboard.keyboardInput.keyChangedHandler = ^(GCKeyboardInput *keyboard, GCControllerButtonInput *key, GCKeyCode keyCode, BOOL pressed)
+ keyboard.keyboardInput.keyChangedHandler = ^(GCKeyboardInput *kbrd, GCControllerButtonInput *key, GCKeyCode keyCode, BOOL pressed)
{
SDL_SendKeyboardKey(pressed ? SDL_PRESSED : SDL_RELEASED, (SDL_Scancode)keyCode);
};
@@ -225,15 +225,15 @@ static void OnGCMouseConnected(GCMouse *mouse) API_AVAILABLE(macos(11.0), ios(14
};
int auxiliary_button = SDL_BUTTON_X1;
- for (GCControllerButtonInput *button in mouse.mouseInput.auxiliaryButtons) {
- button.pressedChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed)
+ for (GCControllerButtonInput *btn in mouse.mouseInput.auxiliaryButtons) {
+ btn.pressedChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed)
{
OnGCMouseButtonChanged(mouseID, auxiliary_button, pressed);
};
++auxiliary_button;
}
- mouse.mouseInput.mouseMovedHandler = ^(GCMouseInput *mouse, float deltaX, float deltaY)
+ mouse.mouseInput.mouseMovedHandler = ^(GCMouseInput *mouseInput, float deltaX, float deltaY)
{
if (SDL_GCMouseRelativeMode()) {
SDL_SendMouseMotion(SDL_GetMouseFocus(), mouseID, 1, (int)deltaX, -(int)deltaY);
diff --git a/src/video/uikit/SDL_uikitmessagebox.m b/src/video/uikit/SDL_uikitmessagebox.m
index 7aecea8..fdc20c0 100644
--- a/src/video/uikit/SDL_uikitmessagebox.m
+++ b/src/video/uikit/SDL_uikitmessagebox.m
@@ -86,7 +86,7 @@ UIKit_ShowMessageBoxAlertController(const SDL_MessageBoxData *messageboxdata, in
action = [UIAlertAction actionWithTitle:@(sdlButton->text)
style:style
- handler:^(UIAlertAction *action) {
+ handler:^(UIAlertAction *alertAction) {
clickedindex = (int)(sdlButton - messageboxdata->buttons);
}];
[alert addAction:action];
diff --git a/src/video/uikit/SDL_uikitopengles.m b/src/video/uikit/SDL_uikitopengles.m
index 8722dca..86fefd7 100644
--- a/src/video/uikit/SDL_uikitopengles.m
+++ b/src/video/uikit/SDL_uikitopengles.m
@@ -162,8 +162,8 @@ UIKit_GL_CreateContext(_THIS, SDL_Window * window)
}
if (_this->gl_config.share_with_current_context) {
- EAGLContext *context = (__bridge EAGLContext *) SDL_GL_GetCurrentContext();
- sharegroup = context.sharegroup;
+ EAGLContext *currContext = (__bridge EAGLContext *) SDL_GL_GetCurrentContext();
+ sharegroup = currContext.sharegroup;
}
if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {