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/SDLSubscribeButton.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/SDLSubscribeButton.m')
| -rw-r--r-- | SmartDeviceLink/SDLSubscribeButton.m | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/SmartDeviceLink/SDLSubscribeButton.m b/SmartDeviceLink/SDLSubscribeButton.m index 2e3ba5cd7..84e5a488c 100644 --- a/SmartDeviceLink/SDLSubscribeButton.m +++ b/SmartDeviceLink/SDLSubscribeButton.m @@ -7,11 +7,10 @@ #import "SDLButtonName.h" #import "SDLNames.h" - @implementation SDLSubscribeButton - (instancetype)init { - if (self = [super initWithName:NAMES_SubscribeButton]) { + if (self = [super initWithName:SDLNameSubscribeButton]) { } return self; } @@ -29,14 +28,14 @@ - (void)setButtonName:(SDLButtonName *)buttonName { if (buttonName != nil) { - [parameters setObject:buttonName forKey:NAMES_buttonName]; + [parameters setObject:buttonName forKey:SDLNameButtonName]; } else { - [parameters removeObjectForKey:NAMES_buttonName]; + [parameters removeObjectForKey:SDLNameButtonName]; } } - (SDLButtonName *)buttonName { - NSObject *obj = [parameters objectForKey:NAMES_buttonName]; + NSObject *obj = [parameters objectForKey:SDLNameButtonName]; if (obj == nil || [obj isKindOfClass:SDLButtonName.class]) { return (SDLButtonName *)obj; } else { |