diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index ac82ff72e..7c6c0a507 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -148,14 +148,14 @@ set(client_HEADERS if(APPLE_IOS) set(client_SRCS ${client_SRCS} CFocusableHelper.cpp - ios/GameChatKeyboardHanlder.m + ios/GameChatKeyboardHandler.m ios/main.m ios/startSDL.mm ios/utils.mm ) set(client_HEADERS ${client_HEADERS} CFocusableHelper.h - ios/GameChatKeyboardHanlder.h + ios/GameChatKeyboardHandler.h ios/startSDL.h ios/utils.h ) diff --git a/client/ios/GameChatKeyboardHanlder.h b/client/ios/GameChatKeyboardHandler.h similarity index 78% rename from client/ios/GameChatKeyboardHanlder.h rename to client/ios/GameChatKeyboardHandler.h index 8f4f8e9c2..76f13a6c9 100644 --- a/client/ios/GameChatKeyboardHanlder.h +++ b/client/ios/GameChatKeyboardHandler.h @@ -1,5 +1,5 @@ /* - * GameChatKeyboardHanlder.h, part of VCMI engine + * GameChatKeyboardHandler.h, part of VCMI engine * * Authors: listed in file AUTHORS in main folder * @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface GameChatKeyboardHanlder : NSObject +@interface GameChatKeyboardHandler : NSObject @property (nonatomic, weak) UITextField * textFieldSDL; diff --git a/client/ios/GameChatKeyboardHanlder.m b/client/ios/GameChatKeyboardHandler.m similarity index 93% rename from client/ios/GameChatKeyboardHanlder.m rename to client/ios/GameChatKeyboardHandler.m index 24336f592..4a3d100be 100644 --- a/client/ios/GameChatKeyboardHanlder.m +++ b/client/ios/GameChatKeyboardHandler.m @@ -1,5 +1,5 @@ /* - * GameChatKeyboardHanlder.m, part of VCMI engine + * GameChatKeyboardHandler.m, part of VCMI engine * * Authors: listed in file AUTHORS in main folder * @@ -8,7 +8,7 @@ * */ -#import "GameChatKeyboardHanlder.h" +#import "GameChatKeyboardHandler.h" #include @@ -32,11 +32,11 @@ static CGRect keyboardFrameBegin(NSNotification * n) { return keyboardFrame(n, U static CGRect keyboardFrameEnd (NSNotification * n) { return keyboardFrame(n, UIKeyboardFrameEndUserInfoKey); } -@interface GameChatKeyboardHanlder () +@interface GameChatKeyboardHandler () @property (nonatomic) BOOL wasChatMessageSent; @end -@implementation GameChatKeyboardHanlder +@implementation GameChatKeyboardHandler - (void)triggerInput { __auto_type notificationCenter = NSNotificationCenter.defaultCenter; @@ -99,7 +99,7 @@ static int watchReturnKey(void * userdata, SDL_Event * event) { if(event->type == SDL_KEYDOWN && event->key.keysym.scancode == SDL_SCANCODE_RETURN) { - __auto_type self = (__bridge GameChatKeyboardHanlder *)userdata; + __auto_type self = (__bridge GameChatKeyboardHandler *)userdata; self.wasChatMessageSent = YES; SDL_DelEventWatch(watchReturnKey, userdata); } diff --git a/client/ios/startSDL.mm b/client/ios/startSDL.mm index 6cf867478..feb03d6ca 100644 --- a/client/ios/startSDL.mm +++ b/client/ios/startSDL.mm @@ -8,7 +8,7 @@ * */ #import "startSDL.h" -#import "GameChatKeyboardHanlder.h" +#import "GameChatKeyboardHandler.h" #include "../Global.h" #include "CMT.h" @@ -23,7 +23,7 @@ #import @interface SDLViewObserver : NSObject -@property (nonatomic, strong) GameChatKeyboardHanlder * gameChatHandler; +@property (nonatomic, strong) GameChatKeyboardHandler * gameChatHandler; @end @implementation SDLViewObserver @@ -131,7 +131,7 @@ int startSDL(int argc, char * argv[], BOOL startManually) { @autoreleasepool { auto observer = [SDLViewObserver new]; - observer.gameChatHandler = [GameChatKeyboardHanlder new]; + observer.gameChatHandler = [GameChatKeyboardHandler new]; id __block sdlWindowCreationObserver = [NSNotificationCenter.defaultCenter addObserverForName:UIWindowDidBecomeKeyNotification object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) { [NSNotificationCenter.defaultCenter removeObserver:sdlWindowCreationObserver];