diff options
Diffstat (limited to 'SmartDeviceLink/SDLChangeRegistration.m')
| -rw-r--r-- | SmartDeviceLink/SDLChangeRegistration.m | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/SmartDeviceLink/SDLChangeRegistration.m b/SmartDeviceLink/SDLChangeRegistration.m index 6d5c2bb4b..828653a39 100644 --- a/SmartDeviceLink/SDLChangeRegistration.m +++ b/SmartDeviceLink/SDLChangeRegistration.m @@ -5,7 +5,8 @@ #import "SDLChangeRegistration.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLTTSChunk.h" NS_ASSUME_NONNULL_BEGIN @@ -13,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLChangeRegistration - (instancetype)init { - if (self = [super initWithName:SDLNameChangeRegistration]) { + if (self = [super initWithName:SDLRPCFunctionNameChangeRegistration]) { } return self; } @@ -44,51 +45,53 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setLanguage:(SDLLanguage)language { - [parameters sdl_setObject:language forName:SDLNameLanguage]; + [parameters sdl_setObject:language forName:SDLRPCParameterNameLanguage]; } - (SDLLanguage)language { - return [parameters sdl_objectForName:SDLNameLanguage]; + NSError *error = nil; + return [parameters sdl_enumForName:SDLRPCParameterNameLanguage error:&error]; } - (void)setHmiDisplayLanguage:(SDLLanguage )hmiDisplayLanguage { - [parameters sdl_setObject:hmiDisplayLanguage forName:SDLNameHMIDisplayLanguage]; + [parameters sdl_setObject:hmiDisplayLanguage forName:SDLRPCParameterNameHMIDisplayLanguage]; } - (SDLLanguage)hmiDisplayLanguage { - return [parameters sdl_objectForName:SDLNameHMIDisplayLanguage]; + NSError *error = nil; + return [parameters sdl_enumForName:SDLRPCParameterNameHMIDisplayLanguage error:&error]; } - (void)setAppName:(nullable NSString *)appName { - [parameters sdl_setObject:appName forName:SDLNameAppName]; + [parameters sdl_setObject:appName forName:SDLRPCParameterNameAppName]; } - (nullable NSString *)appName { - return [[parameters sdl_objectForName:SDLNameAppName] copy]; + return [[parameters sdl_objectForName:SDLRPCParameterNameAppName ofClass:NSString.class error:nil] copy]; } - (void)setTtsName:(nullable NSArray<SDLTTSChunk *> *)ttsName { - [parameters sdl_setObject:ttsName forName:SDLNameTTSName]; + [parameters sdl_setObject:ttsName forName:SDLRPCParameterNameTTSName]; } - (nullable NSArray<SDLTTSChunk *> *)ttsName { - return [parameters sdl_objectsForName:SDLNameTTSName ofClass:SDLTTSChunk.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameTTSName ofClass:SDLTTSChunk.class error:nil]; } - (void)setNgnMediaScreenAppName:(nullable NSString *)ngnMediaScreenAppName { - [parameters sdl_setObject:ngnMediaScreenAppName forName:SDLNameNGNMediaScreenAppName]; + [parameters sdl_setObject:ngnMediaScreenAppName forName:SDLRPCParameterNameNGNMediaScreenAppName]; } - (nullable NSString *)ngnMediaScreenAppName { - return [parameters sdl_objectForName:SDLNameNGNMediaScreenAppName]; + return [parameters sdl_objectForName:SDLRPCParameterNameNGNMediaScreenAppName ofClass:NSString.class error:nil]; } - (void)setVrSynonyms:(nullable NSArray<NSString *> *)vrSynonyms { - [parameters sdl_setObject:vrSynonyms forName:SDLNameVRSynonyms]; + [parameters sdl_setObject:vrSynonyms forName:SDLRPCParameterNameVRSynonyms]; } - (nullable NSArray<NSString *> *)vrSynonyms { - return [parameters sdl_objectForName:SDLNameVRSynonyms]; + return [parameters sdl_objectsForName:SDLRPCParameterNameVRSynonyms ofClass:NSString.class error:nil]; } @end |