diff options
author | Joel Fischer <joeljfischer@gmail.com> | 2016-09-30 10:22:39 -0400 |
---|---|---|
committer | Joel Fischer <joeljfischer@gmail.com> | 2016-09-30 10:22:39 -0400 |
commit | 5f956e3a5240ee18e0b91681e2f7bb962a0c23c5 (patch) | |
tree | 6ec55ead711ce2805c5388fe61b6b451db064f7d /SmartDeviceLink/SDLOnKeyboardInput.m | |
parent | 41abf01feb2d1103ce2d98392b0713e135d3d4fe (diff) | |
parent | 8e68144a2ca0f21549da818ebd8ac58c7f248e2d (diff) | |
download | sdl_ios-5f956e3a5240ee18e0b91681e2f7bb962a0c23c5.tar.gz |
Merge branch 'develop' into feature/issue_151_struct_dictionary_init
# Conflicts:
# SmartDeviceLink/SDLRPCStruct.m
Diffstat (limited to 'SmartDeviceLink/SDLOnKeyboardInput.m')
-rw-r--r-- | SmartDeviceLink/SDLOnKeyboardInput.m | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/SmartDeviceLink/SDLOnKeyboardInput.m b/SmartDeviceLink/SDLOnKeyboardInput.m index 4ba935d57..de1ab0722 100644 --- a/SmartDeviceLink/SDLOnKeyboardInput.m +++ b/SmartDeviceLink/SDLOnKeyboardInput.m @@ -6,25 +6,24 @@ #import "SDLKeyboardEvent.h" #import "SDLNames.h" - @implementation SDLOnKeyboardInput - (instancetype)init { - if (self = [super initWithName:NAMES_OnKeyboardInput]) { + if (self = [super initWithName:SDLNameOnKeyboardInput]) { } return self; } - (void)setEvent:(SDLKeyboardEvent *)event { if (event != nil) { - [parameters setObject:event forKey:NAMES_event]; + [parameters setObject:event forKey:SDLNameEvent]; } else { - [parameters removeObjectForKey:NAMES_event]; + [parameters removeObjectForKey:SDLNameEvent]; } } - (SDLKeyboardEvent *)event { - NSObject *obj = [parameters objectForKey:NAMES_event]; + NSObject *obj = [parameters objectForKey:SDLNameEvent]; if (obj == nil || [obj isKindOfClass:SDLKeyboardEvent.class]) { return (SDLKeyboardEvent *)obj; } else { @@ -34,14 +33,14 @@ - (void)setData:(NSString *)data { if (data != nil) { - [parameters setObject:data forKey:NAMES_data]; + [parameters setObject:data forKey:SDLNameData]; } else { - [parameters removeObjectForKey:NAMES_data]; + [parameters removeObjectForKey:SDLNameData]; } } - (NSString *)data { - return [parameters objectForKey:NAMES_data]; + return [parameters objectForKey:SDLNameData]; } @end |