diff options
276 files changed, 3865 insertions, 3389 deletions
diff --git a/.xctool-args b/.xctool-args index 27942e3b9..5daa7d5f4 100644 --- a/.xctool-args +++ b/.xctool-args @@ -1,6 +1,6 @@ [ "-project", "SmartDeviceLink-iOS.xcodeproj", - "-scheme", "SmartDeviceLink", + "-scheme", "SmartDeviceLinkTests", "-sdk", "iphonesimulator", "ONLY_ACTIVE_ARCH=NO", "RUN_CLANG_STATIC_ANALYZER=NO" diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj index b846cc4d5..09b74d4ad 100644 --- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj +++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj @@ -505,7 +505,7 @@ 5D61FCF91A84238C00846EE7 /* SDLMenuParams.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FB0C1A84238A00846EE7 /* SDLMenuParams.m */; }; 5D61FCFA1A84238C00846EE7 /* SDLMyKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FB0D1A84238A00846EE7 /* SDLMyKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D61FCFB1A84238C00846EE7 /* SDLMyKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FB0E1A84238A00846EE7 /* SDLMyKey.m */; }; - 5D61FCFC1A84238C00846EE7 /* SDLNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FB0F1A84238A00846EE7 /* SDLNames.h */; }; + 5D61FCFC1A84238C00846EE7 /* SDLNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FB0F1A84238A00846EE7 /* SDLNames.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D61FCFD1A84238C00846EE7 /* SDLObjectWithPriority.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FB101A84238A00846EE7 /* SDLObjectWithPriority.h */; }; 5D61FCFE1A84238C00846EE7 /* SDLObjectWithPriority.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FB111A84238A00846EE7 /* SDLObjectWithPriority.m */; }; 5D61FCFF1A84238C00846EE7 /* SDLOnAppInterfaceUnregistered.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FB121A84238B00846EE7 /* SDLOnAppInterfaceUnregistered.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -895,6 +895,7 @@ DA4353EA1D2721680099B8C4 /* SDLTouchManagerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4353E71D2721680099B8C4 /* SDLTouchManagerSpec.m */; }; DA4353EB1D2721680099B8C4 /* SDLTouchSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4353E81D2721680099B8C4 /* SDLTouchSpec.m */; }; DA96C0661D4D4F730022F520 /* SDLAppInfoSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA96C0651D4D4F730022F520 /* SDLAppInfoSpec.m */; }; + DAB5378A1D9319E8008EB556 /* SDLNames.m in Sources */ = {isa = PBXBuildFile; fileRef = DAB537891D9319E8008EB556 /* SDLNames.m */; }; DAC572571D1067270004288B /* SDLTouchManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DAC572551D1067270004288B /* SDLTouchManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; DAC572581D1067270004288B /* SDLTouchManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DAC572561D1067270004288B /* SDLTouchManager.m */; }; DAC5725B1D10B81E0004288B /* SDLTouch.m in Sources */ = {isa = PBXBuildFile; fileRef = DAC572591D10B81E0004288B /* SDLTouch.m */; }; @@ -1881,6 +1882,7 @@ DA4353E71D2721680099B8C4 /* SDLTouchManagerSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLTouchManagerSpec.m; path = UtilitiesSpecs/Touches/SDLTouchManagerSpec.m; sourceTree = "<group>"; }; DA4353E81D2721680099B8C4 /* SDLTouchSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLTouchSpec.m; path = UtilitiesSpecs/Touches/SDLTouchSpec.m; sourceTree = "<group>"; }; DA96C0651D4D4F730022F520 /* SDLAppInfoSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAppInfoSpec.m; sourceTree = "<group>"; }; + DAB537891D9319E8008EB556 /* SDLNames.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLNames.m; sourceTree = "<group>"; }; DAC572551D1067270004288B /* SDLTouchManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTouchManager.h; sourceTree = "<group>"; }; DAC572561D1067270004288B /* SDLTouchManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTouchManager.m; sourceTree = "<group>"; }; DAC572591D10B81E0004288B /* SDLTouch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTouch.m; sourceTree = "<group>"; }; @@ -2960,6 +2962,7 @@ E9C32B8E1AB20BA200F283AF /* SDLTimer.h */, E9C32B8F1AB20BA200F283AF /* SDLTimer.m */, 5D61FB0F1A84238A00846EE7 /* SDLNames.h */, + DAB537891D9319E8008EB556 /* SDLNames.m */, 5D535DC31B72473800CF7760 /* SDLGlobals.h */, 5D535DC41B72473800CF7760 /* SDLGlobals.m */, ); @@ -4334,6 +4337,7 @@ 5D61FE001A84238C00846EE7 /* SDLVehicleDataEventStatus.m in Sources */, 5D61FDC41A84238C00846EE7 /* SDLTBTState.m in Sources */, 5D61FDA61A84238C00846EE7 /* SDLSpeak.m in Sources */, + DAB5378A1D9319E8008EB556 /* SDLNames.m in Sources */, 5D61FDDE1A84238C00846EE7 /* SDLTTSChunk.m in Sources */, 5D61FD9E1A84238C00846EE7 /* SDLSliderResponse.m in Sources */, 5D61FC5C1A84238C00846EE7 /* SDLChangeRegistration.m in Sources */, diff --git a/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink/SDLAddCommand.m index a264d164a..576065ee1 100644 --- a/SmartDeviceLink/SDLAddCommand.m +++ b/SmartDeviceLink/SDLAddCommand.m @@ -6,13 +6,13 @@ #import "SDLImage.h" #import "SDLMenuParams.h" -#import "SDLNames.h" + @implementation SDLAddCommand - (instancetype)init { - if (self = [super initWithName:NAMES_AddCommand]) { + if (self = [super initWithName:SDLNameAddCommand]) { } return self; } @@ -36,26 +36,26 @@ - (void)setCmdID:(NSNumber *)cmdID { if (cmdID != nil) { - [parameters setObject:cmdID forKey:NAMES_cmdID]; + [parameters setObject:cmdID forKey:SDLNameCommandId]; } else { - [parameters removeObjectForKey:NAMES_cmdID]; + [parameters removeObjectForKey:SDLNameCommandId]; } } - (NSNumber *)cmdID { - return [parameters objectForKey:NAMES_cmdID]; + return [parameters objectForKey:SDLNameCommandId]; } - (void)setMenuParams:(SDLMenuParams *)menuParams { if (menuParams != nil) { - [parameters setObject:menuParams forKey:NAMES_menuParams]; + [parameters setObject:menuParams forKey:SDLNameMenuParams]; } else { - [parameters removeObjectForKey:NAMES_menuParams]; + [parameters removeObjectForKey:SDLNameMenuParams]; } } - (SDLMenuParams *)menuParams { - NSObject *obj = [parameters objectForKey:NAMES_menuParams]; + NSObject *obj = [parameters objectForKey:SDLNameMenuParams]; if (obj == nil || [obj isKindOfClass:SDLMenuParams.class]) { return (SDLMenuParams *)obj; } else { @@ -65,26 +65,26 @@ - (void)setVrCommands:(NSMutableArray *)vrCommands { if (vrCommands != nil) { - [parameters setObject:vrCommands forKey:NAMES_vrCommands]; + [parameters setObject:vrCommands forKey:SDLNameVrCommands]; } else { - [parameters removeObjectForKey:NAMES_vrCommands]; + [parameters removeObjectForKey:SDLNameVrCommands]; } } - (NSMutableArray *)vrCommands { - return [parameters objectForKey:NAMES_vrCommands]; + return [parameters objectForKey:SDLNameVrCommands]; } - (void)setCmdIcon:(SDLImage *)cmdIcon { if (cmdIcon != nil) { - [parameters setObject:cmdIcon forKey:NAMES_cmdIcon]; + [parameters setObject:cmdIcon forKey:SDLNameCommandIcon]; } else { - [parameters removeObjectForKey:NAMES_cmdIcon]; + [parameters removeObjectForKey:SDLNameCommandIcon]; } } - (SDLImage *)cmdIcon { - NSObject *obj = [parameters objectForKey:NAMES_cmdIcon]; + NSObject *obj = [parameters objectForKey:SDLNameCommandIcon]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { diff --git a/SmartDeviceLink/SDLAddCommandResponse.m b/SmartDeviceLink/SDLAddCommandResponse.m index 3beba9db6..7728f3f29 100644 --- a/SmartDeviceLink/SDLAddCommandResponse.m +++ b/SmartDeviceLink/SDLAddCommandResponse.m @@ -2,12 +2,12 @@ #import "SDLAddCommandResponse.h" -#import "SDLNames.h" + @implementation SDLAddCommandResponse - (instancetype)init { - if (self = [super initWithName:NAMES_AddCommand]) { + if (self = [super initWithName:SDLNameAddCommand]) { } return self; } diff --git a/SmartDeviceLink/SDLAddSubMenu.m b/SmartDeviceLink/SDLAddSubMenu.m index f02192b00..027be936f 100644 --- a/SmartDeviceLink/SDLAddSubMenu.m +++ b/SmartDeviceLink/SDLAddSubMenu.m @@ -2,12 +2,12 @@ #import "SDLAddSubMenu.h" -#import "SDLNames.h" + @implementation SDLAddSubMenu - (instancetype)init { - if (self = [super initWithName:NAMES_AddSubMenu]) { + if (self = [super initWithName:SDLNameAddSubMenu]) { } return self; } @@ -20,38 +20,38 @@ - (void)setMenuID:(NSNumber *)menuID { if (menuID != nil) { - [parameters setObject:menuID forKey:NAMES_menuID]; + [parameters setObject:menuID forKey:SDLNameMenuId]; } else { - [parameters removeObjectForKey:NAMES_menuID]; + [parameters removeObjectForKey:SDLNameMenuId]; } } - (NSNumber *)menuID { - return [parameters objectForKey:NAMES_menuID]; + return [parameters objectForKey:SDLNameMenuId]; } - (void)setPosition:(NSNumber *)position { if (position != nil) { - [parameters setObject:position forKey:NAMES_position]; + [parameters setObject:position forKey:SDLNamePosition]; } else { - [parameters removeObjectForKey:NAMES_position]; + [parameters removeObjectForKey:SDLNamePosition]; } } - (NSNumber *)position { - return [parameters objectForKey:NAMES_position]; + return [parameters objectForKey:SDLNamePosition]; } - (void)setMenuName:(NSString *)menuName { if (menuName != nil) { - [parameters setObject:menuName forKey:NAMES_menuName]; + [parameters setObject:menuName forKey:SDLNameMenuName]; } else { - [parameters removeObjectForKey:NAMES_menuName]; + [parameters removeObjectForKey:SDLNameMenuName]; } } - (NSString *)menuName { - return [parameters objectForKey:NAMES_menuName]; + return [parameters objectForKey:SDLNameMenuName]; } @end diff --git a/SmartDeviceLink/SDLAddSubMenuResponse.m b/SmartDeviceLink/SDLAddSubMenuResponse.m index 5df2745b5..beb587057 100644 --- a/SmartDeviceLink/SDLAddSubMenuResponse.m +++ b/SmartDeviceLink/SDLAddSubMenuResponse.m @@ -2,12 +2,12 @@ #import "SDLAddSubMenuResponse.h" -#import "SDLNames.h" + @implementation SDLAddSubMenuResponse - (instancetype)init { - if (self = [super initWithName:NAMES_AddSubMenu]) { + if (self = [super initWithName:SDLNameAddSubMenu]) { } return self; } diff --git a/SmartDeviceLink/SDLAirbagStatus.m b/SmartDeviceLink/SDLAirbagStatus.m index a3ce06689..77f7db7e7 100644 --- a/SmartDeviceLink/SDLAirbagStatus.m +++ b/SmartDeviceLink/SDLAirbagStatus.m @@ -2,7 +2,7 @@ #import "SDLAirbagStatus.h" -#import "SDLNames.h" + #import "SDLVehicleDataEventStatus.h" @@ -22,14 +22,14 @@ - (void)setDriverAirbagDeployed:(SDLVehicleDataEventStatus *)driverAirbagDeployed { if (driverAirbagDeployed != nil) { - [store setObject:driverAirbagDeployed forKey:NAMES_driverAirbagDeployed]; + [store setObject:driverAirbagDeployed forKey:SDLNameDriverAirbagDeployed]; } else { - [store removeObjectForKey:NAMES_driverAirbagDeployed]; + [store removeObjectForKey:SDLNameDriverAirbagDeployed]; } } - (SDLVehicleDataEventStatus *)driverAirbagDeployed { - NSObject *obj = [store objectForKey:NAMES_driverAirbagDeployed]; + NSObject *obj = [store objectForKey:SDLNameDriverAirbagDeployed]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -39,14 +39,14 @@ - (void)setDriverSideAirbagDeployed:(SDLVehicleDataEventStatus *)driverSideAirbagDeployed { if (driverSideAirbagDeployed != nil) { - [store setObject:driverSideAirbagDeployed forKey:NAMES_driverSideAirbagDeployed]; + [store setObject:driverSideAirbagDeployed forKey:SDLNameDriverSideAirbagDeployed]; } else { - [store removeObjectForKey:NAMES_driverSideAirbagDeployed]; + [store removeObjectForKey:SDLNameDriverSideAirbagDeployed]; } } - (SDLVehicleDataEventStatus *)driverSideAirbagDeployed { - NSObject *obj = [store objectForKey:NAMES_driverSideAirbagDeployed]; + NSObject *obj = [store objectForKey:SDLNameDriverSideAirbagDeployed]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -56,14 +56,14 @@ - (void)setDriverCurtainAirbagDeployed:(SDLVehicleDataEventStatus *)driverCurtainAirbagDeployed { if (driverCurtainAirbagDeployed != nil) { - [store setObject:driverCurtainAirbagDeployed forKey:NAMES_driverCurtainAirbagDeployed]; + [store setObject:driverCurtainAirbagDeployed forKey:SDLNameDriverCurtainAirbagDeployed]; } else { - [store removeObjectForKey:NAMES_driverCurtainAirbagDeployed]; + [store removeObjectForKey:SDLNameDriverCurtainAirbagDeployed]; } } - (SDLVehicleDataEventStatus *)driverCurtainAirbagDeployed { - NSObject *obj = [store objectForKey:NAMES_driverCurtainAirbagDeployed]; + NSObject *obj = [store objectForKey:SDLNameDriverCurtainAirbagDeployed]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -73,14 +73,14 @@ - (void)setPassengerAirbagDeployed:(SDLVehicleDataEventStatus *)passengerAirbagDeployed { if (passengerAirbagDeployed != nil) { - [store setObject:passengerAirbagDeployed forKey:NAMES_passengerAirbagDeployed]; + [store setObject:passengerAirbagDeployed forKey:SDLNamePassengerAirbagDeployed]; } else { - [store removeObjectForKey:NAMES_passengerAirbagDeployed]; + [store removeObjectForKey:SDLNamePassengerAirbagDeployed]; } } - (SDLVehicleDataEventStatus *)passengerAirbagDeployed { - NSObject *obj = [store objectForKey:NAMES_passengerAirbagDeployed]; + NSObject *obj = [store objectForKey:SDLNamePassengerAirbagDeployed]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -90,14 +90,14 @@ - (void)setPassengerCurtainAirbagDeployed:(SDLVehicleDataEventStatus *)passengerCurtainAirbagDeployed { if (passengerCurtainAirbagDeployed != nil) { - [store setObject:passengerCurtainAirbagDeployed forKey:NAMES_passengerCurtainAirbagDeployed]; + [store setObject:passengerCurtainAirbagDeployed forKey:SDLNamePassengerCurtainAirbagDeployed]; } else { - [store removeObjectForKey:NAMES_passengerCurtainAirbagDeployed]; + [store removeObjectForKey:SDLNamePassengerCurtainAirbagDeployed]; } } - (SDLVehicleDataEventStatus *)passengerCurtainAirbagDeployed { - NSObject *obj = [store objectForKey:NAMES_passengerCurtainAirbagDeployed]; + NSObject *obj = [store objectForKey:SDLNamePassengerCurtainAirbagDeployed]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -107,14 +107,14 @@ - (void)setDriverKneeAirbagDeployed:(SDLVehicleDataEventStatus *)driverKneeAirbagDeployed { if (driverKneeAirbagDeployed != nil) { - [store setObject:driverKneeAirbagDeployed forKey:NAMES_driverKneeAirbagDeployed]; + [store setObject:driverKneeAirbagDeployed forKey:SDLNameDriverKneeAirbagDeployed]; } else { - [store removeObjectForKey:NAMES_driverKneeAirbagDeployed]; + [store removeObjectForKey:SDLNameDriverKneeAirbagDeployed]; } } - (SDLVehicleDataEventStatus *)driverKneeAirbagDeployed { - NSObject *obj = [store objectForKey:NAMES_driverKneeAirbagDeployed]; + NSObject *obj = [store objectForKey:SDLNameDriverKneeAirbagDeployed]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -124,14 +124,14 @@ - (void)setPassengerSideAirbagDeployed:(SDLVehicleDataEventStatus *)passengerSideAirbagDeployed { if (passengerSideAirbagDeployed != nil) { - [store setObject:passengerSideAirbagDeployed forKey:NAMES_passengerSideAirbagDeployed]; + [store setObject:passengerSideAirbagDeployed forKey:SDLNamePassengerSideAirbagDeployed]; } else { - [store removeObjectForKey:NAMES_passengerSideAirbagDeployed]; + [store removeObjectForKey:SDLNamePassengerSideAirbagDeployed]; } } - (SDLVehicleDataEventStatus *)passengerSideAirbagDeployed { - NSObject *obj = [store objectForKey:NAMES_passengerSideAirbagDeployed]; + NSObject *obj = [store objectForKey:SDLNamePassengerSideAirbagDeployed]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -141,14 +141,14 @@ - (void)setPassengerKneeAirbagDeployed:(SDLVehicleDataEventStatus *)passengerKneeAirbagDeployed { if (passengerKneeAirbagDeployed != nil) { - [store setObject:passengerKneeAirbagDeployed forKey:NAMES_passengerKneeAirbagDeployed]; + [store setObject:passengerKneeAirbagDeployed forKey:SDLNamePassengerKneeAirbagDeployed]; } else { - [store removeObjectForKey:NAMES_passengerKneeAirbagDeployed]; + [store removeObjectForKey:SDLNamePassengerKneeAirbagDeployed]; } } - (SDLVehicleDataEventStatus *)passengerKneeAirbagDeployed { - NSObject *obj = [store objectForKey:NAMES_passengerKneeAirbagDeployed]; + NSObject *obj = [store objectForKey:SDLNamePassengerKneeAirbagDeployed]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m index ddc7fdc3a..bd86192ba 100644 --- a/SmartDeviceLink/SDLAlert.m +++ b/SmartDeviceLink/SDLAlert.m @@ -2,14 +2,14 @@ #import "SDLAlert.h" -#import "SDLNames.h" + #import "SDLSoftButton.h" #import "SDLTTSChunk.h" @implementation SDLAlert - (instancetype)init { - if (self = [super initWithName:NAMES_Alert]) { + if (self = [super initWithName:SDLNameAlert]) { } return self; } @@ -22,50 +22,50 @@ - (void)setAlertText1:(NSString *)alertText1 { if (alertText1 != nil) { - [parameters setObject:alertText1 forKey:NAMES_alertText1]; + [parameters setObject:alertText1 forKey:SDLNameAlertText1]; } else { - [parameters removeObjectForKey:NAMES_alertText1]; + [parameters removeObjectForKey:SDLNameAlertText1]; } } - (NSString *)alertText1 { - return [parameters objectForKey:NAMES_alertText1]; + return [parameters objectForKey:SDLNameAlertText1]; } - (void)setAlertText2:(NSString *)alertText2 { if (alertText2 != nil) { - [parameters setObject:alertText2 forKey:NAMES_alertText2]; + [parameters setObject:alertText2 forKey:SDLNameAlertText2]; } else { - [parameters removeObjectForKey:NAMES_alertText2]; + [parameters removeObjectForKey:SDLNameAlertText2]; } } - (NSString *)alertText2 { - return [parameters objectForKey:NAMES_alertText2]; + return [parameters objectForKey:SDLNameAlertText2]; } - (void)setAlertText3:(NSString *)alertText3 { if (alertText3 != nil) { - [parameters setObject:alertText3 forKey:NAMES_alertText3]; + [parameters setObject:alertText3 forKey:SDLNameAlertText3]; } else { - [parameters removeObjectForKey:NAMES_alertText3]; + [parameters removeObjectForKey:SDLNameAlertText3]; } } - (NSString *)alertText3 { - return [parameters objectForKey:NAMES_alertText3]; + return [parameters objectForKey:SDLNameAlertText3]; } - (void)setTtsChunks:(NSMutableArray *)ttsChunks { if (ttsChunks != nil) { - [parameters setObject:ttsChunks forKey:NAMES_ttsChunks]; + [parameters setObject:ttsChunks forKey:SDLNameTtsChunks]; } else { - [parameters removeObjectForKey:NAMES_ttsChunks]; + [parameters removeObjectForKey:SDLNameTtsChunks]; } } - (NSMutableArray *)ttsChunks { - NSMutableArray *array = [parameters objectForKey:NAMES_ttsChunks]; + NSMutableArray *array = [parameters objectForKey:SDLNameTtsChunks]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { @@ -79,50 +79,50 @@ - (void)setDuration:(NSNumber *)duration { if (duration != nil) { - [parameters setObject:duration forKey:NAMES_duration]; + [parameters setObject:duration forKey:SDLNameDuration]; } else { - [parameters removeObjectForKey:NAMES_duration]; + [parameters removeObjectForKey:SDLNameDuration]; } } - (NSNumber *)duration { - return [parameters objectForKey:NAMES_duration]; + return [parameters objectForKey:SDLNameDuration]; } - (void)setPlayTone:(NSNumber *)playTone { if (playTone != nil) { - [parameters setObject:playTone forKey:NAMES_playTone]; + [parameters setObject:playTone forKey:SDLNamePlayTone]; } else { - [parameters removeObjectForKey:NAMES_playTone]; + [parameters removeObjectForKey:SDLNamePlayTone]; } } - (NSNumber *)playTone { - return [parameters objectForKey:NAMES_playTone]; + return [parameters objectForKey:SDLNamePlayTone]; } - (void)setProgressIndicator:(NSNumber *)progressIndicator { if (progressIndicator != nil) { - [parameters setObject:progressIndicator forKey:NAMES_progressIndicator]; + [parameters setObject:progressIndicator forKey:SDLNameProgressIndicator]; } else { - [parameters removeObjectForKey:NAMES_progressIndicator]; + [parameters removeObjectForKey:SDLNameProgressIndicator]; } } - (NSNumber *)progressIndicator { - return [parameters objectForKey:NAMES_progressIndicator]; + return [parameters objectForKey:SDLNameProgressIndicator]; } - (void)setSoftButtons:(NSMutableArray *)softButtons { if (softButtons != nil) { - [parameters setObject:softButtons forKey:NAMES_softButtons]; + [parameters setObject:softButtons forKey:SDLNameSoftButtons]; } else { - [parameters removeObjectForKey:NAMES_softButtons]; + [parameters removeObjectForKey:SDLNameSoftButtons]; } } - (NSMutableArray *)softButtons { - NSMutableArray *array = [parameters objectForKey:NAMES_softButtons]; + NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtons]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) { return array; } else { diff --git a/SmartDeviceLink/SDLAlertManeuver.m b/SmartDeviceLink/SDLAlertManeuver.m index 81717506f..f14044fb8 100644 --- a/SmartDeviceLink/SDLAlertManeuver.m +++ b/SmartDeviceLink/SDLAlertManeuver.m @@ -4,14 +4,14 @@ #import "SDLAlertManeuver.h" -#import "SDLNames.h" + #import "SDLSoftButton.h" #import "SDLTTSChunk.h" @implementation SDLAlertManeuver - (instancetype)init { - if (self = [super initWithName:NAMES_AlertManeuver]) { + if (self = [super initWithName:SDLNameAlertManeuver]) { } return self; } @@ -24,14 +24,14 @@ - (void)setTtsChunks:(NSMutableArray *)ttsChunks { if (ttsChunks != nil) { - [parameters setObject:ttsChunks forKey:NAMES_ttsChunks]; + [parameters setObject:ttsChunks forKey:SDLNameTtsChunks]; } else { - [parameters removeObjectForKey:NAMES_ttsChunks]; + [parameters removeObjectForKey:SDLNameTtsChunks]; } } - (NSMutableArray *)ttsChunks { - NSMutableArray *array = [parameters objectForKey:NAMES_ttsChunks]; + NSMutableArray *array = [parameters objectForKey:SDLNameTtsChunks]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { @@ -45,14 +45,14 @@ - (void)setSoftButtons:(NSMutableArray *)softButtons { if (softButtons != nil) { - [parameters setObject:softButtons forKey:NAMES_softButtons]; + [parameters setObject:softButtons forKey:SDLNameSoftButtons]; } else { - [parameters removeObjectForKey:NAMES_softButtons]; + [parameters removeObjectForKey:SDLNameSoftButtons]; } } - (NSMutableArray *)softButtons { - NSMutableArray *array = [parameters objectForKey:NAMES_softButtons]; + NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtons]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) { return array; } else { diff --git a/SmartDeviceLink/SDLAlertManeuverResponse.m b/SmartDeviceLink/SDLAlertManeuverResponse.m index 5687d3117..ef1343b9d 100644 --- a/SmartDeviceLink/SDLAlertManeuverResponse.m +++ b/SmartDeviceLink/SDLAlertManeuverResponse.m @@ -3,12 +3,12 @@ #import "SDLAlertManeuverResponse.h" -#import "SDLNames.h" + @implementation SDLAlertManeuverResponse - (instancetype)init { - if (self = [super initWithName:NAMES_AlertManeuver]) { + if (self = [super initWithName:SDLNameAlertManeuver]) { } return self; } diff --git a/SmartDeviceLink/SDLAlertResponse.m b/SmartDeviceLink/SDLAlertResponse.m index f55982377..07fa747dc 100644 --- a/SmartDeviceLink/SDLAlertResponse.m +++ b/SmartDeviceLink/SDLAlertResponse.m @@ -3,12 +3,12 @@ #import "SDLAlertResponse.h" -#import "SDLNames.h" + @implementation SDLAlertResponse - (instancetype)init { - if (self = [super initWithName:NAMES_Alert]) { + if (self = [super initWithName:SDLNameAlert]) { } return self; } @@ -21,14 +21,14 @@ - (void)setTryAgainTime:(NSNumber *)tryAgainTime { if (tryAgainTime != nil) { - [parameters setObject:tryAgainTime forKey:NAMES_tryAgainTime]; + [parameters setObject:tryAgainTime forKey:SDLNameTryAgainTime]; } else { - [parameters removeObjectForKey:NAMES_tryAgainTime]; + [parameters removeObjectForKey:SDLNameTryAgainTime]; } } - (NSNumber *)tryAgainTime { - return [parameters objectForKey:NAMES_tryAgainTime]; + return [parameters objectForKey:SDLNameTryAgainTime]; } @end diff --git a/SmartDeviceLink/SDLAppInfo.m b/SmartDeviceLink/SDLAppInfo.m index 7318187bf..e4e52d5eb 100644 --- a/SmartDeviceLink/SDLAppInfo.m +++ b/SmartDeviceLink/SDLAppInfo.m @@ -2,44 +2,44 @@ // #import "SDLAppInfo.h" -#import "SDLNames.h" + @implementation SDLAppInfo - (void)setAppDisplayName:(NSString *)appDisplayName { if (appDisplayName != nil) { - [store setObject:appDisplayName forKey:NAMES_appDisplayName]; + [store setObject:appDisplayName forKey:SDLNameAppDisplayName]; } else { - [store removeObjectForKey:NAMES_appDisplayName]; + [store removeObjectForKey:SDLNameAppDisplayName]; } } - (NSString *)appDisplayName { - return [store objectForKey:NAMES_appDisplayName]; + return [store objectForKey:SDLNameAppDisplayName]; } - (void)setAppBundleID:(NSString *)appBundleID { if (appBundleID != nil) { - [store setObject:appBundleID forKey:NAMES_appBundleID]; + [store setObject:appBundleID forKey:SDLNameAppBundleId]; } else { - [store removeObjectForKey:NAMES_appBundleID]; + [store removeObjectForKey:SDLNameAppBundleId]; } } - (NSString *)appBundleID { - return [store objectForKey:NAMES_appBundleID]; + return [store objectForKey:SDLNameAppBundleId]; } - (void)setAppVersion:(NSString *)appVersion { if (appVersion != nil) { - [store setObject:appVersion forKey:NAMES_appVersion]; + [store setObject:appVersion forKey:SDLNameAppVersion]; } else { - [store removeObjectForKey:NAMES_appVersion]; + [store removeObjectForKey:SDLNameAppVersion]; } } - (NSString *)appVersion { - return [store objectForKey:NAMES_appVersion]; + return [store objectForKey:SDLNameAppVersion]; } @end diff --git a/SmartDeviceLink/SDLAudioPassThruCapabilities.m b/SmartDeviceLink/SDLAudioPassThruCapabilities.m index fbb02be84..fd050ae98 100644 --- a/SmartDeviceLink/SDLAudioPassThruCapabilities.m +++ b/SmartDeviceLink/SDLAudioPassThruCapabilities.m @@ -6,7 +6,7 @@ #import "SDLAudioType.h" #import "SDLBitsPerSample.h" -#import "SDLNames.h" + #import "SDLSamplingRate.h" @@ -26,14 +26,14 @@ - (void)setSamplingRate:(SDLSamplingRate *)samplingRate { if (samplingRate != nil) { - [store setObject:samplingRate forKey:NAMES_samplingRate]; + [store setObject:samplingRate forKey:SDLNameSamplingRate]; } else { - [store removeObjectForKey:NAMES_samplingRate]; + [store removeObjectForKey:SDLNameSamplingRate]; } } - (SDLSamplingRate *)samplingRate { - NSObject *obj = [store objectForKey:NAMES_samplingRate]; + NSObject *obj = [store objectForKey:SDLNameSamplingRate]; if (obj == nil || [obj isKindOfClass:SDLSamplingRate.class]) { return (SDLSamplingRate *)obj; } else { @@ -43,14 +43,14 @@ - (void)setBitsPerSample:(SDLBitsPerSample *)bitsPerSample { if (bitsPerSample != nil) { - [store setObject:bitsPerSample forKey:NAMES_bitsPerSample]; + [store setObject:bitsPerSample forKey:SDLNameBitsPerSample]; } else { - [store removeObjectForKey:NAMES_bitsPerSample]; + [store removeObjectForKey:SDLNameBitsPerSample]; } } - (SDLBitsPerSample *)bitsPerSample { - NSObject *obj = [store objectForKey:NAMES_bitsPerSample]; + NSObject *obj = [store objectForKey:SDLNameBitsPerSample]; if (obj == nil || [obj isKindOfClass:SDLBitsPerSample.class]) { return (SDLBitsPerSample *)obj; } else { @@ -60,14 +60,14 @@ - (void)setAudioType:(SDLAudioType *)audioType { if (audioType != nil) { - [store setObject:audioType forKey:NAMES_audioType]; + [store setObject:audioType forKey:SDLNameAudioType]; } else { - [store removeObjectForKey:NAMES_audioType]; + [store removeObjectForKey:SDLNameAudioType]; } } - (SDLAudioType *)audioType { - NSObject *obj = [store objectForKey:NAMES_audioType]; + NSObject *obj = [store objectForKey:SDLNameAudioType]; if (obj == nil || [obj isKindOfClass:SDLAudioType.class]) { return (SDLAudioType *)obj; } else { diff --git a/SmartDeviceLink/SDLBeltStatus.m b/SmartDeviceLink/SDLBeltStatus.m index 70b54d2bd..8c285cb65 100644 --- a/SmartDeviceLink/SDLBeltStatus.m +++ b/SmartDeviceLink/SDLBeltStatus.m @@ -3,7 +3,7 @@ #import "SDLBeltStatus.h" -#import "SDLNames.h" + #import "SDLVehicleDataEventStatus.h" @@ -23,14 +23,14 @@ - (void)setDriverBeltDeployed:(SDLVehicleDataEventStatus *)driverBeltDeployed { if (driverBeltDeployed != nil) { - [store setObject:driverBeltDeployed forKey:NAMES_driverBeltDeployed]; + [store setObject:driverBeltDeployed forKey:SDLNameDriverBeltDeployed]; } else { - [store removeObjectForKey:NAMES_driverBeltDeployed]; + [store removeObjectForKey:SDLNameDriverBeltDeployed]; } } - (SDLVehicleDataEventStatus *)driverBeltDeployed { - NSObject *obj = [store objectForKey:NAMES_driverBeltDeployed]; + NSObject *obj = [store objectForKey:SDLNameDriverBeltDeployed]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -40,14 +40,14 @@ - (void)setPassengerBeltDeployed:(SDLVehicleDataEventStatus *)passengerBeltDeployed { if (passengerBeltDeployed != nil) { - [store setObject:passengerBeltDeployed forKey:NAMES_passengerBeltDeployed]; + [store setObject:passengerBeltDeployed forKey:SDLNamePassengerBeltDeployed]; } else { - [store removeObjectForKey:NAMES_passengerBeltDeployed]; + [store removeObjectForKey:SDLNamePassengerBeltDeployed]; } } - (SDLVehicleDataEventStatus *)passengerBeltDeployed { - NSObject *obj = [store objectForKey:NAMES_passengerBeltDeployed]; + NSObject *obj = [store objectForKey:SDLNamePassengerBeltDeployed]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -57,14 +57,14 @@ - (void)setPassengerBuckleBelted:(SDLVehicleDataEventStatus *)passengerBuckleBelted { if (passengerBuckleBelted != nil) { - [store setObject:passengerBuckleBelted forKey:NAMES_passengerBuckleBelted]; + [store setObject:passengerBuckleBelted forKey:SDLNamePassengerBuckleBelted]; } else { - [store removeObjectForKey:NAMES_passengerBuckleBelted]; + [store removeObjectForKey:SDLNamePassengerBuckleBelted]; } } - (SDLVehicleDataEventStatus *)passengerBuckleBelted { - NSObject *obj = [store objectForKey:NAMES_passengerBuckleBelted]; + NSObject *obj = [store objectForKey:SDLNamePassengerBuckleBelted]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -74,14 +74,14 @@ - (void)setDriverBuckleBelted:(SDLVehicleDataEventStatus *)driverBuckleBelted { if (driverBuckleBelted != nil) { - [store setObject:driverBuckleBelted forKey:NAMES_driverBuckleBelted]; + [store setObject:driverBuckleBelted forKey:SDLNameDriverBuckleBelted]; } else { - [store removeObjectForKey:NAMES_driverBuckleBelted]; + [store removeObjectForKey:SDLNameDriverBuckleBelted]; } } - (SDLVehicleDataEventStatus *)driverBuckleBelted { - NSObject *obj = [store objectForKey:NAMES_driverBuckleBelted]; + NSObject *obj = [store objectForKey:SDLNameDriverBuckleBelted]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -91,14 +91,14 @@ - (void)setLeftRow2BuckleBelted:(SDLVehicleDataEventStatus *)leftRow2BuckleBelted { if (leftRow2BuckleBelted != nil) { - [store setObject:leftRow2BuckleBelted forKey:NAMES_leftRow2BuckleBelted]; + [store setObject:leftRow2BuckleBelted forKey:SDLNameLeftRow2BuckleBelted]; } else { - [store removeObjectForKey:NAMES_leftRow2BuckleBelted]; + [store removeObjectForKey:SDLNameLeftRow2BuckleBelted]; } } - (SDLVehicleDataEventStatus *)leftRow2BuckleBelted { - NSObject *obj = [store objectForKey:NAMES_leftRow2BuckleBelted]; + NSObject *obj = [store objectForKey:SDLNameLeftRow2BuckleBelted]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -108,14 +108,14 @@ - (void)setPassengerChildDetected:(SDLVehicleDataEventStatus *)passengerChildDetected { if (passengerChildDetected != nil) { - [store setObject:passengerChildDetected forKey:NAMES_passengerChildDetected]; + [store setObject:passengerChildDetected forKey:SDLNamePassengerChildDetected]; } else { - [store removeObjectForKey:NAMES_passengerChildDetected]; + [store removeObjectForKey:SDLNamePassengerChildDetected]; } } - (SDLVehicleDataEventStatus *)passengerChildDetected { - NSObject *obj = [store objectForKey:NAMES_passengerChildDetected]; + NSObject *obj = [store objectForKey:SDLNamePassengerChildDetected]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -125,14 +125,14 @@ - (void)setRightRow2BuckleBelted:(SDLVehicleDataEventStatus *)rightRow2BuckleBelted { if (rightRow2BuckleBelted != nil) { - [store setObject:rightRow2BuckleBelted forKey:NAMES_rightRow2BuckleBelted]; + [store setObject:rightRow2BuckleBelted forKey:SDLNameRightRow2BuckleBelted]; } else { - [store removeObjectForKey:NAMES_rightRow2BuckleBelted]; + [store removeObjectForKey:SDLNameRightRow2BuckleBelted]; } } - (SDLVehicleDataEventStatus *)rightRow2BuckleBelted { - NSObject *obj = [store objectForKey:NAMES_rightRow2BuckleBelted]; + NSObject *obj = [store objectForKey:SDLNameRightRow2BuckleBelted]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -142,14 +142,14 @@ - (void)setMiddleRow2BuckleBelted:(SDLVehicleDataEventStatus *)middleRow2BuckleBelted { if (middleRow2BuckleBelted != nil) { - [store setObject:middleRow2BuckleBelted forKey:NAMES_middleRow2BuckleBelted]; + [store setObject:middleRow2BuckleBelted forKey:SDLNameMiddleRow2BuckleBelted]; } else { - [store removeObjectForKey:NAMES_middleRow2BuckleBelted]; + [store removeObjectForKey:SDLNameMiddleRow2BuckleBelted]; } } - (SDLVehicleDataEventStatus *)middleRow2BuckleBelted { - NSObject *obj = [store objectForKey:NAMES_middleRow2BuckleBelted]; + NSObject *obj = [store objectForKey:SDLNameMiddleRow2BuckleBelted]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -159,14 +159,14 @@ - (void)setMiddleRow3BuckleBelted:(SDLVehicleDataEventStatus *)middleRow3BuckleBelted { if (middleRow3BuckleBelted != nil) { - [store setObject:middleRow3BuckleBelted forKey:NAMES_middleRow3BuckleBelted]; + [store setObject:middleRow3BuckleBelted forKey:SDLNameMiddleRow3BuckleBelted]; } else { - [store removeObjectForKey:NAMES_middleRow3BuckleBelted]; + [store removeObjectForKey:SDLNameMiddleRow3BuckleBelted]; } } - (SDLVehicleDataEventStatus *)middleRow3BuckleBelted { - NSObject *obj = [store objectForKey:NAMES_middleRow3BuckleBelted]; + NSObject *obj = [store objectForKey:SDLNameMiddleRow3BuckleBelted]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -176,14 +176,14 @@ - (void)setLeftRow3BuckleBelted:(SDLVehicleDataEventStatus *)leftRow3BuckleBelted { if (leftRow3BuckleBelted != nil) { - [store setObject:leftRow3BuckleBelted forKey:NAMES_leftRow3BuckleBelted]; + [store setObject:leftRow3BuckleBelted forKey:SDLNameLeftRow3BuckleBelted]; } else { - [store removeObjectForKey:NAMES_leftRow3BuckleBelted]; + [store removeObjectForKey:SDLNameLeftRow3BuckleBelted]; } } - (SDLVehicleDataEventStatus *)leftRow3BuckleBelted { - NSObject *obj = [store objectForKey:NAMES_leftRow3BuckleBelted]; + NSObject *obj = [store objectForKey:SDLNameLeftRow3BuckleBelted]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -193,14 +193,14 @@ - (void)setRightRow3BuckleBelted:(SDLVehicleDataEventStatus *)rightRow3BuckleBelted { if (rightRow3BuckleBelted != nil) { - [store setObject:rightRow3BuckleBelted forKey:NAMES_rightRow3BuckleBelted]; + [store setObject:rightRow3BuckleBelted forKey:SDLNameRightRow3BuckleBelted]; } else { - [store removeObjectForKey:NAMES_rightRow3BuckleBelted]; + [store removeObjectForKey:SDLNameRightRow3BuckleBelted]; } } - (SDLVehicleDataEventStatus *)rightRow3BuckleBelted { - NSObject *obj = [store objectForKey:NAMES_rightRow3BuckleBelted]; + NSObject *obj = [store objectForKey:SDLNameRightRow3BuckleBelted]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -210,14 +210,14 @@ - (void)setLeftRearInflatableBelted:(SDLVehicleDataEventStatus *)leftRearInflatableBelted { if (leftRearInflatableBelted != nil) { - [store setObject:leftRearInflatableBelted forKey:NAMES_leftRearInflatableBelted]; + [store setObject:leftRearInflatableBelted forKey:SDLNameLeftRearInflatableBelted]; } else { - [store removeObjectForKey:NAMES_leftRearInflatableBelted]; + [store removeObjectForKey:SDLNameLeftRearInflatableBelted]; } } - (SDLVehicleDataEventStatus *)leftRearInflatableBelted { - NSObject *obj = [store objectForKey:NAMES_leftRearInflatableBelted]; + NSObject *obj = [store objectForKey:SDLNameLeftRearInflatableBelted]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -227,14 +227,14 @@ - (void)setRightRearInflatableBelted:(SDLVehicleDataEventStatus *)rightRearInflatableBelted { if (rightRearInflatableBelted != nil) { - [store setObject:rightRearInflatableBelted forKey:NAMES_rightRearInflatableBelted]; + [store setObject:rightRearInflatableBelted forKey:SDLNameRightRearInflatableBelted]; } else { - [store removeObjectForKey:NAMES_rightRearInflatableBelted]; + [store removeObjectForKey:SDLNameRightRearInflatableBelted]; } } - (SDLVehicleDataEventStatus *)rightRearInflatableBelted { - NSObject *obj = [store objectForKey:NAMES_rightRearInflatableBelted]; + NSObject *obj = [store objectForKey:SDLNameRightRearInflatableBelted]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -244,14 +244,14 @@ - (void)setMiddleRow1BeltDeployed:(SDLVehicleDataEventStatus *)middleRow1BeltDeployed { if (middleRow1BeltDeployed != nil) { - [store setObject:middleRow1BeltDeployed forKey:NAMES_middleRow1BeltDeployed]; + [store setObject:middleRow1BeltDeployed forKey:SDLNameMiddleRow1BeltDeployed]; } else { - [store removeObjectForKey:NAMES_middleRow1BeltDeployed]; + [store removeObjectForKey:SDLNameMiddleRow1BeltDeployed]; } } - (SDLVehicleDataEventStatus *)middleRow1BeltDeployed { - NSObject *obj = [store objectForKey:NAMES_middleRow1BeltDeployed]; + NSObject *obj = [store objectForKey:SDLNameMiddleRow1BeltDeployed]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -261,14 +261,14 @@ - (void)setMiddleRow1BuckleBelted:(SDLVehicleDataEventStatus *)middleRow1BuckleBelted { if (middleRow1BuckleBelted != nil) { - [store setObject:middleRow1BuckleBelted forKey:NAMES_middleRow1BuckleBelted]; + [store setObject:middleRow1BuckleBelted forKey:SDLNameMiddleRow1BuckleBelted]; } else { - [store removeObjectForKey:NAMES_middleRow1BuckleBelted]; + [store removeObjectForKey:SDLNameMiddleRow1BuckleBelted]; } } - (SDLVehicleDataEventStatus *)middleRow1BuckleBelted { - NSObject *obj = [store objectForKey:NAMES_middleRow1BuckleBelted]; + NSObject *obj = [store objectForKey:SDLNameMiddleRow1BuckleBelted]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { diff --git a/SmartDeviceLink/SDLBodyInformation.m b/SmartDeviceLink/SDLBodyInformation.m index 9be7a88d6..e0bd64a72 100644 --- a/SmartDeviceLink/SDLBodyInformation.m +++ b/SmartDeviceLink/SDLBodyInformation.m @@ -6,7 +6,7 @@ #import "SDLIgnitionStableStatus.h" #import "SDLIgnitionStatus.h" -#import "SDLNames.h" + @implementation SDLBodyInformation @@ -25,26 +25,26 @@ - (void)setParkBrakeActive:(NSNumber *)parkBrakeActive { if (parkBrakeActive != nil) { - [store setObject:parkBrakeActive forKey:NAMES_parkBrakeActive]; + [store setObject:parkBrakeActive forKey:SDLNameParkBrakeActive]; } else { - [store removeObjectForKey:NAMES_parkBrakeActive]; + [store removeObjectForKey:SDLNameParkBrakeActive]; } } - (NSNumber *)parkBrakeActive { - return [store objectForKey:NAMES_parkBrakeActive]; + return [store objectForKey:SDLNameParkBrakeActive]; } - (void)setIgnitionStableStatus:(SDLIgnitionStableStatus *)ignitionStableStatus { if (ignitionStableStatus != nil) { - [store setObject:ignitionStableStatus forKey:NAMES_ignitionStableStatus]; + [store setObject:ignitionStableStatus forKey:SDLNameIgnitionStableStatus]; } else { - [store removeObjectForKey:NAMES_ignitionStableStatus]; + [store removeObjectForKey:SDLNameIgnitionStableStatus]; } } - (SDLIgnitionStableStatus *)ignitionStableStatus { - NSObject *obj = [store objectForKey:NAMES_ignitionStableStatus]; + NSObject *obj = [store objectForKey:SDLNameIgnitionStableStatus]; if (obj == nil || [obj isKindOfClass:SDLIgnitionStableStatus.class]) { return (SDLIgnitionStableStatus *)obj; } else { @@ -54,14 +54,14 @@ - (void)setIgnitionStatus:(SDLIgnitionStatus *)ignitionStatus { if (ignitionStatus != nil) { - [store setObject:ignitionStatus forKey:NAMES_ignitionStatus]; + [store setObject:ignitionStatus forKey:SDLNameIgnitionStatus]; } else { - [store removeObjectForKey:NAMES_ignitionStatus]; + [store removeObjectForKey:SDLNameIgnitionStatus]; } } - (SDLIgnitionStatus *)ignitionStatus { - NSObject *obj = [store objectForKey:NAMES_ignitionStatus]; + NSObject *obj = [store objectForKey:SDLNameIgnitionStatus]; if (obj == nil || [obj isKindOfClass:SDLIgnitionStatus.class]) { return (SDLIgnitionStatus *)obj; } else { @@ -71,50 +71,50 @@ - (void)setDriverDoorAjar:(NSNumber *)driverDoorAjar { if (driverDoorAjar != nil) { - [store setObject:driverDoorAjar forKey:NAMES_driverDoorAjar]; + [store setObject:driverDoorAjar forKey:SDLNameDriverDoorAjar]; } else { - [store removeObjectForKey:NAMES_driverDoorAjar]; + [store removeObjectForKey:SDLNameDriverDoorAjar]; } } - (NSNumber *)driverDoorAjar { - return [store objectForKey:NAMES_driverDoorAjar]; + return [store objectForKey:SDLNameDriverDoorAjar]; } - (void)setPassengerDoorAjar:(NSNumber *)passengerDoorAjar { if (passengerDoorAjar != nil) { - [store setObject:passengerDoorAjar forKey:NAMES_passengerDoorAjar]; + [store setObject:passengerDoorAjar forKey:SDLNamePassengerDoorAjar]; } else { - [store removeObjectForKey:NAMES_passengerDoorAjar]; + [store removeObjectForKey:SDLNamePassengerDoorAjar]; } } - (NSNumber *)passengerDoorAjar { - return [store objectForKey:NAMES_passengerDoorAjar]; + return [store objectForKey:SDLNamePassengerDoorAjar]; } - (void)setRearLeftDoorAjar:(NSNumber *)rearLeftDoorAjar { if (rearLeftDoorAjar != nil) { - [store setObject:rearLeftDoorAjar forKey:NAMES_rearLeftDoorAjar]; + [store setObject:rearLeftDoorAjar forKey:SDLNameRearLeftDoorAjar]; } else { - [store removeObjectForKey:NAMES_rearLeftDoorAjar]; + [store removeObjectForKey:SDLNameRearLeftDoorAjar]; } } - (NSNumber *)rearLeftDoorAjar { - return [store objectForKey:NAMES_rearLeftDoorAjar]; + return [store objectForKey:SDLNameRearLeftDoorAjar]; } - (void)setRearRightDoorAjar:(NSNumber *)rearRightDoorAjar { if (rearRightDoorAjar != nil) { - [store setObject:rearRightDoorAjar forKey:NAMES_rearRightDoorAjar]; + [store setObject:rearRightDoorAjar forKey:SDLNameRearRightDoorAjar]; } else { - [store removeObjectForKey:NAMES_rearRightDoorAjar]; + [store removeObjectForKey:SDLNameRearRightDoorAjar]; } } - (NSNumber *)rearRightDoorAjar { - return [store objectForKey:NAMES_rearRightDoorAjar]; + return [store objectForKey:SDLNameRearRightDoorAjar]; } @end diff --git a/SmartDeviceLink/SDLButtonCapabilities.m b/SmartDeviceLink/SDLButtonCapabilities.m index fbcab54c9..16909f739 100644 --- a/SmartDeviceLink/SDLButtonCapabilities.m +++ b/SmartDeviceLink/SDLButtonCapabilities.m @@ -4,7 +4,7 @@ #import "SDLButtonCapabilities.h" #import "SDLButtonName.h" -#import "SDLNames.h" + @implementation SDLButtonCapabilities @@ -23,14 +23,14 @@ - (void)setName:(SDLButtonName *)name { if (name != nil) { - [store setObject:name forKey:NAMES_name]; + [store setObject:name forKey:SDLNameName]; } else { - [store removeObjectForKey:NAMES_name]; + [store removeObjectForKey:SDLNameName]; } } - (SDLButtonName *)name { - NSObject *obj = [store objectForKey:NAMES_name]; + NSObject *obj = [store objectForKey:SDLNameName]; if (obj == nil || [obj isKindOfClass:SDLButtonName.class]) { return (SDLButtonName *)obj; } else { @@ -40,38 +40,38 @@ - (void)setShortPressAvailable:(NSNumber *)shortPressAvailable { if (shortPressAvailable != nil) { - [store setObject:shortPressAvailable forKey:NAMES_shortPressAvailable]; + [store setObject:shortPressAvailable forKey:SDLNameShortPressAvailable]; } else { - [store removeObjectForKey:NAMES_shortPressAvailable]; + [store removeObjectForKey:SDLNameShortPressAvailable]; } } - (NSNumber *)shortPressAvailable { - return [store objectForKey:NAMES_shortPressAvailable]; + return [store objectForKey:SDLNameShortPressAvailable]; } - (void)setLongPressAvailable:(NSNumber *)longPressAvailable { if (longPressAvailable != nil) { - [store setObject:longPressAvailable forKey:NAMES_longPressAvailable]; + [store setObject:longPressAvailable forKey:SDLNameLongPressAvailable]; } else { - [store removeObjectForKey:NAMES_longPressAvailable]; + [store removeObjectForKey:SDLNameLongPressAvailable]; } } - (NSNumber *)longPressAvailable { - return [store objectForKey:NAMES_longPressAvailable]; + return [store objectForKey:SDLNameLongPressAvailable]; } - (void)setUpDownAvailable:(NSNumber *)upDownAvailable { if (upDownAvailable != nil) { - [store setObject:upDownAvailable forKey:NAMES_upDownAvailable]; + [store setObject:upDownAvailable forKey:SDLNameUpDownAvailable]; } else { - [store removeObjectForKey:NAMES_upDownAvailable]; + [store removeObjectForKey:SDLNameUpDownAvailable]; } } - (NSNumber *)upDownAvailable { - return [store objectForKey:NAMES_upDownAvailable]; + return [store objectForKey:SDLNameUpDownAvailable]; } @end diff --git a/SmartDeviceLink/SDLChangeRegistration.m b/SmartDeviceLink/SDLChangeRegistration.m index 00a7de885..636cbefad 100644 --- a/SmartDeviceLink/SDLChangeRegistration.m +++ b/SmartDeviceLink/SDLChangeRegistration.m @@ -5,12 +5,12 @@ #import "SDLChangeRegistration.h" #import "SDLLanguage.h" -#import "SDLNames.h" + @implementation SDLChangeRegistration - (instancetype)init { - if (self = [super initWithName:NAMES_ChangeRegistration]) { + if (self = [super initWithName:SDLNameChangeRegistration]) { } return self; } @@ -23,14 +23,14 @@ - (void)setLanguage:(SDLLanguage *)language { if (language != nil) { - [parameters setObject:language forKey:NAMES_language]; + [parameters setObject:language forKey:SDLNameLanguage]; } else { - [parameters removeObjectForKey:NAMES_language]; + [parameters removeObjectForKey:SDLNameLanguage]; } } - (SDLLanguage *)language { - NSObject *obj = [parameters objectForKey:NAMES_language]; + NSObject *obj = [parameters objectForKey:SDLNameLanguage]; if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) { return (SDLLanguage *)obj; } else { @@ -40,14 +40,14 @@ - (void)setHmiDisplayLanguage:(SDLLanguage *)hmiDisplayLanguage { if (hmiDisplayLanguage != nil) { - [parameters setObject:hmiDisplayLanguage forKey:NAMES_hmiDisplayLanguage]; + [parameters setObject:hmiDisplayLanguage forKey:SDLNameHmiDisplayLanguage]; } else { - [parameters removeObjectForKey:NAMES_hmiDisplayLanguage]; + [parameters removeObjectForKey:SDLNameHmiDisplayLanguage]; } } - (SDLLanguage *)hmiDisplayLanguage { - NSObject *obj = [parameters objectForKey:NAMES_hmiDisplayLanguage]; + NSObject *obj = [parameters objectForKey:SDLNameHmiDisplayLanguage]; if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) { return (SDLLanguage *)obj; } else { @@ -57,50 +57,50 @@ - (void)setAppName:(NSString *)appName { if (appName != nil) { - parameters[NAMES_appName] = [appName copy]; + parameters[SDLNameAppName] = [appName copy]; } else { - [parameters removeObjectForKey:NAMES_appName]; + [parameters removeObjectForKey:SDLNameAppName]; } } - (NSString *)appName { - return [parameters[NAMES_appName] copy]; + return [parameters[SDLNameAppName] copy]; } - (void)setTtsName:(NSArray *)ttsName { if (ttsName != nil) { - [parameters setObject:[ttsName copy] forKey:NAMES_ttsName]; + [parameters setObject:[ttsName copy] forKey:SDLNameTtsName]; } else { - [parameters removeObjectForKey:NAMES_ttsName]; + [parameters removeObjectForKey:SDLNameTtsName]; } } - (NSArray *)ttsName { - return [parameters[NAMES_ttsName] copy]; + return [parameters[SDLNameTtsName] copy]; } - (void)setNgnMediaScreenAppName:(NSString *)ngnMediaScreenAppName { if (ngnMediaScreenAppName != nil) { - parameters[NAMES_ngnMediaScreenAppName] = [ngnMediaScreenAppName copy]; + parameters[SDLNameNgnMediaScreenAppName] = [ngnMediaScreenAppName copy]; } else { - [parameters removeObjectForKey:NAMES_ngnMediaScreenAppName]; + [parameters removeObjectForKey:SDLNameNgnMediaScreenAppName]; } } - (NSString *)ngnMediaScreenAppName { - return [parameters[NAMES_ngnMediaScreenAppName] copy]; + return [parameters[SDLNameNgnMediaScreenAppName] copy]; } - (void)setVrSynonyms:(NSArray *)vrSynonyms { if (vrSynonyms != nil) { - [parameters setObject:[vrSynonyms copy] forKey:NAMES_vrSynonyms]; + [parameters setObject:[vrSynonyms copy] forKey:SDLNameVrSynonyms]; } else { - [parameters removeObjectForKey:NAMES_vrSynonyms]; + [parameters removeObjectForKey:SDLNameVrSynonyms]; } } - (NSArray *)vrSynonyms { - return [parameters[NAMES_vrSynonyms] copy]; + return [parameters[SDLNameVrSynonyms] copy]; } @end diff --git a/SmartDeviceLink/SDLChangeRegistrationResponse.m b/SmartDeviceLink/SDLChangeRegistrationResponse.m index 710495d2c..4f2510086 100644 --- a/SmartDeviceLink/SDLChangeRegistrationResponse.m +++ b/SmartDeviceLink/SDLChangeRegistrationResponse.m @@ -4,12 +4,12 @@ #import "SDLChangeRegistrationResponse.h" -#import "SDLNames.h" + @implementation SDLChangeRegistrationResponse - (instancetype)init { - if (self = [super initWithName:NAMES_ChangeRegistration]) { + if (self = [super initWithName:SDLNameChangeRegistration]) { } return self; } diff --git a/SmartDeviceLink/SDLChoice.m b/SmartDeviceLink/SDLChoice.m index 83e1d56ae..288931007 100644 --- a/SmartDeviceLink/SDLChoice.m +++ b/SmartDeviceLink/SDLChoice.m @@ -4,7 +4,7 @@ #import "SDLChoice.h" #import "SDLImage.h" -#import "SDLNames.h" + @implementation SDLChoice @@ -23,50 +23,50 @@ - (void)setChoiceID:(NSNumber *)choiceID { if (choiceID != nil) { - [store setObject:choiceID forKey:NAMES_choiceID]; + [store setObject:choiceID forKey:SDLNameChoiceId]; } else { - [store removeObjectForKey:NAMES_choiceID]; + [store removeObjectForKey:SDLNameChoiceId]; } } - (NSNumber *)choiceID { - return [store objectForKey:NAMES_choiceID]; + return [store objectForKey:SDLNameChoiceId]; } - (void)setMenuName:(NSString *)menuName { if (menuName != nil) { - [store setObject:menuName forKey:NAMES_menuName]; + [store setObject:menuName forKey:SDLNameMenuName]; } else { - [store removeObjectForKey:NAMES_menuName]; + [store removeObjectForKey:SDLNameMenuName]; } } - (NSString *)menuName { - return [store objectForKey:NAMES_menuName]; + return [store objectForKey:SDLNameMenuName]; } - (void)setVrCommands:(NSMutableArray *)vrCommands { if (vrCommands != nil) { - [store setObject:vrCommands forKey:NAMES_vrCommands]; + [store setObject:vrCommands forKey:SDLNameVrCommands]; } else { - [store removeObjectForKey:NAMES_vrCommands]; + [store removeObjectForKey:SDLNameVrCommands]; } } - (NSMutableArray *)vrCommands { - return [store objectForKey:NAMES_vrCommands]; + return [store objectForKey:SDLNameVrCommands]; } - (void)setImage:(SDLImage *)image { if (image != nil) { - [store setObject:image forKey:NAMES_image]; + [store setObject:image forKey:SDLNameImage]; } else { - [store removeObjectForKey:NAMES_image]; + [store removeObjectForKey:SDLNameImage]; } } - (SDLImage *)image { - NSObject *obj = [store objectForKey:NAMES_image]; + NSObject *obj = [store objectForKey:SDLNameImage]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { @@ -76,38 +76,38 @@ - (void)setSecondaryText:(NSString *)secondaryText { if (secondaryText != nil) { - [store setObject:secondaryText forKey:NAMES_secondaryText]; + [store setObject:secondaryText forKey:SDLNameSecondaryText]; } else { - [store removeObjectForKey:NAMES_secondaryText]; + [store removeObjectForKey:SDLNameSecondaryText]; } } - (NSString *)secondaryText { - return [store objectForKey:NAMES_secondaryText]; + return [store objectForKey:SDLNameSecondaryText]; } - (void)setTertiaryText:(NSString *)tertiaryText { if (tertiaryText != nil) { - [store setObject:tertiaryText forKey:NAMES_tertiaryText]; + [store setObject:tertiaryText forKey:SDLNameTertiaryText]; } else { - [store removeObjectForKey:NAMES_tertiaryText]; + [store removeObjectForKey:SDLNameTertiaryText]; } } - (NSString *)tertiaryText { - return [store objectForKey:NAMES_tertiaryText]; + return [store objectForKey:SDLNameTertiaryText]; } - (void)setSecondaryImage:(SDLImage *)secondaryImage { if (secondaryImage != nil) { - [store setObject:secondaryImage forKey:NAMES_secondaryImage]; + [store setObject:secondaryImage forKey:SDLNameSecondaryImage]; } else { - [store removeObjectForKey:NAMES_secondaryImage]; + [store removeObjectForKey:SDLNameSecondaryImage]; } } - (SDLImage *)secondaryImage { - NSObject *obj = [store objectForKey:NAMES_secondaryImage]; + NSObject *obj = [store objectForKey:SDLNameSecondaryImage]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { diff --git a/SmartDeviceLink/SDLClusterModeStatus.m b/SmartDeviceLink/SDLClusterModeStatus.m index ecd2a528b..e915c646e 100644 --- a/SmartDeviceLink/SDLClusterModeStatus.m +++ b/SmartDeviceLink/SDLClusterModeStatus.m @@ -4,7 +4,7 @@ #import "SDLClusterModeStatus.h" #import "SDLCarModeStatus.h" -#import "SDLNames.h" + #import "SDLPowerModeQualificationStatus.h" #import "SDLPowerModeStatus.h" @@ -25,26 +25,26 @@ - (void)setPowerModeActive:(NSNumber *)powerModeActive { if (powerModeActive != nil) { - [store setObject:powerModeActive forKey:NAMES_powerModeActive]; + [store setObject:powerModeActive forKey:SDLNamePowerModeActive]; } else { - [store removeObjectForKey:NAMES_powerModeActive]; + [store removeObjectForKey:SDLNamePowerModeActive]; } } - (NSNumber *)powerModeActive { - return [store objectForKey:NAMES_powerModeActive]; + return [store objectForKey:SDLNamePowerModeActive]; } - (void)setPowerModeQualificationStatus:(SDLPowerModeQualificationStatus *)powerModeQualificationStatus { if (powerModeQualificationStatus != nil) { - [store setObject:powerModeQualificationStatus forKey:NAMES_powerModeQualificationStatus]; + [store setObject:powerModeQualificationStatus forKey:SDLNamePowerModeQualificationStatus]; } else { - [store removeObjectForKey:NAMES_powerModeQualificationStatus]; + [store removeObjectForKey:SDLNamePowerModeQualificationStatus]; } } - (SDLPowerModeQualificationStatus *)powerModeQualificationStatus { - NSObject *obj = [store objectForKey:NAMES_powerModeQualificationStatus]; + NSObject *obj = [store objectForKey:SDLNamePowerModeQualificationStatus]; if (obj == nil || [obj isKindOfClass:SDLPowerModeQualificationStatus.class]) { return (SDLPowerModeQualificationStatus *)obj; } else { @@ -54,14 +54,14 @@ - (void)setCarModeStatus:(SDLCarModeStatus *)carModeStatus { if (carModeStatus != nil) { - [store setObject:carModeStatus forKey:NAMES_carModeStatus]; + [store setObject:carModeStatus forKey:SDLNameCarModeStatus]; } else { - [store removeObjectForKey:NAMES_carModeStatus]; + [store removeObjectForKey:SDLNameCarModeStatus]; } } - (SDLCarModeStatus *)carModeStatus { - NSObject *obj = [store objectForKey:NAMES_carModeStatus]; + NSObject *obj = [store objectForKey:SDLNameCarModeStatus]; if (obj == nil || [obj isKindOfClass:SDLCarModeStatus.class]) { return (SDLCarModeStatus *)obj; } else { @@ -71,14 +71,14 @@ - (void)setPowerModeStatus:(SDLPowerModeStatus *)powerModeStatus { if (powerModeStatus != nil) { - [store setObject:powerModeStatus forKey:NAMES_powerModeStatus]; + [store setObject:powerModeStatus forKey:SDLNamePowerModeStatus]; } else { - [store removeObjectForKey:NAMES_powerModeStatus]; + [store removeObjectForKey:SDLNamePowerModeStatus]; } } - (SDLPowerModeStatus *)powerModeStatus { - NSObject *obj = [store objectForKey:NAMES_powerModeStatus]; + NSObject *obj = [store objectForKey:SDLNamePowerModeStatus]; if (obj == nil || [obj isKindOfClass:SDLPowerModeStatus.class]) { return (SDLPowerModeStatus *)obj; } else { diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m index 32324d46e..538c64977 100644 --- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m +++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m @@ -5,12 +5,12 @@ #import "SDLCreateInteractionChoiceSet.h" #import "SDLChoice.h" -#import "SDLNames.h" + @implementation SDLCreateInteractionChoiceSet - (instancetype)init { - if (self = [super initWithName:NAMES_CreateInteractionChoiceSet]) { + if (self = [super initWithName:SDLNameCreateInteractionChoiceSet]) { } return self; } @@ -23,26 +23,26 @@ - (void)setInteractionChoiceSetID:(NSNumber *)interactionChoiceSetID { if (interactionChoiceSetID != nil) { - [parameters setObject:interactionChoiceSetID forKey:NAMES_interactionChoiceSetID]; + [parameters setObject:interactionChoiceSetID forKey:SDLNameInteractionChoiceSetId]; } else { - [parameters removeObjectForKey:NAMES_interactionChoiceSetID]; + [parameters removeObjectForKey:SDLNameInteractionChoiceSetId]; } } - (NSNumber *)interactionChoiceSetID { - return [parameters objectForKey:NAMES_interactionChoiceSetID]; + return [parameters objectForKey:SDLNameInteractionChoiceSetId]; } - (void)setChoiceSet:(NSMutableArray *)choiceSet { if (choiceSet != nil) { - [parameters setObject:choiceSet forKey:NAMES_choiceSet]; + [parameters setObject:choiceSet forKey:SDLNameChoiceSet]; } else { - [parameters removeObjectForKey:NAMES_choiceSet]; + [parameters removeObjectForKey:SDLNameChoiceSet]; } } - (NSMutableArray *)choiceSet { - NSMutableArray *array = [parameters objectForKey:NAMES_choiceSet]; + NSMutableArray *array = [parameters objectForKey:SDLNameChoiceSet]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLChoice.class]) { return array; } else { diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m index 17c2bf3f9..8ba418474 100644 --- a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m +++ b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m @@ -4,12 +4,12 @@ #import "SDLCreateInteractionChoiceSetResponse.h" -#import "SDLNames.h" + @implementation SDLCreateInteractionChoiceSetResponse - (instancetype)init { - if (self = [super initWithName:NAMES_CreateInteractionChoiceSet]) { + if (self = [super initWithName:SDLNameCreateInteractionChoiceSet]) { } return self; } diff --git a/SmartDeviceLink/SDLDIDResult.m b/SmartDeviceLink/SDLDIDResult.m index be42582e7..4c3382e44 100644 --- a/SmartDeviceLink/SDLDIDResult.m +++ b/SmartDeviceLink/SDLDIDResult.m @@ -3,7 +3,7 @@ #import "SDLDIDResult.h" -#import "SDLNames.h" + #import "SDLVehicleDataResultCode.h" @@ -23,14 +23,14 @@ - (void)setResultCode:(SDLVehicleDataResultCode *)resultCode { if (resultCode != nil) { - [store setObject:resultCode forKey:NAMES_resultCode]; + [store setObject:resultCode forKey:SDLNameResultCode]; } else { - [store removeObjectForKey:NAMES_resultCode]; + [store removeObjectForKey:SDLNameResultCode]; } } - (SDLVehicleDataResultCode *)resultCode { - NSObject *obj = [store objectForKey:NAMES_resultCode]; + NSObject *obj = [store objectForKey:SDLNameResultCode]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResultCode.class]) { return (SDLVehicleDataResultCode *)obj; } else { @@ -40,26 +40,26 @@ - (void)setDidLocation:(NSNumber *)didLocation { if (didLocation != nil) { - [store setObject:didLocation forKey:NAMES_didLocation]; + [store setObject:didLocation forKey:SDLNameDidLocation]; } else { - [store removeObjectForKey:NAMES_didLocation]; + [store removeObjectForKey:SDLNameDidLocation]; } } - (NSNumber *)didLocation { - return [store objectForKey:NAMES_didLocation]; + return [store objectForKey:SDLNameDidLocation]; } - (void)setData:(NSString *)data { if (data != nil) { - [store setObject:data forKey:NAMES_data]; + [store setObject:data forKey:SDLNameData]; } else { - [store removeObjectForKey:NAMES_data]; + [store removeObjectForKey:SDLNameData]; } } - (NSString *)data { - return [store objectForKey:NAMES_data]; + return [store objectForKey:SDLNameData]; } @end diff --git a/SmartDeviceLink/SDLDeleteCommand.m b/SmartDeviceLink/SDLDeleteCommand.m index 13c51d7ed..1efd2e3da 100644 --- a/SmartDeviceLink/SDLDeleteCommand.m +++ b/SmartDeviceLink/SDLDeleteCommand.m @@ -4,12 +4,12 @@ #import "SDLDeleteCommand.h" -#import "SDLNames.h" + @implementation SDLDeleteCommand - (instancetype)init { - if (self = [super initWithName:NAMES_DeleteCommand]) { + if (self = [super initWithName:SDLNameDeleteCommand]) { } return self; } @@ -22,14 +22,14 @@ - (void)setCmdID:(NSNumber *)cmdID { if (cmdID != nil) { - [parameters setObject:cmdID forKey:NAMES_cmdID]; + [parameters setObject:cmdID forKey:SDLNameCommandId]; } else { - [parameters removeObjectForKey:NAMES_cmdID]; + [parameters removeObjectForKey:SDLNameCommandId]; } } - (NSNumber *)cmdID { - return [parameters objectForKey:NAMES_cmdID]; + return [parameters objectForKey:SDLNameCommandId]; } @end diff --git a/SmartDeviceLink/SDLDeleteCommandResponse.m b/SmartDeviceLink/SDLDeleteCommandResponse.m index 3c3d5b7a7..b64398469 100644 --- a/SmartDeviceLink/SDLDeleteCommandResponse.m +++ b/SmartDeviceLink/SDLDeleteCommandResponse.m @@ -4,12 +4,12 @@ #import "SDLDeleteCommandResponse.h" -#import "SDLNames.h" + @implementation SDLDeleteCommandResponse - (instancetype)init { - if (self = [super initWithName:NAMES_DeleteCommand]) { + if (self = [super initWithName:SDLNameDeleteCommand]) { } return self; } diff --git a/SmartDeviceLink/SDLDeleteFile.m b/SmartDeviceLink/SDLDeleteFile.m index d7a4c18b2..d98bde7a4 100644 --- a/SmartDeviceLink/SDLDeleteFile.m +++ b/SmartDeviceLink/SDLDeleteFile.m @@ -4,12 +4,12 @@ #import "SDLDeleteFile.h" -#import "SDLNames.h" + @implementation SDLDeleteFile - (instancetype)init { - if (self = [super initWithName:NAMES_DeleteFile]) { + if (self = [super initWithName:SDLNameDeleteFile]) { } return self; } @@ -22,14 +22,14 @@ - (void)setSyncFileName:(NSString *)syncFileName { if (syncFileName != nil) { - [parameters setObject:syncFileName forKey:NAMES_syncFileName]; + [parameters setObject:syncFileName forKey:SDLNameSyncFileName]; } else { - [parameters removeObjectForKey:NAMES_syncFileName]; + [parameters removeObjectForKey:SDLNameSyncFileName]; } } - (NSString *)syncFileName { - return [parameters objectForKey:NAMES_syncFileName]; + return [parameters objectForKey:SDLNameSyncFileName]; } @end diff --git a/SmartDeviceLink/SDLDeleteFileResponse.m b/SmartDeviceLink/SDLDeleteFileResponse.m index b94075b39..193e8c13f 100644 --- a/SmartDeviceLink/SDLDeleteFileResponse.m +++ b/SmartDeviceLink/SDLDeleteFileResponse.m @@ -4,12 +4,12 @@ #import "SDLDeleteFileResponse.h" -#import "SDLNames.h" + @implementation SDLDeleteFileResponse - (instancetype)init { - if (self = [super initWithName:NAMES_DeleteFile]) { + if (self = [super initWithName:SDLNameDeleteFile]) { } return self; } @@ -22,14 +22,14 @@ - (void)setSpaceAvailable:(NSNumber *)spaceAvailable { if (spaceAvailable != nil) { - [parameters setObject:spaceAvailable forKey:NAMES_spaceAvailable]; + [parameters setObject:spaceAvailable forKey:SDLNameSpaceAvailable]; } else { - [parameters removeObjectForKey:NAMES_spaceAvailable]; + [parameters removeObjectForKey:SDLNameSpaceAvailable]; } } - (NSNumber *)spaceAvailable { - return [parameters objectForKey:NAMES_spaceAvailable]; + return [parameters objectForKey:SDLNameSpaceAvailable]; } @end diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m index fd5d202b1..a70a24176 100644 --- a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m +++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m @@ -4,12 +4,12 @@ #import "SDLDeleteInteractionChoiceSet.h" -#import "SDLNames.h" + @implementation SDLDeleteInteractionChoiceSet - (instancetype)init { - if (self = [super initWithName:NAMES_DeleteInteractionChoiceSet]) { + if (self = [super initWithName:SDLNameDeleteInteractionChoiceSet]) { } return self; } @@ -22,14 +22,14 @@ - (void)setInteractionChoiceSetID:(NSNumber *)interactionChoiceSetID { if (interactionChoiceSetID != nil) { - [parameters setObject:interactionChoiceSetID forKey:NAMES_interactionChoiceSetID]; + [parameters setObject:interactionChoiceSetID forKey:SDLNameInteractionChoiceSetId]; } else { - [parameters removeObjectForKey:NAMES_interactionChoiceSetID]; + [parameters removeObjectForKey:SDLNameInteractionChoiceSetId]; } } - (NSNumber *)interactionChoiceSetID { - return [parameters objectForKey:NAMES_interactionChoiceSetID]; + return [parameters objectForKey:SDLNameInteractionChoiceSetId]; } @end diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m index 666a758a1..c25ed3355 100644 --- a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m +++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m @@ -4,12 +4,12 @@ #import "SDLDeleteInteractionChoiceSetResponse.h" -#import "SDLNames.h" + @implementation SDLDeleteInteractionChoiceSetResponse - (instancetype)init { - if (self = [super initWithName:NAMES_DeleteInteractionChoiceSet]) { + if (self = [super initWithName:SDLNameDeleteInteractionChoiceSet]) { } return self; } diff --git a/SmartDeviceLink/SDLDeleteSubMenu.m b/SmartDeviceLink/SDLDeleteSubMenu.m index 8727f44d3..8638120e2 100644 --- a/SmartDeviceLink/SDLDeleteSubMenu.m +++ b/SmartDeviceLink/SDLDeleteSubMenu.m @@ -4,12 +4,12 @@ #import "SDLDeleteSubMenu.h" -#import "SDLNames.h" + @implementation SDLDeleteSubMenu - (instancetype)init { - if (self = [super initWithName:NAMES_DeleteSubMenu]) { + if (self = [super initWithName:SDLNameDeleteSubMenu]) { } return self; } @@ -22,14 +22,14 @@ - (void)setMenuID:(NSNumber *)menuID { if (menuID != nil) { - [parameters setObject:menuID forKey:NAMES_menuID]; + [parameters setObject:menuID forKey:SDLNameMenuId]; } else { - [parameters removeObjectForKey:NAMES_menuID]; + [parameters removeObjectForKey:SDLNameMenuId]; } } - (NSNumber *)menuID { - return [parameters objectForKey:NAMES_menuID]; + return [parameters objectForKey:SDLNameMenuId]; } @end diff --git a/SmartDeviceLink/SDLDeleteSubMenuResponse.m b/SmartDeviceLink/SDLDeleteSubMenuResponse.m index b88d9b626..25826eb4a 100644 --- a/SmartDeviceLink/SDLDeleteSubMenuResponse.m +++ b/SmartDeviceLink/SDLDeleteSubMenuResponse.m @@ -4,12 +4,12 @@ #import "SDLDeleteSubMenuResponse.h" -#import "SDLNames.h" + @implementation SDLDeleteSubMenuResponse - (instancetype)init { - if (self = [super initWithName:NAMES_DeleteSubMenu]) { + if (self = [super initWithName:SDLNameDeleteSubMenu]) { } return self; } diff --git a/SmartDeviceLink/SDLDeviceInfo.m b/SmartDeviceLink/SDLDeviceInfo.m index 134aea629..efaca3792 100644 --- a/SmartDeviceLink/SDLDeviceInfo.m +++ b/SmartDeviceLink/SDLDeviceInfo.m @@ -3,7 +3,7 @@ #import "SDLDeviceInfo.h" -#import "SDLNames.h" + @implementation SDLDeviceInfo @@ -22,74 +22,74 @@ - (void)setHardware:(NSString *)hardware { if (hardware != nil) { - [store setObject:hardware forKey:NAMES_hardware]; + [store setObject:hardware forKey:SDLNameHardware]; } else { - [store removeObjectForKey:NAMES_hardware]; + [store removeObjectForKey:SDLNameHardware]; } } - (NSString *)hardware { - return [store objectForKey:NAMES_hardware]; + return [store objectForKey:SDLNameHardware]; } - (void)setFirmwareRev:(NSString *)firmwareRev { if (firmwareRev != nil) { - [store setObject:firmwareRev forKey:NAMES_firmwareRev]; + [store setObject:firmwareRev forKey:SDLNameFirmwareRev]; } else { - [store removeObjectForKey:NAMES_firmwareRev]; + [store removeObjectForKey:SDLNameFirmwareRev]; } } - (NSString *)firmwareRev { - return [store objectForKey:NAMES_firmwareRev]; + return [store objectForKey:SDLNameFirmwareRev]; } - (void)setOs:(NSString *)os { if (os != nil) { - [store setObject:os forKey:NAMES_os]; + [store setObject:os forKey:SDLNameOs]; } else { - [store removeObjectForKey:NAMES_os]; + [store removeObjectForKey:SDLNameOs]; } } - (NSString *)os { - return [store objectForKey:NAMES_os]; + return [store objectForKey:SDLNameOs]; } - (void)setOsVersion:(NSString *)osVersion { if (osVersion != nil) { - [store setObject:osVersion forKey:NAMES_osVersion]; + [store setObject:osVersion forKey:SDLNameOsVersion]; } else { - [store removeObjectForKey:NAMES_osVersion]; + [store removeObjectForKey:SDLNameOsVersion]; } } - (NSString *)osVersion { - return [store objectForKey:NAMES_osVersion]; + return [store objectForKey:SDLNameOsVersion]; } - (void)setCarrier:(NSString *)carrier { if (carrier != nil) { - [store setObject:carrier forKey:NAMES_carrier]; + [store setObject:carrier forKey:SDLNameCarrier]; } else { - [store removeObjectForKey:NAMES_carrier]; + [store removeObjectForKey:SDLNameCarrier]; } } - (NSString *)carrier { - return [store objectForKey:NAMES_carrier]; + return [store objectForKey:SDLNameCarrier]; } - (void)setMaxNumberRFCOMMPorts:(NSNumber *)maxNumberRFCOMMPorts { if (maxNumberRFCOMMPorts != nil) { - [store setObject:maxNumberRFCOMMPorts forKey:NAMES_maxNumberRFCOMMPorts]; + [store setObject:maxNumberRFCOMMPorts forKey:SDLNameMaxNumberRfcommPorts]; } else { - [store removeObjectForKey:NAMES_maxNumberRFCOMMPorts]; + [store removeObjectForKey:SDLNameMaxNumberRfcommPorts]; } } - (NSNumber *)maxNumberRFCOMMPorts { - return [store objectForKey:NAMES_maxNumberRFCOMMPorts]; + return [store objectForKey:SDLNameMaxNumberRfcommPorts]; } @end diff --git a/SmartDeviceLink/SDLDeviceStatus.m b/SmartDeviceLink/SDLDeviceStatus.m index fbe3b4b96..9c51e5d7e 100644 --- a/SmartDeviceLink/SDLDeviceStatus.m +++ b/SmartDeviceLink/SDLDeviceStatus.m @@ -4,7 +4,7 @@ #import "SDLDeviceStatus.h" #import "SDLDeviceLevelStatus.h" -#import "SDLNames.h" + #import "SDLPrimaryAudioSource.h" @@ -24,74 +24,74 @@ - (void)setVoiceRecOn:(NSNumber *)voiceRecOn { if (voiceRecOn != nil) { - [store setObject:voiceRecOn forKey:NAMES_voiceRecOn]; + [store setObject:voiceRecOn forKey:SDLNameVoiceRecOn]; } else { - [store removeObjectForKey:NAMES_voiceRecOn]; + [store removeObjectForKey:SDLNameVoiceRecOn]; } } - (NSNumber *)voiceRecOn { - return [store objectForKey:NAMES_voiceRecOn]; + return [store objectForKey:SDLNameVoiceRecOn]; } - (void)setBtIconOn:(NSNumber *)btIconOn { if (btIconOn != nil) { - [store setObject:btIconOn forKey:NAMES_btIconOn]; + [store setObject:btIconOn forKey:SDLNameBluetoothIconOn]; } else { - [store removeObjectForKey:NAMES_btIconOn]; + [store removeObjectForKey:SDLNameBluetoothIconOn]; } } - (NSNumber *)btIconOn { - return [store objectForKey:NAMES_btIconOn]; + return [store objectForKey:SDLNameBluetoothIconOn]; } - (void)setCallActive:(NSNumber *)callActive { if (callActive != nil) { - [store setObject:callActive forKey:NAMES_callActive]; + [store setObject:callActive forKey:SDLNameCallActive]; } else { - [store removeObjectForKey:NAMES_callActive]; + [store removeObjectForKey:SDLNameCallActive]; } } - (NSNumber *)callActive { - return [store objectForKey:NAMES_callActive]; + return [store objectForKey:SDLNameCallActive]; } - (void)setPhoneRoaming:(NSNumber *)phoneRoaming { if (phoneRoaming != nil) { - [store setObject:phoneRoaming forKey:NAMES_phoneRoaming]; + [store setObject:phoneRoaming forKey:SDLNamePhoneRoaming]; } else { - [store removeObjectForKey:NAMES_phoneRoaming]; + [store removeObjectForKey:SDLNamePhoneRoaming]; } } - (NSNumber *)phoneRoaming { - return [store objectForKey:NAMES_phoneRoaming]; + return [store objectForKey:SDLNamePhoneRoaming]; } - (void)setTextMsgAvailable:(NSNumber *)textMsgAvailable { if (textMsgAvailable != nil) { - [store setObject:textMsgAvailable forKey:NAMES_textMsgAvailable]; + [store setObject:textMsgAvailable forKey:SDLNameTextMsgAvailable]; } else { - [store removeObjectForKey:NAMES_textMsgAvailable]; + [store removeObjectForKey:SDLNameTextMsgAvailable]; } } - (NSNumber *)textMsgAvailable { - return [store objectForKey:NAMES_textMsgAvailable]; + return [store objectForKey:SDLNameTextMsgAvailable]; } - (void)setBattLevelStatus:(SDLDeviceLevelStatus *)battLevelStatus { if (battLevelStatus != nil) { - [store setObject:battLevelStatus forKey:NAMES_battLevelStatus]; + [store setObject:battLevelStatus forKey:SDLNameBattLevelStatus]; } else { - [store removeObjectForKey:NAMES_battLevelStatus]; + [store removeObjectForKey:SDLNameBattLevelStatus]; } } - (SDLDeviceLevelStatus *)battLevelStatus { - NSObject *obj = [store objectForKey:NAMES_battLevelStatus]; + NSObject *obj = [store objectForKey:SDLNameBattLevelStatus]; if (obj == nil || [obj isKindOfClass:SDLDeviceLevelStatus.class]) { return (SDLDeviceLevelStatus *)obj; } else { @@ -101,38 +101,38 @@ - (void)setStereoAudioOutputMuted:(NSNumber *)stereoAudioOutputMuted { if (stereoAudioOutputMuted != nil) { - [store setObject:stereoAudioOutputMuted forKey:NAMES_stereoAudioOutputMuted]; + [store setObject:stereoAudioOutputMuted forKey:SDLNameStereoAudioOutputMuted]; } else { - [store removeObjectForKey:NAMES_stereoAudioOutputMuted]; + [store removeObjectForKey:SDLNameStereoAudioOutputMuted]; } } - (NSNumber *)stereoAudioOutputMuted { - return [store objectForKey:NAMES_stereoAudioOutputMuted]; + return [store objectForKey:SDLNameStereoAudioOutputMuted]; } - (void)setMonoAudioOutputMuted:(NSNumber *)monoAudioOutputMuted { if (monoAudioOutputMuted != nil) { - [store setObject:monoAudioOutputMuted forKey:NAMES_monoAudioOutputMuted]; + [store setObject:monoAudioOutputMuted forKey:SDLNameMonoAudioOutputMuted]; } else { - [store removeObjectForKey:NAMES_monoAudioOutputMuted]; + [store removeObjectForKey:SDLNameMonoAudioOutputMuted]; } } - (NSNumber *)monoAudioOutputMuted { - return [store objectForKey:NAMES_monoAudioOutputMuted]; + return [store objectForKey:SDLNameMonoAudioOutputMuted]; } - (void)setSignalLevelStatus:(SDLDeviceLevelStatus *)signalLevelStatus { if (signalLevelStatus != nil) { - [store setObject:signalLevelStatus forKey:NAMES_signalLevelStatus]; + [store setObject:signalLevelStatus forKey:SDLNameSignalLevelStatus]; } else { - [store removeObjectForKey:NAMES_signalLevelStatus]; + [store removeObjectForKey:SDLNameSignalLevelStatus]; } } - (SDLDeviceLevelStatus *)signalLevelStatus { - NSObject *obj = [store objectForKey:NAMES_signalLevelStatus]; + NSObject *obj = [store objectForKey:SDLNameSignalLevelStatus]; if (obj == nil || [obj isKindOfClass:SDLDeviceLevelStatus.class]) { return (SDLDeviceLevelStatus *)obj; } else { @@ -142,14 +142,14 @@ - (void)setPrimaryAudioSource:(SDLPrimaryAudioSource *)primaryAudioSource { if (primaryAudioSource != nil) { - [store setObject:primaryAudioSource forKey:NAMES_primaryAudioSource]; + [store setObject:primaryAudioSource forKey:SDLNamePrimaryAudioSource]; } else { - [store removeObjectForKey:NAMES_primaryAudioSource]; + [store removeObjectForKey:SDLNamePrimaryAudioSource]; } } - (SDLPrimaryAudioSource *)primaryAudioSource { - NSObject *obj = [store objectForKey:NAMES_primaryAudioSource]; + NSObject *obj = [store objectForKey:SDLNamePrimaryAudioSource]; if (obj == nil || [obj isKindOfClass:SDLPrimaryAudioSource.class]) { return (SDLPrimaryAudioSource *)obj; } else { @@ -159,14 +159,14 @@ - (void)setECallEventActive:(NSNumber *)eCallEventActive { if (eCallEventActive != nil) { - [store setObject:eCallEventActive forKey:NAMES_eCallEventActive]; + [store setObject:eCallEventActive forKey:SDLNameECallEventActive]; } else { - [store removeObjectForKey:NAMES_eCallEventActive]; + [store removeObjectForKey:SDLNameECallEventActive]; } } - (NSNumber *)eCallEventActive { - return [store objectForKey:NAMES_eCallEventActive]; + return [store objectForKey:SDLNameECallEventActive]; } @end diff --git a/SmartDeviceLink/SDLDiagnosticMessage.m b/SmartDeviceLink/SDLDiagnosticMessage.m index 8a45a8650..fa0f40ca5 100644 --- a/SmartDeviceLink/SDLDiagnosticMessage.m +++ b/SmartDeviceLink/SDLDiagnosticMessage.m @@ -4,12 +4,12 @@ #import "SDLDiagnosticMessage.h" -#import "SDLNames.h" + @implementation SDLDiagnosticMessage - (instancetype)init { - if (self = [super initWithName:NAMES_DiagnosticMessage]) { + if (self = [super initWithName:SDLNameDiagnosticMessage]) { } return self; } @@ -22,38 +22,38 @@ - (void)setTargetID:(NSNumber *)targetID { if (targetID != nil) { - [parameters setObject:targetID forKey:NAMES_targetID]; + [parameters setObject:targetID forKey:SDLNameTargetId]; } else { - [parameters removeObjectForKey:NAMES_targetID]; + [parameters removeObjectForKey:SDLNameTargetId]; } } - (NSNumber *)targetID { - return [parameters objectForKey:NAMES_targetID]; + return [parameters objectForKey:SDLNameTargetId]; } - (void)setMessageLength:(NSNumber *)messageLength { if (messageLength != nil) { - [parameters setObject:messageLength forKey:NAMES_messageLength]; + [parameters setObject:messageLength forKey:SDLNameMessageLength]; } else { - [parameters removeObjectForKey:NAMES_messageLength]; + [parameters removeObjectForKey:SDLNameMessageLength]; } } - (NSNumber *)messageLength { - return [parameters objectForKey:NAMES_messageLength]; + return [parameters objectForKey:SDLNameMessageLength]; } - (void)setMessageData:(NSMutableArray *)messageData { if (messageData != nil) { - [parameters setObject:messageData forKey:NAMES_messageData]; + [parameters setObject:messageData forKey:SDLNameMessageData]; } else { - [parameters removeObjectForKey:NAMES_messageData]; + [parameters removeObjectForKey:SDLNameMessageData]; } } - (NSMutableArray *)messageData { - return [parameters objectForKey:NAMES_messageData]; + return [parameters objectForKey:SDLNameMessageData]; } @end diff --git a/SmartDeviceLink/SDLDiagnosticMessageResponse.m b/SmartDeviceLink/SDLDiagnosticMessageResponse.m index f8215d977..809e10fa7 100644 --- a/SmartDeviceLink/SDLDiagnosticMessageResponse.m +++ b/SmartDeviceLink/SDLDiagnosticMessageResponse.m @@ -3,12 +3,12 @@ #import "SDLDiagnosticMessageResponse.h" -#import "SDLNames.h" + @implementation SDLDiagnosticMessageResponse - (instancetype)init { - if (self = [super initWithName:NAMES_DiagnosticMessage]) { + if (self = [super initWithName:SDLNameDiagnosticMessage]) { } return self; } @@ -21,14 +21,14 @@ - (void)setMessageDataResult:(NSMutableArray *)messageDataResult { if (messageDataResult != nil) { - [parameters setObject:messageDataResult forKey:NAMES_messageDataResult]; + [parameters setObject:messageDataResult forKey:SDLNameMessageDataResult]; } else { - [parameters removeObjectForKey:NAMES_messageDataResult]; + [parameters removeObjectForKey:SDLNameMessageDataResult]; } } - (NSMutableArray *)messageDataResult { - return [parameters objectForKey:NAMES_messageDataResult]; + return [parameters objectForKey:SDLNameMessageDataResult]; } @end diff --git a/SmartDeviceLink/SDLDialNumber.m b/SmartDeviceLink/SDLDialNumber.m index 856f9ad75..d46d91c33 100644 --- a/SmartDeviceLink/SDLDialNumber.m +++ b/SmartDeviceLink/SDLDialNumber.m @@ -4,12 +4,12 @@ #import "SDLDialNumber.h" -#import "SDLNames.h" + @implementation SDLDialNumber - (instancetype)init { - if (self = [super initWithName:NAMES_DialNumber]) { + if (self = [super initWithName:SDLNameDialNumber]) { } return self; } @@ -22,14 +22,14 @@ - (void)setNumber:(NSString *)number { if (number != nil) { - parameters[NAMES_number] = number; + parameters[SDLNameNumber] = number; } else { - [parameters removeObjectForKey:NAMES_number]; + [parameters removeObjectForKey:SDLNameNumber]; } } - (NSString *)number { - return parameters[NAMES_number]; + return parameters[SDLNameNumber]; } @end diff --git a/SmartDeviceLink/SDLDialNumberResponse.m b/SmartDeviceLink/SDLDialNumberResponse.m index a0b6dd83e..dca7115b6 100644 --- a/SmartDeviceLink/SDLDialNumberResponse.m +++ b/SmartDeviceLink/SDLDialNumberResponse.m @@ -4,13 +4,13 @@ #import "SDLDialNumberResponse.h" -#import "SDLNames.h" + @implementation SDLDialNumberResponse - (instancetype)init { - if (self = [super initWithName:NAMES_DialNumber]) { + if (self = [super initWithName:SDLNameDialNumber]) { } return self; } diff --git a/SmartDeviceLink/SDLDisplayCapabilities.m b/SmartDeviceLink/SDLDisplayCapabilities.m index 07ae53d62..d1e8af52f 100644 --- a/SmartDeviceLink/SDLDisplayCapabilities.m +++ b/SmartDeviceLink/SDLDisplayCapabilities.m @@ -6,7 +6,7 @@ #import "SDLDisplayType.h" #import "SDLImageField.h" #import "SDLMediaClockFormat.h" -#import "SDLNames.h" + #import "SDLScreenParams.h" #import "SDLTextField.h" @@ -27,14 +27,14 @@ - (void)setDisplayType:(SDLDisplayType *)displayType { if (displayType != nil) { - [store setObject:displayType forKey:NAMES_displayType]; + [store setObject:displayType forKey:SDLNameDisplayType]; } else { - [store removeObjectForKey:NAMES_displayType]; + [store removeObjectForKey:SDLNameDisplayType]; } } - (SDLDisplayType *)displayType { - NSObject *obj = [store objectForKey:NAMES_displayType]; + NSObject *obj = [store objectForKey:SDLNameDisplayType]; if (obj == nil || [obj isKindOfClass:SDLDisplayType.class]) { return (SDLDisplayType *)obj; } else { @@ -44,14 +44,14 @@ - (void)setTextFields:(NSMutableArray *)textFields { if (textFields != nil) { - [store setObject:textFields forKey:NAMES_textFields]; + [store setObject:textFields forKey:SDLNameTextFields]; } else { - [store removeObjectForKey:NAMES_textFields]; + [store removeObjectForKey:SDLNameTextFields]; } } - (NSMutableArray *)textFields { - NSMutableArray *array = [store objectForKey:NAMES_textFields]; + NSMutableArray *array = [store objectForKey:SDLNameTextFields]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTextField.class]) { return array; } else { @@ -65,14 +65,14 @@ - (void)setImageFields:(NSMutableArray *)imageFields { if (imageFields != nil) { - [store setObject:imageFields forKey:NAMES_imageFields]; + [store setObject:imageFields forKey:SDLNameImageFields]; } else { - [store removeObjectForKey:NAMES_imageFields]; + [store removeObjectForKey:SDLNameImageFields]; } } - (NSMutableArray *)imageFields { - NSMutableArray *array = [store objectForKey:NAMES_imageFields]; + NSMutableArray *array = [store objectForKey:SDLNameImageFields]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLImageField.class]) { return array; } else { @@ -86,14 +86,14 @@ - (void)setMediaClockFormats:(NSMutableArray *)mediaClockFormats { if (mediaClockFormats != nil) { - [store setObject:mediaClockFormats forKey:NAMES_mediaClockFormats]; + [store setObject:mediaClockFormats forKey:SDLNameMediaClockFormats]; } else { - [store removeObjectForKey:NAMES_mediaClockFormats]; + [store removeObjectForKey:SDLNameMediaClockFormats]; } } - (NSMutableArray *)mediaClockFormats { - NSMutableArray *array = [store objectForKey:NAMES_mediaClockFormats]; + NSMutableArray *array = [store objectForKey:SDLNameMediaClockFormats]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLMediaClockFormat.class]) { return array; } else { @@ -107,38 +107,38 @@ - (void)setGraphicSupported:(NSNumber *)graphicSupported { if (graphicSupported != nil) { - [store setObject:graphicSupported forKey:NAMES_graphicSupported]; + [store setObject:graphicSupported forKey:SDLNameGraphicSupported]; } else { - [store removeObjectForKey:NAMES_graphicSupported]; + [store removeObjectForKey:SDLNameGraphicSupported]; } } - (NSNumber *)graphicSupported { - return [store objectForKey:NAMES_graphicSupported]; + return [store objectForKey:SDLNameGraphicSupported]; } - (void)setTemplatesAvailable:(NSMutableArray *)templatesAvailable { if (templatesAvailable != nil) { - [store setObject:templatesAvailable forKey:NAMES_templatesAvailable]; + [store setObject:templatesAvailable forKey:SDLNameTemplatesAvailable]; } else { - [store removeObjectForKey:NAMES_templatesAvailable]; + [store removeObjectForKey:SDLNameTemplatesAvailable]; } } - (NSMutableArray *)templatesAvailable { - return [store objectForKey:NAMES_templatesAvailable]; + return [store objectForKey:SDLNameTemplatesAvailable]; } - (void)setScreenParams:(SDLScreenParams *)screenParams { if (screenParams != nil) { - [store setObject:screenParams forKey:NAMES_screenParams]; + [store setObject:screenParams forKey:SDLNameScreenParams]; } else { - [store removeObjectForKey:NAMES_screenParams]; + [store removeObjectForKey:SDLNameScreenParams]; } } - (SDLScreenParams *)screenParams { - NSObject *obj = [store objectForKey:NAMES_screenParams]; + NSObject *obj = [store objectForKey:SDLNameScreenParams]; if (obj == nil || [obj isKindOfClass:SDLScreenParams.class]) { return (SDLScreenParams *)obj; } else { @@ -148,14 +148,14 @@ - (void)setNumCustomPresetsAvailable:(NSNumber *)numCustomPresetsAvailable { if (numCustomPresetsAvailable != nil) { - [store setObject:numCustomPresetsAvailable forKey:NAMES_numCustomPresetsAvailable]; + [store setObject:numCustomPresetsAvailable forKey:SDLNameNumCustomPresetsAvailable]; } else { - [store removeObjectForKey:NAMES_numCustomPresetsAvailable]; + [store removeObjectForKey:SDLNameNumCustomPresetsAvailable]; } } - (NSNumber *)numCustomPresetsAvailable { - return [store objectForKey:NAMES_numCustomPresetsAvailable]; + return [store objectForKey:SDLNameNumCustomPresetsAvailable]; } @end diff --git a/SmartDeviceLink/SDLECallInfo.m b/SmartDeviceLink/SDLECallInfo.m index 44046fcd0..7205c9d22 100644 --- a/SmartDeviceLink/SDLECallInfo.m +++ b/SmartDeviceLink/SDLECallInfo.m @@ -4,7 +4,7 @@ #import "SDLECallInfo.h" #import "SDLECallConfirmationStatus.h" -#import "SDLNames.h" + #import "SDLVehicleDataNotificationStatus.h" @@ -24,14 +24,14 @@ - (void)setECallNotificationStatus:(SDLVehicleDataNotificationStatus *)eCallNotificationStatus { if (eCallNotificationStatus != nil) { - [store setObject:eCallNotificationStatus forKey:NAMES_eCallNotificationStatus]; + [store setObject:eCallNotificationStatus forKey:SDLNameECallNotificationStatus]; } else { - [store removeObjectForKey:NAMES_eCallNotificationStatus]; + [store removeObjectForKey:SDLNameECallNotificationStatus]; } } - (SDLVehicleDataNotificationStatus *)eCallNotificationStatus { - NSObject *obj = [store objectForKey:NAMES_eCallNotificationStatus]; + NSObject *obj = [store objectForKey:SDLNameECallNotificationStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataNotificationStatus.class]) { return (SDLVehicleDataNotificationStatus *)obj; } else { @@ -41,14 +41,14 @@ - (void)setAuxECallNotificationStatus:(SDLVehicleDataNotificationStatus *)auxECallNotificationStatus { if (auxECallNotificationStatus != nil) { - [store setObject:auxECallNotificationStatus forKey:NAMES_auxECallNotificationStatus]; + [store setObject:auxECallNotificationStatus forKey:SDLNameAuxECallNotificationStatus]; } else { - [store removeObjectForKey:NAMES_auxECallNotificationStatus]; + [store removeObjectForKey:SDLNameAuxECallNotificationStatus]; } } - (SDLVehicleDataNotificationStatus *)auxECallNotificationStatus { - NSObject *obj = [store objectForKey:NAMES_auxECallNotificationStatus]; + NSObject *obj = [store objectForKey:SDLNameAuxECallNotificationStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataNotificationStatus.class]) { return (SDLVehicleDataNotificationStatus *)obj; } else { @@ -58,14 +58,14 @@ - (void)setECallConfirmationStatus:(SDLECallConfirmationStatus *)eCallConfirmationStatus { if (eCallConfirmationStatus != nil) { - [store setObject:eCallConfirmationStatus forKey:NAMES_eCallConfirmationStatus]; + [store setObject:eCallConfirmationStatus forKey:SDLNameECallConfirmationStatus]; } else { - [store removeObjectForKey:NAMES_eCallConfirmationStatus]; + [store removeObjectForKey:SDLNameECallConfirmationStatus]; } } - (SDLECallConfirmationStatus *)eCallConfirmationStatus { - NSObject *obj = [store objectForKey:NAMES_eCallConfirmationStatus]; + NSObject *obj = [store objectForKey:SDLNameECallConfirmationStatus]; if (obj == nil || [obj isKindOfClass:SDLECallConfirmationStatus.class]) { return (SDLECallConfirmationStatus *)obj; } else { diff --git a/SmartDeviceLink/SDLEmergencyEvent.m b/SmartDeviceLink/SDLEmergencyEvent.m index 76fca57e2..5bb2afaed 100644 --- a/SmartDeviceLink/SDLEmergencyEvent.m +++ b/SmartDeviceLink/SDLEmergencyEvent.m @@ -5,7 +5,7 @@ #import "SDLEmergencyEventType.h" #import "SDLFuelCutoffStatus.h" -#import "SDLNames.h" + #import "SDLVehicleDataEventStatus.h" @@ -25,14 +25,14 @@ - (void)setEmergencyEventType:(SDLEmergencyEventType *)emergencyEventType { if (emergencyEventType != nil) { - [store setObject:emergencyEventType forKey:NAMES_emergencyEventType]; + [store setObject:emergencyEventType forKey:SDLNameEmergencyEventType]; } else { - [store removeObjectForKey:NAMES_emergencyEventType]; + [store removeObjectForKey:SDLNameEmergencyEventType]; } } - (SDLEmergencyEventType *)emergencyEventType { - NSObject *obj = [store objectForKey:NAMES_emergencyEventType]; + NSObject *obj = [store objectForKey:SDLNameEmergencyEventType]; if (obj == nil || [obj isKindOfClass:SDLEmergencyEventType.class]) { return (SDLEmergencyEventType *)obj; } else { @@ -42,14 +42,14 @@ - (void)setFuelCutoffStatus:(SDLFuelCutoffStatus *)fuelCutoffStatus { if (fuelCutoffStatus != nil) { - [store setObject:fuelCutoffStatus forKey:NAMES_fuelCutoffStatus]; + [store setObject:fuelCutoffStatus forKey:SDLNameFuelCutoffStatus]; } else { - [store removeObjectForKey:NAMES_fuelCutoffStatus]; + [store removeObjectForKey:SDLNameFuelCutoffStatus]; } } - (SDLFuelCutoffStatus *)fuelCutoffStatus { - NSObject *obj = [store objectForKey:NAMES_fuelCutoffStatus]; + NSObject *obj = [store objectForKey:SDLNameFuelCutoffStatus]; if (obj == nil || [obj isKindOfClass:SDLFuelCutoffStatus.class]) { return (SDLFuelCutoffStatus *)obj; } else { @@ -59,14 +59,14 @@ - (void)setRolloverEvent:(SDLVehicleDataEventStatus *)rolloverEvent { if (rolloverEvent != nil) { - [store setObject:rolloverEvent forKey:NAMES_rolloverEvent]; + [store setObject:rolloverEvent forKey:SDLNameRolloverEvent]; } else { - [store removeObjectForKey:NAMES_rolloverEvent]; + [store removeObjectForKey:SDLNameRolloverEvent]; } } - (SDLVehicleDataEventStatus *)rolloverEvent { - NSObject *obj = [store objectForKey:NAMES_rolloverEvent]; + NSObject *obj = [store objectForKey:SDLNameRolloverEvent]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -76,26 +76,26 @@ - (void)setMaximumChangeVelocity:(NSNumber *)maximumChangeVelocity { if (maximumChangeVelocity != nil) { - [store setObject:maximumChangeVelocity forKey:NAMES_maximumChangeVelocity]; + [store setObject:maximumChangeVelocity forKey:SDLNameMaximumChangeVelocity]; } else { - [store removeObjectForKey:NAMES_maximumChangeVelocity]; + [store removeObjectForKey:SDLNameMaximumChangeVelocity]; } } - (NSNumber *)maximumChangeVelocity { - return [store objectForKey:NAMES_maximumChangeVelocity]; + return [store objectForKey:SDLNameMaximumChangeVelocity]; } - (void)setMultipleEvents:(SDLVehicleDataEventStatus *)multipleEvents { if (multipleEvents != nil) { - [store setObject:multipleEvents forKey:NAMES_multipleEvents]; + [store setObject:multipleEvents forKey:SDLNameMultipleEvents]; } else { - [store removeObjectForKey:NAMES_multipleEvents]; + [store removeObjectForKey:SDLNameMultipleEvents]; } } - (SDLVehicleDataEventStatus *)multipleEvents { - NSObject *obj = [store objectForKey:NAMES_multipleEvents]; + NSObject *obj = [store objectForKey:SDLNameMultipleEvents]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { diff --git a/SmartDeviceLink/SDLEncodedSyncPData.m b/SmartDeviceLink/SDLEncodedSyncPData.m index b44cb7b3e..5461c5343 100644 --- a/SmartDeviceLink/SDLEncodedSyncPData.m +++ b/SmartDeviceLink/SDLEncodedSyncPData.m @@ -4,12 +4,12 @@ #import "SDLEncodedSyncPData.h" -#import "SDLNames.h" + @implementation SDLEncodedSyncPData - (instancetype)init { - if (self = [super initWithName:NAMES_EncodedSyncPData]) { + if (self = [super initWithName:SDLNameEncodedSyncPData]) { } return self; } @@ -22,14 +22,14 @@ - (void)setData:(NSMutableArray *)data { if (data != nil) { - [parameters setObject:data forKey:NAMES_data]; + [parameters setObject:data forKey:SDLNameData]; } else { - [parameters removeObjectForKey:NAMES_data]; + [parameters removeObjectForKey:SDLNameData]; } } - (NSMutableArray *)data { - return [parameters objectForKey:NAMES_data]; + return [parameters objectForKey:SDLNameData]; } @end diff --git a/SmartDeviceLink/SDLEncodedSyncPDataResponse.m b/SmartDeviceLink/SDLEncodedSyncPDataResponse.m index cf899a21b..ae021b1c1 100644 --- a/SmartDeviceLink/SDLEncodedSyncPDataResponse.m +++ b/SmartDeviceLink/SDLEncodedSyncPDataResponse.m @@ -4,12 +4,12 @@ #import "SDLEncodedSyncPDataResponse.h" -#import "SDLNames.h" + @implementation SDLEncodedSyncPDataResponse - (instancetype)init { - if (self = [super initWithName:NAMES_EncodedSyncPData]) { + if (self = [super initWithName:SDLNameEncodedSyncPData]) { } return self; } diff --git a/SmartDeviceLink/SDLEndAudioPassThru.m b/SmartDeviceLink/SDLEndAudioPassThru.m index 576287170..8c4c59edb 100644 --- a/SmartDeviceLink/SDLEndAudioPassThru.m +++ b/SmartDeviceLink/SDLEndAudioPassThru.m @@ -4,12 +4,12 @@ #import "SDLEndAudioPassThru.h" -#import "SDLNames.h" + @implementation SDLEndAudioPassThru - (instancetype)init { - if (self = [super initWithName:NAMES_EndAudioPassThru]) { + if (self = [super initWithName:SDLNameEndAudioPassThru]) { } return self; } diff --git a/SmartDeviceLink/SDLEndAudioPassThruResponse.m b/SmartDeviceLink/SDLEndAudioPassThruResponse.m index 73c3b6336..1d73a804a 100644 --- a/SmartDeviceLink/SDLEndAudioPassThruResponse.m +++ b/SmartDeviceLink/SDLEndAudioPassThruResponse.m @@ -4,12 +4,12 @@ #import "SDLEndAudioPassThruResponse.h" -#import "SDLNames.h" + @implementation SDLEndAudioPassThruResponse - (instancetype)init { - if (self = [super initWithName:NAMES_EndAudioPassThru]) { + if (self = [super initWithName:SDLNameEndAudioPassThru]) { } return self; } diff --git a/SmartDeviceLink/SDLFunctionID.h b/SmartDeviceLink/SDLFunctionID.h index 8bbd1a52a..8d594b61e 100644 --- a/SmartDeviceLink/SDLFunctionID.h +++ b/SmartDeviceLink/SDLFunctionID.h @@ -4,12 +4,11 @@ #import <Foundation/Foundation.h> +#import "SDLNames.h" -@interface SDLFunctionID : NSObject { - NSDictionary *functionIDs; -} +@interface SDLFunctionID : NSObject -- (NSString *)getFunctionName:(int)functionID; -- (NSNumber *)getFunctionID:(NSString *)functionName; +- (SDLName)getFunctionName:(int)functionID; +- (NSNumber *)getFunctionID:(SDLName)functionName; @end diff --git a/SmartDeviceLink/SDLFunctionID.m b/SmartDeviceLink/SDLFunctionID.m index 802ee3df3..9b2c016af 100644 --- a/SmartDeviceLink/SDLFunctionID.m +++ b/SmartDeviceLink/SDLFunctionID.m @@ -4,36 +4,93 @@ #import "SDLFunctionID.h" -#import "SDLNames.h" +@interface SDLFunctionID () + +@property (nonatomic, strong, nonnull) NSDictionary* functionIDs; + +@end @implementation SDLFunctionID - (instancetype)init { if (self = [super init]) { - functionIDs = [NSDictionary dictionaryWithObjectsAndKeys: - NAMES_reserved, @"0", NAMES_RegisterAppInterface, @"1", NAMES_UnregisterAppInterface, @"2", NAMES_SetGlobalProperties, @"3", NAMES_ResetGlobalProperties, @"4", NAMES_AddCommand, @"5", NAMES_DeleteCommand, @"6", NAMES_AddSubMenu, @"7", NAMES_DeleteSubMenu, @"8", NAMES_CreateInteractionChoiceSet, @"9", NAMES_PerformInteraction, @"10", NAMES_DeleteInteractionChoiceSet, @"11", NAMES_Alert, @"12", NAMES_Show, @"13", NAMES_Speak, @"14", NAMES_SetMediaClockTimer, @"15", NAMES_PerformAudioPassThru, @"16", NAMES_EndAudioPassThru, @"17", NAMES_SubscribeButton, @"18", NAMES_UnsubscribeButton, @"19", NAMES_SubscribeVehicleData, @"20", NAMES_UnsubscribeVehicleData, @"21", NAMES_GetVehicleData, @"22", NAMES_ReadDID, @"23", NAMES_GetDTCs, @"24", NAMES_ScrollableMessage, @"25", NAMES_Slider, @"26", NAMES_ShowConstantTBT, @"27", NAMES_AlertManeuver, @"28", NAMES_UpdateTurnList, @"29", NAMES_ChangeRegistration, @"30", NAMES_GenericResponse, @"31", NAMES_PutFile, @"32", NAMES_DeleteFile, @"33", NAMES_ListFiles, @"34", NAMES_SetAppIcon, @"35", NAMES_SetDisplayLayout, @"36", NAMES_DiagnosticMessage, @"37", NAMES_SystemRequest, @"38", NAMES_SendLocation, @"39", NAMES_DialNumber, @"40", NAMES_OnHMIStatus, @"32768", NAMES_OnAppInterfaceUnregistered, @"32769", NAMES_OnButtonEvent, @"32770", NAMES_OnButtonPress, @"32771", NAMES_OnVehicleData, @"32772", NAMES_OnCommand, @"32773", NAMES_OnTBTClientState, @"32774", NAMES_OnDriverDistraction, @"32775", NAMES_OnPermissionsChange, @"32776", NAMES_OnAudioPassThru, @"32777", NAMES_OnLanguageChange, @"32778", NAMES_OnKeyboardInput, @"32779", NAMES_OnTouchEvent, @"32780", NAMES_OnSystemRequest, @"32781", NAMES_OnHashChange, @"32782", - - NAMES_EncodedSyncPData, - @"65536", - NAMES_SyncPData, - @"65537", - - NAMES_OnEncodedSyncPData, - @"98304", - NAMES_OnSyncPData, - @"98305", - nil]; + static NSDictionary* functionIDs = nil; + if (functionIDs == nil) { + functionIDs = @{ + @0: SDLNameReserved, + @1: SDLNameRegisterAppInterface, + @2: SDLNameUnregisterAppInterface, + @3: SDLNameSetGlobalProperties, + @4: SDLNameResetGlobalProperties, + @5: SDLNameAddCommand, + @6: SDLNameDeleteCommand, + @7: SDLNameAddSubMenu, + @8: SDLNameDeleteSubMenu, + @9: SDLNameCreateInteractionChoiceSet, + @10: SDLNamePerformInteraction, + @11: SDLNameDeleteInteractionChoiceSet, + @12: SDLNameAlert, + @13: SDLNameShow, + @14: SDLNameSpeak, + @15: SDLNameSetMediaClockTimer, + @16: SDLNamePerformAudioPassThru, + @17: SDLNameEndAudioPassThru, + @18: SDLNameSubscribeButton, + @19: SDLNameUnsubscribeButton, + @20: SDLNameSubscribeVehicleData, + @21: SDLNameUnsubscribeVehicleData, + @22: SDLNameGetVehicleData, + @23: SDLNameReadDid, + @24: SDLNameGetDtcs, + @25: SDLNameScrollableMessage, + @26: SDLNameSlider, + @27: SDLNameShowConstantTbt, + @28: SDLNameAlertManeuver, + @29: SDLNameUpdateTurnList, + @30: SDLNameChangeRegistration, + @31: SDLNameGenericResponse, + @32: SDLNamePutFile, + @33: SDLNameDeleteFile, + @34: SDLNameListFiles, + @35: SDLNameSetAppIcon, + @36: SDLNameSetDisplayLayout, + @37: SDLNameDiagnosticMessage, + @38: SDLNameSystemRequest, + @39: SDLNameSendLocation, + @40: SDLNameDialNumber, + @32768: SDLNameOnHmiStatus, + @32769: SDLNameOnAppInterfaceUnregistered, + @32770: SDLNameOnButtonEvent, + @32771: SDLNameOnButtonPress, + @32772: SDLNameOnVehicleData, + @32773: SDLNameOnCommand, + @32774: SDLNameOnTbtClientState, + @32775: SDLNameOnDriverDistraction, + @32776: SDLNameOnPermissionsChange, + @32777: SDLNameOnAudioPassThru, + @32778: SDLNameOnLanguageChange, + @32779: SDLNameOnKeyboardInput, + @32780: SDLNameOnTouchEvent, + @32781: SDLNameOnSystemRequest, + @32782: SDLNameOnHashChange, + @65536: SDLNameEncodedSyncPData, + @65537: SDLNameSyncPData, + @98304: SDLNameOnEncodedSyncPData, + @98305: SDLNameOnSyncPData + }; + } + self.functionIDs = functionIDs; } return self; } -- (NSString *)getFunctionName:(int)functionID { - return [functionIDs objectForKey:[NSString stringWithFormat:@"%d", functionID]]; +- (SDLName)getFunctionName:(int)functionID { + return [self.functionIDs objectForKey:@(functionID)]; } -- (NSNumber *)getFunctionID:(NSString *)functionName { - return [NSNumber numberWithInt:[[[functionIDs allKeysForObject:functionName] objectAtIndex:0] intValue]]; +- (NSNumber *)getFunctionID:(SDLName)functionName { + return [[self.functionIDs allKeysForObject:functionName] firstObject]; } diff --git a/SmartDeviceLink/SDLGPSData.m b/SmartDeviceLink/SDLGPSData.m index 1cec52112..096285d8e 100644 --- a/SmartDeviceLink/SDLGPSData.m +++ b/SmartDeviceLink/SDLGPSData.m @@ -5,7 +5,7 @@ #import "SDLCompassDirection.h" #import "SDLDimension.h" -#import "SDLNames.h" + @implementation SDLGPSData @@ -24,110 +24,110 @@ - (void)setLongitudeDegrees:(NSNumber *)longitudeDegrees { if (longitudeDegrees != nil) { - [store setObject:longitudeDegrees forKey:NAMES_longitudeDegrees]; + [store setObject:longitudeDegrees forKey:SDLNameLongitudeDegrees]; } else { - [store removeObjectForKey:NAMES_longitudeDegrees]; + [store removeObjectForKey:SDLNameLongitudeDegrees]; } } - (NSNumber *)longitudeDegrees { - return [store objectForKey:NAMES_longitudeDegrees]; + return [store objectForKey:SDLNameLongitudeDegrees]; } - (void)setLatitudeDegrees:(NSNumber *)latitudeDegrees { if (latitudeDegrees != nil) { - [store setObject:latitudeDegrees forKey:NAMES_latitudeDegrees]; + [store setObject:latitudeDegrees forKey:SDLNameLatitudeDegrees]; } else { - [store removeObjectForKey:NAMES_latitudeDegrees]; + [store removeObjectForKey:SDLNameLatitudeDegrees]; } } - (NSNumber *)latitudeDegrees { - return [store objectForKey:NAMES_latitudeDegrees]; + return [store objectForKey:SDLNameLatitudeDegrees]; } - (void)setUtcYear:(NSNumber *)utcYear { if (utcYear != nil) { - [store setObject:utcYear forKey:NAMES_utcYear]; + [store setObject:utcYear forKey:SDLNameUtcYear]; } else { - [store removeObjectForKey:NAMES_utcYear]; + [store removeObjectForKey:SDLNameUtcYear]; } } - (NSNumber *)utcYear { - return [store objectForKey:NAMES_utcYear]; + return [store objectForKey:SDLNameUtcYear]; } - (void)setUtcMonth:(NSNumber *)utcMonth { if (utcMonth != nil) { - [store setObject:utcMonth forKey:NAMES_utcMonth]; + [store setObject:utcMonth forKey:SDLNameUtcMonth]; } else { - [store removeObjectForKey:NAMES_utcMonth]; + [store removeObjectForKey:SDLNameUtcMonth]; } } - (NSNumber *)utcMonth { - return [store objectForKey:NAMES_utcMonth]; + return [store objectForKey:SDLNameUtcMonth]; } - (void)setUtcDay:(NSNumber *)utcDay { if (utcDay != nil) { - [store setObject:utcDay forKey:NAMES_utcDay]; + [store setObject:utcDay forKey:SDLNameUtcDay]; } else { - [store removeObjectForKey:NAMES_utcDay]; + [store removeObjectForKey:SDLNameUtcDay]; } } - (NSNumber *)utcDay { - return [store objectForKey:NAMES_utcDay]; + return [store objectForKey:SDLNameUtcDay]; } - (void)setUtcHours:(NSNumber *)utcHours { if (utcHours != nil) { - [store setObject:utcHours forKey:NAMES_utcHours]; + [store setObject:utcHours forKey:SDLNameUtcHours]; } else { - [store removeObjectForKey:NAMES_utcHours]; + [store removeObjectForKey:SDLNameUtcHours]; } } - (NSNumber *)utcHours { - return [store objectForKey:NAMES_utcHours]; + return [store objectForKey:SDLNameUtcHours]; } - (void)setUtcMinutes:(NSNumber *)utcMinutes { if (utcMinutes != nil) { - [store setObject:utcMinutes forKey:NAMES_utcMinutes]; + [store setObject:utcMinutes forKey:SDLNameUtcMinutes]; } else { - [store removeObjectForKey:NAMES_utcMinutes]; + [store removeObjectForKey:SDLNameUtcMinutes]; } } - (NSNumber *)utcMinutes { - return [store objectForKey:NAMES_utcMinutes]; + return [store objectForKey:SDLNameUtcMinutes]; } - (void)setUtcSeconds:(NSNumber *)utcSeconds { if (utcSeconds != nil) { - [store setObject:utcSeconds forKey:NAMES_utcSeconds]; + [store setObject:utcSeconds forKey:SDLNameUtcSeconds]; } else { - [store removeObjectForKey:NAMES_utcSeconds]; + [store removeObjectForKey:SDLNameUtcSeconds]; } } - (NSNumber *)utcSeconds { - return [store objectForKey:NAMES_utcSeconds]; + return [store objectForKey:SDLNameUtcSeconds]; } - (void)setCompassDirection:(SDLCompassDirection *)compassDirection { if (compassDirection != nil) { - [store setObject:compassDirection forKey:NAMES_compassDirection]; + [store setObject:compassDirection forKey:SDLNameCompassDirection]; } else { - [store removeObjectForKey:NAMES_compassDirection]; + [store removeObjectForKey:SDLNameCompassDirection]; } } - (SDLCompassDirection *)compassDirection { - NSObject *obj = [store objectForKey:NAMES_compassDirection]; + NSObject *obj = [store objectForKey:SDLNameCompassDirection]; if (obj == nil || [obj isKindOfClass:SDLCompassDirection.class]) { return (SDLCompassDirection *)obj; } else { @@ -137,74 +137,74 @@ - (void)setPdop:(NSNumber *)pdop { if (pdop != nil) { - [store setObject:pdop forKey:NAMES_pdop]; + [store setObject:pdop forKey:SDLNamePdop]; } else { - [store removeObjectForKey:NAMES_pdop]; + [store removeObjectForKey:SDLNamePdop]; } } - (NSNumber *)pdop { - return [store objectForKey:NAMES_pdop]; + return [store objectForKey:SDLNamePdop]; } - (void)setHdop:(NSNumber *)hdop { if (hdop != nil) { - [store setObject:hdop forKey:NAMES_hdop]; + [store setObject:hdop forKey:SDLNameHdop]; } else { - [store removeObjectForKey:NAMES_hdop]; + [store removeObjectForKey:SDLNameHdop]; } } - (NSNumber *)hdop { - return [store objectForKey:NAMES_hdop]; + return [store objectForKey:SDLNameHdop]; } - (void)setVdop:(NSNumber *)vdop { if (vdop != nil) { - [store setObject:vdop forKey:NAMES_vdop]; + [store setObject:vdop forKey:SDLNameVdop]; } else { - [store removeObjectForKey:NAMES_vdop]; + [store removeObjectForKey:SDLNameVdop]; } } - (NSNumber *)vdop { - return [store objectForKey:NAMES_vdop]; + return [store objectForKey:SDLNameVdop]; } - (void)setActual:(NSNumber *)actual { if (actual != nil) { - [store setObject:actual forKey:NAMES_actual]; + [store setObject:actual forKey:SDLNameActual]; } else { - [store removeObjectForKey:NAMES_actual]; + [store removeObjectForKey:SDLNameActual]; } } - (NSNumber *)actual { - return [store objectForKey:NAMES_actual]; + return [store objectForKey:SDLNameActual]; } - (void)setSatellites:(NSNumber *)satellites { if (satellites != nil) { - [store setObject:satellites forKey:NAMES_satellites]; + [store setObject:satellites forKey:SDLNameSatellites]; } else { - [store removeObjectForKey:NAMES_satellites]; + [store removeObjectForKey:SDLNameSatellites]; } } - (NSNumber *)satellites { - return [store objectForKey:NAMES_satellites]; + return [store objectForKey:SDLNameSatellites]; } - (void)setDimension:(SDLDimension *)dimension { if (dimension != nil) { - [store setObject:dimension forKey:NAMES_dimension]; + [store setObject:dimension forKey:SDLNameDimension]; } else { - [store removeObjectForKey:NAMES_dimension]; + [store removeObjectForKey:SDLNameDimension]; } } - (SDLDimension *)dimension { - NSObject *obj = [store objectForKey:NAMES_dimension]; + NSObject *obj = [store objectForKey:SDLNameDimension]; if (obj == nil || [obj isKindOfClass:SDLDimension.class]) { return (SDLDimension *)obj; } else { @@ -214,38 +214,38 @@ - (void)setAltitude:(NSNumber *)altitude { if (altitude != nil) { - [store setObject:altitude forKey:NAMES_altitude]; + [store setObject:altitude forKey:SDLNameAltitude]; } else { - [store removeObjectForKey:NAMES_altitude]; + [store removeObjectForKey:SDLNameAltitude]; } } - (NSNumber *)altitude { - return [store objectForKey:NAMES_altitude]; + return [store objectForKey:SDLNameAltitude]; } - (void)setHeading:(NSNumber *)heading { if (heading != nil) { - [store setObject:heading forKey:NAMES_heading]; + [store setObject:heading forKey:SDLNameHeading]; } else { - [store removeObjectForKey:NAMES_heading]; + [store removeObjectForKey:SDLNameHeading]; } } - (NSNumber *)heading { - return [store objectForKey:NAMES_heading]; + return [store objectForKey:SDLNameHeading]; } - (void)setSpeed:(NSNumber *)speed { if (speed != nil) { - [store setObject:speed forKey:NAMES_speed]; + [store setObject:speed forKey:SDLNameSpeed]; } else { - [store removeObjectForKey:NAMES_speed]; + [store removeObjectForKey:SDLNameSpeed]; } } - (NSNumber *)speed { - return [store objectForKey:NAMES_speed]; + return [store objectForKey:SDLNameSpeed]; } @end diff --git a/SmartDeviceLink/SDLGenericResponse.m b/SmartDeviceLink/SDLGenericResponse.m index aff982d8f..e3efaaeb8 100644 --- a/SmartDeviceLink/SDLGenericResponse.m +++ b/SmartDeviceLink/SDLGenericResponse.m @@ -4,12 +4,12 @@ #import "SDLGenericResponse.h" -#import "SDLNames.h" + @implementation SDLGenericResponse - (instancetype)init { - if (self = [super initWithName:NAMES_GenericResponse]) { + if (self = [super initWithName:SDLNameGenericResponse]) { } return self; } diff --git a/SmartDeviceLink/SDLGetDTCs.m b/SmartDeviceLink/SDLGetDTCs.m index cf7db88e5..2425630a1 100644 --- a/SmartDeviceLink/SDLGetDTCs.m +++ b/SmartDeviceLink/SDLGetDTCs.m @@ -4,12 +4,12 @@ #import "SDLGetDTCs.h" -#import "SDLNames.h" + @implementation SDLGetDTCs - (instancetype)init { - if (self = [super initWithName:NAMES_GetDTCs]) { + if (self = [super initWithName:SDLNameGetDtcs]) { } return self; } @@ -22,26 +22,26 @@ - (void)setEcuName:(NSNumber *)ecuName { if (ecuName != nil) { - [parameters setObject:ecuName forKey:NAMES_ecuName]; + [parameters setObject:ecuName forKey:SDLNameEcuName]; } else { - [parameters removeObjectForKey:NAMES_ecuName]; + [parameters removeObjectForKey:SDLNameEcuName]; } } - (NSNumber *)ecuName { - return [parameters objectForKey:NAMES_ecuName]; + return [parameters objectForKey:SDLNameEcuName]; } - (void)setDtcMask:(NSNumber *)dtcMask { if (dtcMask != nil) { - [parameters setObject:dtcMask forKey:NAMES_dtcMask]; + [parameters setObject:dtcMask forKey:SDLNameDtcMask]; } else { - [parameters removeObjectForKey:NAMES_dtcMask]; + [parameters removeObjectForKey:SDLNameDtcMask]; } } - (NSNumber *)dtcMask { - return [parameters objectForKey:NAMES_dtcMask]; + return [parameters objectForKey:SDLNameDtcMask]; } @end diff --git a/SmartDeviceLink/SDLGetDTCsResponse.m b/SmartDeviceLink/SDLGetDTCsResponse.m index bbf678a78..6d8d1bec1 100644 --- a/SmartDeviceLink/SDLGetDTCsResponse.m +++ b/SmartDeviceLink/SDLGetDTCsResponse.m @@ -4,12 +4,12 @@ #import "SDLGetDTCsResponse.h" -#import "SDLNames.h" + @implementation SDLGetDTCsResponse - (instancetype)init { - if (self = [super initWithName:NAMES_GetDTCs]) { + if (self = [super initWithName:SDLNameGetDtcs]) { } return self; } @@ -22,26 +22,26 @@ - (void)setEcuHeader:(NSNumber *)ecuHeader { if (ecuHeader != nil) { - [parameters setObject:ecuHeader forKey:NAMES_ecuHeader]; + [parameters setObject:ecuHeader forKey:SDLNameEcuHeader]; } else { - [parameters removeObjectForKey:NAMES_ecuHeader]; + [parameters removeObjectForKey:SDLNameEcuHeader]; } } - (NSNumber *)ecuHeader { - return [parameters objectForKey:NAMES_ecuHeader]; + return [parameters objectForKey:SDLNameEcuHeader]; } - (void)setDtc:(NSMutableArray *)dtc { if (dtc != nil) { - [parameters setObject:dtc forKey:NAMES_dtc]; + [parameters setObject:dtc forKey:SDLNameDtc]; } else { - [parameters removeObjectForKey:NAMES_dtc]; + [parameters removeObjectForKey:SDLNameDtc]; } } - (NSMutableArray *)dtc { - return [parameters objectForKey:NAMES_dtc]; + return [parameters objectForKey:SDLNameDtc]; } @end diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m index ab5d59a19..13c287349 100644 --- a/SmartDeviceLink/SDLGetVehicleData.m +++ b/SmartDeviceLink/SDLGetVehicleData.m @@ -4,12 +4,12 @@ #import "SDLGetVehicleData.h" -#import "SDLNames.h" + @implementation SDLGetVehicleData - (instancetype)init { - if (self = [super initWithName:NAMES_GetVehicleData]) { + if (self = [super initWithName:SDLNameGetVehicleData]) { } return self; } @@ -22,302 +22,302 @@ - (void)setGps:(NSNumber *)gps { if (gps != nil) { - [parameters setObject:gps forKey:NAMES_gps]; + [parameters setObject:gps forKey:SDLNameGps]; } else { - [parameters removeObjectForKey:NAMES_gps]; + [parameters removeObjectForKey:SDLNameGps]; } } - (NSNumber *)gps { - return [parameters objectForKey:NAMES_gps]; + return [parameters objectForKey:SDLNameGps]; } - (void)setSpeed:(NSNumber *)speed { if (speed != nil) { - [parameters setObject:speed forKey:NAMES_speed]; + [parameters setObject:speed forKey:SDLNameSpeed]; } else { - [parameters removeObjectForKey:NAMES_speed]; + [parameters removeObjectForKey:SDLNameSpeed]; } } - (NSNumber *)speed { - return [parameters objectForKey:NAMES_speed]; + return [parameters objectForKey:SDLNameSpeed]; } - (void)setRpm:(NSNumber *)rpm { if (rpm != nil) { - [parameters setObject:rpm forKey:NAMES_rpm]; + [parameters setObject:rpm forKey:SDLNameRpm]; } else { - [parameters removeObjectForKey:NAMES_rpm]; + [parameters removeObjectForKey:SDLNameRpm]; } } - (NSNumber *)rpm { - return [parameters objectForKey:NAMES_rpm]; + return [parameters objectForKey:SDLNameRpm]; } - (void)setFuelLevel:(NSNumber *)fuelLevel { if (fuelLevel != nil) { - [parameters setObject:fuelLevel forKey:NAMES_fuelLevel]; + [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel]; + [parameters removeObjectForKey:SDLNameFuelLevel]; } } - (NSNumber *)fuelLevel { - return [parameters objectForKey:NAMES_fuelLevel]; + return [parameters objectForKey:SDLNameFuelLevel]; } - (void)setFuelLevel_State:(NSNumber *)fuelLevel_State { if (fuelLevel_State != nil) { - [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State]; + [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel_State]; + [parameters removeObjectForKey:SDLNameFuelLevelState]; } } - (NSNumber *)fuelLevel_State { - return [parameters objectForKey:NAMES_fuelLevel_State]; + return [parameters objectForKey:SDLNameFuelLevelState]; } - (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption { if (instantFuelConsumption != nil) { - [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption]; + [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { - [parameters removeObjectForKey:NAMES_instantFuelConsumption]; + [parameters removeObjectForKey:SDLNameInstantFuelConsumption]; } } - (NSNumber *)instantFuelConsumption { - return [parameters objectForKey:NAMES_instantFuelConsumption]; + return [parameters objectForKey:SDLNameInstantFuelConsumption]; } - (void)setExternalTemperature:(NSNumber *)externalTemperature { if (externalTemperature != nil) { - [parameters setObject:externalTemperature forKey:NAMES_externalTemperature]; + [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { - [parameters removeObjectForKey:NAMES_externalTemperature]; + [parameters removeObjectForKey:SDLNameExternalTemperature]; } } - (NSNumber *)externalTemperature { - return [parameters objectForKey:NAMES_externalTemperature]; + return [parameters objectForKey:SDLNameExternalTemperature]; } - (void)setVin:(NSNumber *)vin { if (vin != nil) { - [parameters setObject:vin forKey:NAMES_vin]; + [parameters setObject:vin forKey:SDLNameVin]; } else { - [parameters removeObjectForKey:NAMES_vin]; + [parameters removeObjectForKey:SDLNameVin]; } } - (NSNumber *)vin { - return [parameters objectForKey:NAMES_vin]; + return [parameters objectForKey:SDLNameVin]; } - (void)setPrndl:(NSNumber *)prndl { if (prndl != nil) { - [parameters setObject:prndl forKey:NAMES_prndl]; + [parameters setObject:prndl forKey:SDLNamePrndl]; } else { - [parameters removeObjectForKey:NAMES_prndl]; + [parameters removeObjectForKey:SDLNamePrndl]; } } - (NSNumber *)prndl { - return [parameters objectForKey:NAMES_prndl]; + return [parameters objectForKey:SDLNamePrndl]; } - (void)setTirePressure:(NSNumber *)tirePressure { if (tirePressure != nil) { - [parameters setObject:tirePressure forKey:NAMES_tirePressure]; + [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { - [parameters removeObjectForKey:NAMES_tirePressure]; + [parameters removeObjectForKey:SDLNameTirePressure]; } } - (NSNumber *)tirePressure { - return [parameters objectForKey:NAMES_tirePressure]; + return [parameters objectForKey:SDLNameTirePressure]; } - (void)setOdometer:(NSNumber *)odometer { if (odometer != nil) { - [parameters setObject:odometer forKey:NAMES_odometer]; + [parameters setObject:odometer forKey:SDLNameOdometer]; } else { - [parameters removeObjectForKey:NAMES_odometer]; + [parameters removeObjectForKey:SDLNameOdometer]; } } - (NSNumber *)odometer { - return [parameters objectForKey:NAMES_odometer]; + return [parameters objectForKey:SDLNameOdometer]; } - (void)setBeltStatus:(NSNumber *)beltStatus { if (beltStatus != nil) { - [parameters setObject:beltStatus forKey:NAMES_beltStatus]; + [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { - [parameters removeObjectForKey:NAMES_beltStatus]; + [parameters removeObjectForKey:SDLNameBeltStatus]; } } - (NSNumber *)beltStatus { - return [parameters objectForKey:NAMES_beltStatus]; + return [parameters objectForKey:SDLNameBeltStatus]; } - (void)setBodyInformation:(NSNumber *)bodyInformation { if (bodyInformation != nil) { - [parameters setObject:bodyInformation forKey:NAMES_bodyInformation]; + [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { - [parameters removeObjectForKey:NAMES_bodyInformation]; + [parameters removeObjectForKey:SDLNameBodyInformation]; } } - (NSNumber *)bodyInformation { - return [parameters objectForKey:NAMES_bodyInformation]; + return [parameters objectForKey:SDLNameBodyInformation]; } - (void)setDeviceStatus:(NSNumber *)deviceStatus { if (deviceStatus != nil) { - [parameters setObject:deviceStatus forKey:NAMES_deviceStatus]; + [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { - [parameters removeObjectForKey:NAMES_deviceStatus]; + [parameters removeObjectForKey:SDLNameDeviceStatus]; } } - (NSNumber *)deviceStatus { - return [parameters objectForKey:NAMES_deviceStatus]; + return [parameters objectForKey:SDLNameDeviceStatus]; } - (void)setDriverBraking:(NSNumber *)driverBraking { if (driverBraking != nil) { - [parameters setObject:driverBraking forKey:NAMES_driverBraking]; + [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { - [parameters removeObjectForKey:NAMES_driverBraking]; + [parameters removeObjectForKey:SDLNameDriverBraking]; } } - (NSNumber *)driverBraking { - return [parameters objectForKey:NAMES_driverBraking]; + return [parameters objectForKey:SDLNameDriverBraking]; } - (void)setWiperStatus:(NSNumber *)wiperStatus { if (wiperStatus != nil) { - [parameters setObject:wiperStatus forKey:NAMES_wiperStatus]; + [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { - [parameters removeObjectForKey:NAMES_wiperStatus]; + [parameters removeObjectForKey:SDLNameWiperStatus]; } } - (NSNumber *)wiperStatus { - return [parameters objectForKey:NAMES_wiperStatus]; + return [parameters objectForKey:SDLNameWiperStatus]; } - (void)setHeadLampStatus:(NSNumber *)headLampStatus { if (headLampStatus != nil) { - [parameters setObject:headLampStatus forKey:NAMES_headLampStatus]; + [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { - [parameters removeObjectForKey:NAMES_headLampStatus]; + [parameters removeObjectForKey:SDLNameHeadLampStatus]; } } - (NSNumber *)headLampStatus { - return [parameters objectForKey:NAMES_headLampStatus]; + return [parameters objectForKey:SDLNameHeadLampStatus]; } - (void)setEngineTorque:(NSNumber *)engineTorque { if (engineTorque != nil) { - [parameters setObject:engineTorque forKey:NAMES_engineTorque]; + [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { - [parameters removeObjectForKey:NAMES_engineTorque]; + [parameters removeObjectForKey:SDLNameEngineTorque]; } } - (NSNumber *)engineTorque { - return [parameters objectForKey:NAMES_engineTorque]; + return [parameters objectForKey:SDLNameEngineTorque]; } - (void)setAccPedalPosition:(NSNumber *)accPedalPosition { if (accPedalPosition != nil) { - [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition]; + [parameters setObject:accPedalPosition forKey:SDLNameAccPedalPosition]; } else { - [parameters removeObjectForKey:NAMES_accPedalPosition]; + [parameters removeObjectForKey:SDLNameAccPedalPosition]; } } - (NSNumber *)accPedalPosition { - return [parameters objectForKey:NAMES_accPedalPosition]; + return [parameters objectForKey:SDLNameAccPedalPosition]; } - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle { if (steeringWheelAngle != nil) { - [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle]; + [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { - [parameters removeObjectForKey:NAMES_steeringWheelAngle]; + [parameters removeObjectForKey:SDLNameSteeringWheelAngle]; } } - (NSNumber *)steeringWheelAngle { - return [parameters objectForKey:NAMES_steeringWheelAngle]; + return [parameters objectForKey:SDLNameSteeringWheelAngle]; } - (void)setECallInfo:(NSNumber *)eCallInfo { if (eCallInfo != nil) { - [parameters setObject:eCallInfo forKey:NAMES_eCallInfo]; + [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { - [parameters removeObjectForKey:NAMES_eCallInfo]; + [parameters removeObjectForKey:SDLNameECallInfo]; } } - (NSNumber *)eCallInfo { - return [parameters objectForKey:NAMES_eCallInfo]; + return [parameters objectForKey:SDLNameECallInfo]; } - (void)setAirbagStatus:(NSNumber *)airbagStatus { if (airbagStatus != nil) { - [parameters setObject:airbagStatus forKey:NAMES_airbagStatus]; + [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { - [parameters removeObjectForKey:NAMES_airbagStatus]; + [parameters removeObjectForKey:SDLNameAirbagStatus]; } } - (NSNumber *)airbagStatus { - return [parameters objectForKey:NAMES_airbagStatus]; + return [parameters objectForKey:SDLNameAirbagStatus]; } - (void)setEmergencyEvent:(NSNumber *)emergencyEvent { if (emergencyEvent != nil) { - [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent]; + [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { - [parameters removeObjectForKey:NAMES_emergencyEvent]; + [parameters removeObjectForKey:SDLNameEmergencyEvent]; } } - (NSNumber *)emergencyEvent { - return [parameters objectForKey:NAMES_emergencyEvent]; + return [parameters objectForKey:SDLNameEmergencyEvent]; } - (void)setClusterModeStatus:(NSNumber *)clusterModeStatus { if (clusterModeStatus != nil) { - [parameters setObject:clusterModeStatus forKey:NAMES_clusterModeStatus]; + [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus]; } else { - [parameters removeObjectForKey:NAMES_clusterModeStatus]; + [parameters removeObjectForKey:SDLNameClusterModeStatus]; } } - (NSNumber *)clusterModeStatus { - return [parameters objectForKey:NAMES_clusterModeStatus]; + return [parameters objectForKey:SDLNameClusterModeStatus]; } - (void)setMyKey:(NSNumber *)myKey { if (myKey != nil) { - [parameters setObject:myKey forKey:NAMES_myKey]; + [parameters setObject:myKey forKey:SDLNameMyKey]; } else { - [parameters removeObjectForKey:NAMES_myKey]; + [parameters removeObjectForKey:SDLNameMyKey]; } } - (NSNumber *)myKey { - return [parameters objectForKey:NAMES_myKey]; + return [parameters objectForKey:SDLNameMyKey]; } @end diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m index 7f1bdb351..c32a93dd9 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.m +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m @@ -15,7 +15,7 @@ #import "SDLGPSData.h" #import "SDLHeadLampStatus.h" #import "SDLMyKey.h" -#import "SDLNames.h" + #import "SDLPRNDL.h" #import "SDLTireStatus.h" #import "SDLVehicleDataEventStatus.h" @@ -25,7 +25,7 @@ @implementation SDLGetVehicleDataResponse - (instancetype)init { - if (self = [super initWithName:NAMES_GetVehicleData]) { + if (self = [super initWithName:SDLNameGetVehicleData]) { } return self; } @@ -38,14 +38,14 @@ - (void)setGps:(SDLGPSData *)gps { if (gps != nil) { - [parameters setObject:gps forKey:NAMES_gps]; + [parameters setObject:gps forKey:SDLNameGps]; } else { - [parameters removeObjectForKey:NAMES_gps]; + [parameters removeObjectForKey:SDLNameGps]; } } - (SDLGPSData *)gps { - NSObject *obj = [parameters objectForKey:NAMES_gps]; + NSObject *obj = [parameters objectForKey:SDLNameGps]; if (obj == nil || [obj isKindOfClass:SDLGPSData.class]) { return (SDLGPSData *)obj; } else { @@ -55,50 +55,50 @@ - (void)setSpeed:(NSNumber *)speed { if (speed != nil) { - [parameters setObject:speed forKey:NAMES_speed]; + [parameters setObject:speed forKey:SDLNameSpeed]; } else { - [parameters removeObjectForKey:NAMES_speed]; + [parameters removeObjectForKey:SDLNameSpeed]; } } - (NSNumber *)speed { - return [parameters objectForKey:NAMES_speed]; + return [parameters objectForKey:SDLNameSpeed]; } - (void)setRpm:(NSNumber *)rpm { if (rpm != nil) { - [parameters setObject:rpm forKey:NAMES_rpm]; + [parameters setObject:rpm forKey:SDLNameRpm]; } else { - [parameters removeObjectForKey:NAMES_rpm]; + [parameters removeObjectForKey:SDLNameRpm]; } } - (NSNumber *)rpm { - return [parameters objectForKey:NAMES_rpm]; + return [parameters objectForKey:SDLNameRpm]; } - (void)setFuelLevel:(NSNumber *)fuelLevel { if (fuelLevel != nil) { - [parameters setObject:fuelLevel forKey:NAMES_fuelLevel]; + [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel]; + [parameters removeObjectForKey:SDLNameFuelLevel]; } } - (NSNumber *)fuelLevel { - return [parameters objectForKey:NAMES_fuelLevel]; + return [parameters objectForKey:SDLNameFuelLevel]; } - (void)setFuelLevel_State:(SDLComponentVolumeStatus *)fuelLevel_State { if (fuelLevel_State != nil) { - [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State]; + [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel_State]; + [parameters removeObjectForKey:SDLNameFuelLevelState]; } } - (SDLComponentVolumeStatus *)fuelLevel_State { - NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State]; + NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState]; if (obj == nil || [obj isKindOfClass:SDLComponentVolumeStatus.class]) { return (SDLComponentVolumeStatus *)obj; } else { @@ -108,50 +108,50 @@ - (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption { if (instantFuelConsumption != nil) { - [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption]; + [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { - [parameters removeObjectForKey:NAMES_instantFuelConsumption]; + [parameters removeObjectForKey:SDLNameInstantFuelConsumption]; } } - (NSNumber *)instantFuelConsumption { - return [parameters objectForKey:NAMES_instantFuelConsumption]; + return [parameters objectForKey:SDLNameInstantFuelConsumption]; } - (void)setExternalTemperature:(NSNumber *)externalTemperature { if (externalTemperature != nil) { - [parameters setObject:externalTemperature forKey:NAMES_externalTemperature]; + [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { - [parameters removeObjectForKey:NAMES_externalTemperature]; + [parameters removeObjectForKey:SDLNameExternalTemperature]; } } - (NSNumber *)externalTemperature { - return [parameters objectForKey:NAMES_externalTemperature]; + return [parameters objectForKey:SDLNameExternalTemperature]; } - (void)setVin:(NSString *)vin { if (vin != nil) { - [parameters setObject:vin forKey:NAMES_vin]; + [parameters setObject:vin forKey:SDLNameVin]; } else { - [parameters removeObjectForKey:NAMES_vin]; + [parameters removeObjectForKey:SDLNameVin]; } } - (NSString *)vin { - return [parameters objectForKey:NAMES_vin]; + return [parameters objectForKey:SDLNameVin]; } - (void)setPrndl:(SDLPRNDL *)prndl { if (prndl != nil) { - [parameters setObject:prndl forKey:NAMES_prndl]; + [parameters setObject:prndl forKey:SDLNamePrndl]; } else { - [parameters removeObjectForKey:NAMES_prndl]; + [parameters removeObjectForKey:SDLNamePrndl]; } } - (SDLPRNDL *)prndl { - NSObject *obj = [parameters objectForKey:NAMES_prndl]; + NSObject *obj = [parameters objectForKey:SDLNamePrndl]; if (obj == nil || [obj isKindOfClass:SDLPRNDL.class]) { return (SDLPRNDL *)obj; } else { @@ -161,14 +161,14 @@ - (void)setTirePressure:(SDLTireStatus *)tirePressure { if (tirePressure != nil) { - [parameters setObject:tirePressure forKey:NAMES_tirePressure]; + [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { - [parameters removeObjectForKey:NAMES_tirePressure]; + [parameters removeObjectForKey:SDLNameTirePressure]; } } - (SDLTireStatus *)tirePressure { - NSObject *obj = [parameters objectForKey:NAMES_tirePressure]; + NSObject *obj = [parameters objectForKey:SDLNameTirePressure]; if (obj == nil || [obj isKindOfClass:SDLTireStatus.class]) { return (SDLTireStatus *)obj; } else { @@ -178,26 +178,26 @@ - (void)setOdometer:(NSNumber *)odometer { if (odometer != nil) { - [parameters setObject:odometer forKey:NAMES_odometer]; + [parameters setObject:odometer forKey:SDLNameOdometer]; } else { - [parameters removeObjectForKey:NAMES_odometer]; + [parameters removeObjectForKey:SDLNameOdometer]; } } - (NSNumber *)odometer { - return [parameters objectForKey:NAMES_odometer]; + return [parameters objectForKey:SDLNameOdometer]; } - (void)setBeltStatus:(SDLBeltStatus *)beltStatus { if (beltStatus != nil) { - [parameters setObject:beltStatus forKey:NAMES_beltStatus]; + [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { - [parameters removeObjectForKey:NAMES_beltStatus]; + [parameters removeObjectForKey:SDLNameBeltStatus]; } } - (SDLBeltStatus *)beltStatus { - NSObject *obj = [parameters objectForKey:NAMES_beltStatus]; + NSObject *obj = [parameters objectForKey:SDLNameBeltStatus]; if (obj == nil || [obj isKindOfClass:SDLBeltStatus.class]) { return (SDLBeltStatus *)obj; } else { @@ -207,14 +207,14 @@ - (void)setBodyInformation:(SDLBodyInformation *)bodyInformation { if (bodyInformation != nil) { - [parameters setObject:bodyInformation forKey:NAMES_bodyInformation]; + [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { - [parameters removeObjectForKey:NAMES_bodyInformation]; + [parameters removeObjectForKey:SDLNameBodyInformation]; } } - (SDLBodyInformation *)bodyInformation { - NSObject *obj = [parameters objectForKey:NAMES_bodyInformation]; + NSObject *obj = [parameters objectForKey:SDLNameBodyInformation]; if (obj == nil || [obj isKindOfClass:SDLBodyInformation.class]) { return (SDLBodyInformation *)obj; } else { @@ -224,14 +224,14 @@ - (void)setDeviceStatus:(SDLDeviceStatus *)deviceStatus { if (deviceStatus != nil) { - [parameters setObject:deviceStatus forKey:NAMES_deviceStatus]; + [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { - [parameters removeObjectForKey:NAMES_deviceStatus]; + [parameters removeObjectForKey:SDLNameDeviceStatus]; } } - (SDLDeviceStatus *)deviceStatus { - NSObject *obj = [parameters objectForKey:NAMES_deviceStatus]; + NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus]; if (obj == nil || [obj isKindOfClass:SDLDeviceStatus.class]) { return (SDLDeviceStatus *)obj; } else { @@ -241,14 +241,14 @@ - (void)setDriverBraking:(SDLVehicleDataEventStatus *)driverBraking { if (driverBraking != nil) { - [parameters setObject:driverBraking forKey:NAMES_driverBraking]; + [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { - [parameters removeObjectForKey:NAMES_driverBraking]; + [parameters removeObjectForKey:SDLNameDriverBraking]; } } - (SDLVehicleDataEventStatus *)driverBraking { - NSObject *obj = [parameters objectForKey:NAMES_driverBraking]; + NSObject *obj = [parameters objectForKey:SDLNameDriverBraking]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -258,14 +258,14 @@ - (void)setWiperStatus:(SDLWiperStatus *)wiperStatus { if (wiperStatus != nil) { - [parameters setObject:wiperStatus forKey:NAMES_wiperStatus]; + [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { - [parameters removeObjectForKey:NAMES_wiperStatus]; + [parameters removeObjectForKey:SDLNameWiperStatus]; } } - (SDLWiperStatus *)wiperStatus { - NSObject *obj = [parameters objectForKey:NAMES_wiperStatus]; + NSObject *obj = [parameters objectForKey:SDLNameWiperStatus]; if (obj == nil || [obj isKindOfClass:SDLWiperStatus.class]) { return (SDLWiperStatus *)obj; } else { @@ -275,14 +275,14 @@ - (void)setHeadLampStatus:(SDLHeadLampStatus *)headLampStatus { if (headLampStatus != nil) { - [parameters setObject:headLampStatus forKey:NAMES_headLampStatus]; + [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { - [parameters removeObjectForKey:NAMES_headLampStatus]; + [parameters removeObjectForKey:SDLNameHeadLampStatus]; } } - (SDLHeadLampStatus *)headLampStatus { - NSObject *obj = [parameters objectForKey:NAMES_headLampStatus]; + NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus]; if (obj == nil || [obj isKindOfClass:SDLHeadLampStatus.class]) { return (SDLHeadLampStatus *)obj; } else { @@ -292,50 +292,50 @@ - (void)setEngineTorque:(NSNumber *)engineTorque { if (engineTorque != nil) { - [parameters setObject:engineTorque forKey:NAMES_engineTorque]; + [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { - [parameters removeObjectForKey:NAMES_engineTorque]; + [parameters removeObjectForKey:SDLNameEngineTorque]; } } - (NSNumber *)engineTorque { - return [parameters objectForKey:NAMES_engineTorque]; + return [parameters objectForKey:SDLNameEngineTorque]; } - (void)setAccPedalPosition:(NSNumber *)accPedalPosition { if (accPedalPosition != nil) { - [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition]; + [parameters setObject:accPedalPosition forKey:SDLNameAccPedalPosition]; } else { - [parameters removeObjectForKey:NAMES_accPedalPosition]; + [parameters removeObjectForKey:SDLNameAccPedalPosition]; } } - (NSNumber *)accPedalPosition { - return [parameters objectForKey:NAMES_accPedalPosition]; + return [parameters objectForKey:SDLNameAccPedalPosition]; } - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle { if (steeringWheelAngle != nil) { - [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle]; + [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { - [parameters removeObjectForKey:NAMES_steeringWheelAngle]; + [parameters removeObjectForKey:SDLNameSteeringWheelAngle]; } } - (NSNumber *)steeringWheelAngle { - return [parameters objectForKey:NAMES_steeringWheelAngle]; + return [parameters objectForKey:SDLNameSteeringWheelAngle]; } - (void)setECallInfo:(SDLECallInfo *)eCallInfo { if (eCallInfo != nil) { - [parameters setObject:eCallInfo forKey:NAMES_eCallInfo]; + [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { - [parameters removeObjectForKey:NAMES_eCallInfo]; + [parameters removeObjectForKey:SDLNameECallInfo]; } } - (SDLECallInfo *)eCallInfo { - NSObject *obj = [parameters objectForKey:NAMES_eCallInfo]; + NSObject *obj = [parameters objectForKey:SDLNameECallInfo]; if (obj == nil || [obj isKindOfClass:SDLECallInfo.class]) { return (SDLECallInfo *)obj; } else { @@ -345,14 +345,14 @@ - (void)setAirbagStatus:(SDLAirbagStatus *)airbagStatus { if (airbagStatus != nil) { - [parameters setObject:airbagStatus forKey:NAMES_airbagStatus]; + [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { - [parameters removeObjectForKey:NAMES_airbagStatus]; + [parameters removeObjectForKey:SDLNameAirbagStatus]; } } - (SDLAirbagStatus *)airbagStatus { - NSObject *obj = [parameters objectForKey:NAMES_airbagStatus]; + NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus]; if (obj == nil || [obj isKindOfClass:SDLAirbagStatus.class]) { return (SDLAirbagStatus *)obj; } else { @@ -362,14 +362,14 @@ - (void)setEmergencyEvent:(SDLEmergencyEvent *)emergencyEvent { if (emergencyEvent != nil) { - [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent]; + [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { - [parameters removeObjectForKey:NAMES_emergencyEvent]; + [parameters removeObjectForKey:SDLNameEmergencyEvent]; } } - (SDLEmergencyEvent *)emergencyEvent { - NSObject *obj = [parameters objectForKey:NAMES_emergencyEvent]; + NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent]; if (obj == nil || [obj isKindOfClass:SDLEmergencyEvent.class]) { return (SDLEmergencyEvent *)obj; } else { @@ -379,14 +379,14 @@ - (void)setClusterModeStatus:(SDLClusterModeStatus *)clusterModeStatus { if (clusterModeStatus != nil) { - [parameters setObject:clusterModeStatus forKey:NAMES_clusterModeStatus]; + [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus]; } else { - [parameters removeObjectForKey:NAMES_clusterModeStatus]; + [parameters removeObjectForKey:SDLNameClusterModeStatus]; } } - (SDLClusterModeStatus *)clusterModeStatus { - NSObject *obj = [parameters objectForKey:NAMES_clusterModeStatus]; + NSObject *obj = [parameters objectForKey:SDLNameClusterModeStatus]; if (obj == nil || [obj isKindOfClass:SDLClusterModeStatus.class]) { return (SDLClusterModeStatus *)obj; } else { @@ -396,14 +396,14 @@ - (void)setMyKey:(SDLMyKey *)myKey { if (myKey != nil) { - [parameters setObject:myKey forKey:NAMES_myKey]; + [parameters setObject:myKey forKey:SDLNameMyKey]; } else { - [parameters removeObjectForKey:NAMES_myKey]; + [parameters removeObjectForKey:SDLNameMyKey]; } } - (SDLMyKey *)myKey { - NSObject *obj = [parameters objectForKey:NAMES_myKey]; + NSObject *obj = [parameters objectForKey:SDLNameMyKey]; if (obj == nil || [obj isKindOfClass:SDLMyKey.class]) { return (SDLMyKey *)obj; } else { diff --git a/SmartDeviceLink/SDLHMICapabilities.m b/SmartDeviceLink/SDLHMICapabilities.m index 24b35be25..a758f3c0a 100644 --- a/SmartDeviceLink/SDLHMICapabilities.m +++ b/SmartDeviceLink/SDLHMICapabilities.m @@ -4,7 +4,7 @@ #import "SDLHMICapabilities.h" -#import "SDLNames.h" + @implementation SDLHMICapabilities @@ -29,26 +29,26 @@ - (void)setNavigation:(NSNumber *)navigation { if (navigation != nil) { - store[NAMES_navigation] = navigation; + store[SDLNameNavigation] = navigation; } else { - [store removeObjectForKey:NAMES_navigation]; + [store removeObjectForKey:SDLNameNavigation]; } } - (NSNumber *)navigation { - return store[NAMES_navigation]; + return store[SDLNameNavigation]; } - (void)setPhoneCall:(NSNumber *)phoneCall { if (phoneCall != nil) { - store[NAMES_phoneCall] = phoneCall; + store[SDLNamePhoneCall] = phoneCall; } else { - [store removeObjectForKey:NAMES_phoneCall]; + [store removeObjectForKey:SDLNamePhoneCall]; } } - (NSNumber *)phoneCall { - return store[NAMES_phoneCall]; + return store[SDLNamePhoneCall]; } @end diff --git a/SmartDeviceLink/SDLHMIPermissions.m b/SmartDeviceLink/SDLHMIPermissions.m index 29555bf59..868d5414d 100644 --- a/SmartDeviceLink/SDLHMIPermissions.m +++ b/SmartDeviceLink/SDLHMIPermissions.m @@ -5,7 +5,7 @@ #import "SDLHMIPermissions.h" #import "SDLHMILevel.h" -#import "SDLNames.h" + @implementation SDLHMIPermissions @@ -23,14 +23,14 @@ - (void)setAllowed:(NSMutableArray *)allowed { if (allowed != nil) { - [store setObject:allowed forKey:NAMES_allowed]; + [store setObject:allowed forKey:SDLNameAllowed]; } else { - [store removeObjectForKey:NAMES_allowed]; + [store removeObjectForKey:SDLNameAllowed]; } } - (NSMutableArray *)allowed { - NSMutableArray *array = [store objectForKey:NAMES_allowed]; + NSMutableArray *array = [store objectForKey:SDLNameAllowed]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLHMILevel.class]) { return array; } else { @@ -44,14 +44,14 @@ - (void)setUserDisallowed:(NSMutableArray *)userDisallowed { if (userDisallowed != nil) { - [store setObject:userDisallowed forKey:NAMES_userDisallowed]; + [store setObject:userDisallowed forKey:SDLNameUserDisallowed]; } else { - [store removeObjectForKey:NAMES_userDisallowed]; + [store removeObjectForKey:SDLNameUserDisallowed]; } } - (NSMutableArray *)userDisallowed { - NSMutableArray *array = [store objectForKey:NAMES_userDisallowed]; + NSMutableArray *array = [store objectForKey:SDLNameUserDisallowed]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLHMILevel.class]) { return array; } else { diff --git a/SmartDeviceLink/SDLHeadLampStatus.m b/SmartDeviceLink/SDLHeadLampStatus.m index 44ed87b44..07509cb36 100644 --- a/SmartDeviceLink/SDLHeadLampStatus.m +++ b/SmartDeviceLink/SDLHeadLampStatus.m @@ -4,7 +4,7 @@ #import "SDLHeadLampStatus.h" #import "SDLAmbientLightStatus.h" -#import "SDLNames.h" + @implementation SDLHeadLampStatus @@ -23,38 +23,38 @@ - (void)setLowBeamsOn:(NSNumber *)lowBeamsOn { if (lowBeamsOn != nil) { - [store setObject:lowBeamsOn forKey:NAMES_lowBeamsOn]; + [store setObject:lowBeamsOn forKey:SDLNameLowBeamsOn]; } else { - [store removeObjectForKey:NAMES_lowBeamsOn]; + [store removeObjectForKey:SDLNameLowBeamsOn]; } } - (NSNumber *)lowBeamsOn { - return [store objectForKey:NAMES_lowBeamsOn]; + return [store objectForKey:SDLNameLowBeamsOn]; } - (void)setHighBeamsOn:(NSNumber *)highBeamsOn { if (highBeamsOn != nil) { - [store setObject:highBeamsOn forKey:NAMES_highBeamsOn]; + [store setObject:highBeamsOn forKey:SDLNameHighBeamsOn]; } else { - [store removeObjectForKey:NAMES_highBeamsOn]; + [store removeObjectForKey:SDLNameHighBeamsOn]; } } - (NSNumber *)highBeamsOn { - return [store objectForKey:NAMES_highBeamsOn]; + return [store objectForKey:SDLNameHighBeamsOn]; } - (void)setAmbientLightSensorStatus:(SDLAmbientLightStatus *)ambientLightSensorStatus { if (ambientLightSensorStatus != nil) { - [store setObject:ambientLightSensorStatus forKey:NAMES_ambientLightSensorStatus]; + [store setObject:ambientLightSensorStatus forKey:SDLNameAmbientLightSensorStatus]; } else { - [store removeObjectForKey:NAMES_ambientLightSensorStatus]; + [store removeObjectForKey:SDLNameAmbientLightSensorStatus]; } } - (SDLAmbientLightStatus *)ambientLightSensorStatus { - NSObject *obj = [store objectForKey:NAMES_ambientLightSensorStatus]; + NSObject *obj = [store objectForKey:SDLNameAmbientLightSensorStatus]; if (obj == nil || [obj isKindOfClass:SDLAmbientLightStatus.class]) { return (SDLAmbientLightStatus *)obj; } else { diff --git a/SmartDeviceLink/SDLImage.m b/SmartDeviceLink/SDLImage.m index ef646f794..94b52b1a1 100644 --- a/SmartDeviceLink/SDLImage.m +++ b/SmartDeviceLink/SDLImage.m @@ -4,7 +4,7 @@ #import "SDLImage.h" #import "SDLImageType.h" -#import "SDLNames.h" + @implementation SDLImage @@ -23,26 +23,26 @@ - (void)setValue:(NSString *)value { if (value != nil) { - [store setObject:value forKey:NAMES_value]; + [store setObject:value forKey:SDLNameValue]; } else { - [store removeObjectForKey:NAMES_value]; + [store removeObjectForKey:SDLNameValue]; } } - (NSString *)value { - return [store objectForKey:NAMES_value]; + return [store objectForKey:SDLNameValue]; } - (void)setImageType:(SDLImageType *)imageType { if (imageType != nil) { - [store setObject:imageType forKey:NAMES_imageType]; + [store setObject:imageType forKey:SDLNameImageType]; } else { - [store removeObjectForKey:NAMES_imageType]; + [store removeObjectForKey:SDLNameImageType]; } } - (SDLImageType *)imageType { - NSObject *obj = [store objectForKey:NAMES_imageType]; + NSObject *obj = [store objectForKey:SDLNameImageType]; if (obj == nil || [obj isKindOfClass:SDLImageType.class]) { return (SDLImageType *)obj; } else { diff --git a/SmartDeviceLink/SDLImageField.m b/SmartDeviceLink/SDLImageField.m index af4f15517..7b26c2a9b 100644 --- a/SmartDeviceLink/SDLImageField.m +++ b/SmartDeviceLink/SDLImageField.m @@ -6,7 +6,7 @@ #import "SDLFileType.h" #import "SDLImageFieldName.h" #import "SDLImageResolution.h" -#import "SDLNames.h" + @implementation SDLImageField @@ -25,14 +25,14 @@ - (void)setName:(SDLImageFieldName *)name { if (name != nil) { - [store setObject:name forKey:NAMES_name]; + [store setObject:name forKey:SDLNameName]; } else { - [store removeObjectForKey:NAMES_name]; + [store removeObjectForKey:SDLNameName]; } } - (SDLImageFieldName *)name { - NSObject *obj = [store objectForKey:NAMES_name]; + NSObject *obj = [store objectForKey:SDLNameName]; if (obj == nil || [obj isKindOfClass:SDLImageFieldName.class]) { return (SDLImageFieldName *)obj; } else { @@ -42,14 +42,14 @@ - (void)setImageTypeSupported:(NSMutableArray *)imageTypeSupported { if (imageTypeSupported != nil) { - [store setObject:imageTypeSupported forKey:NAMES_imageTypeSupported]; + [store setObject:imageTypeSupported forKey:SDLNameImageTypeSupported]; } else { - [store removeObjectForKey:NAMES_imageTypeSupported]; + [store removeObjectForKey:SDLNameImageTypeSupported]; } } - (NSMutableArray *)imageTypeSupported { - NSMutableArray *array = [store objectForKey:NAMES_imageTypeSupported]; + NSMutableArray *array = [store objectForKey:SDLNameImageTypeSupported]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLFileType.class]) { return array; } else { @@ -63,14 +63,14 @@ - (void)setImageResolution:(SDLImageResolution *)imageResolution { if (imageResolution != nil) { - [store setObject:imageResolution forKey:NAMES_imageResolution]; + [store setObject:imageResolution forKey:SDLNameImageResolution]; } else { - [store removeObjectForKey:NAMES_imageResolution]; + [store removeObjectForKey:SDLNameImageResolution]; } } - (SDLImageResolution *)imageResolution { - NSObject *obj = [store objectForKey:NAMES_imageResolution]; + NSObject *obj = [store objectForKey:SDLNameImageResolution]; if (obj == nil || [obj isKindOfClass:SDLImageResolution.class]) { return (SDLImageResolution *)obj; } else { diff --git a/SmartDeviceLink/SDLImageResolution.m b/SmartDeviceLink/SDLImageResolution.m index 7f10116de..997933950 100644 --- a/SmartDeviceLink/SDLImageResolution.m +++ b/SmartDeviceLink/SDLImageResolution.m @@ -4,7 +4,7 @@ #import "SDLImageResolution.h" -#import "SDLNames.h" + @implementation SDLImageResolution @@ -22,26 +22,26 @@ - (void)setResolutionWidth:(NSNumber *)resolutionWidth { if (resolutionWidth != nil) { - [store setObject:resolutionWidth forKey:NAMES_resolutionWidth]; + [store setObject:resolutionWidth forKey:SDLNameResolutionWidth]; } else { - [store removeObjectForKey:NAMES_resolutionWidth]; + [store removeObjectForKey:SDLNameResolutionWidth]; } } - (NSNumber *)resolutionWidth { - return [store objectForKey:NAMES_resolutionWidth]; + return [store objectForKey:SDLNameResolutionWidth]; } - (void)setResolutionHeight:(NSNumber *)resolutionHeight { if (resolutionHeight != nil) { - [store setObject:resolutionHeight forKey:NAMES_resolutionHeight]; + [store setObject:resolutionHeight forKey:SDLNameResolutionHeight]; } else { - [store removeObjectForKey:NAMES_resolutionHeight]; + [store removeObjectForKey:SDLNameResolutionHeight]; } } - (NSNumber *)resolutionHeight { - return [store objectForKey:NAMES_resolutionHeight]; + return [store objectForKey:SDLNameResolutionHeight]; } @end diff --git a/SmartDeviceLink/SDLJsonDecoder.m b/SmartDeviceLink/SDLJsonDecoder.m index 0ff561df8..3c76f1ebc 100644 --- a/SmartDeviceLink/SDLJsonDecoder.m +++ b/SmartDeviceLink/SDLJsonDecoder.m @@ -4,7 +4,7 @@ #import "SDLJsonDecoder.h" #import "SDLDebugTool.h" -#import "SDLNames.h" + @implementation SDLJsonDecoder diff --git a/SmartDeviceLink/SDLJsonEncoder.m b/SmartDeviceLink/SDLJsonEncoder.m index dbb2374d9..df5cd2a11 100644 --- a/SmartDeviceLink/SDLJsonEncoder.m +++ b/SmartDeviceLink/SDLJsonEncoder.m @@ -4,7 +4,7 @@ #import "SDLJsonEncoder.h" #import "SDLDebugTool.h" -#import "SDLNames.h" + @implementation SDLJsonEncoder diff --git a/SmartDeviceLink/SDLKeyboardProperties.m b/SmartDeviceLink/SDLKeyboardProperties.m index 896f3a99a..c33adbd0b 100644 --- a/SmartDeviceLink/SDLKeyboardProperties.m +++ b/SmartDeviceLink/SDLKeyboardProperties.m @@ -6,7 +6,7 @@ #import "SDLKeyboardLayout.h" #import "SDLKeypressMode.h" #import "SDLLanguage.h" -#import "SDLNames.h" + @implementation SDLKeyboardProperties @@ -25,14 +25,14 @@ - (void)setLanguage:(SDLLanguage *)language { if (language != nil) { - [store setObject:language forKey:NAMES_language]; + [store setObject:language forKey:SDLNameLanguage]; } else { - [store removeObjectForKey:NAMES_language]; + [store removeObjectForKey:SDLNameLanguage]; } } - (SDLLanguage *)language { - NSObject *obj = [store objectForKey:NAMES_language]; + NSObject *obj = [store objectForKey:SDLNameLanguage]; if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) { return (SDLLanguage *)obj; } else { @@ -42,14 +42,14 @@ - (void)setKeyboardLayout:(SDLKeyboardLayout *)keyboardLayout { if (keyboardLayout != nil) { - [store setObject:keyboardLayout forKey:NAMES_keyboardLayout]; + [store setObject:keyboardLayout forKey:SDLNameKeyboardLayout]; } else { - [store removeObjectForKey:NAMES_keyboardLayout]; + [store removeObjectForKey:SDLNameKeyboardLayout]; } } - (SDLKeyboardLayout *)keyboardLayout { - NSObject *obj = [store objectForKey:NAMES_keyboardLayout]; + NSObject *obj = [store objectForKey:SDLNameKeyboardLayout]; if (obj == nil || [obj isKindOfClass:SDLKeyboardLayout.class]) { return (SDLKeyboardLayout *)obj; } else { @@ -59,14 +59,14 @@ - (void)setKeypressMode:(SDLKeypressMode *)keypressMode { if (keypressMode != nil) { - [store setObject:keypressMode forKey:NAMES_keypressMode]; + [store setObject:keypressMode forKey:SDLNameKeypressMode]; } else { - [store removeObjectForKey:NAMES_keypressMode]; + [store removeObjectForKey:SDLNameKeypressMode]; } } - (SDLKeypressMode *)keypressMode { - NSObject *obj = [store objectForKey:NAMES_keypressMode]; + NSObject *obj = [store objectForKey:SDLNameKeypressMode]; if (obj == nil || [obj isKindOfClass:SDLKeypressMode.class]) { return (SDLKeypressMode *)obj; } else { @@ -76,26 +76,26 @@ - (void)setLimitedCharacterList:(NSMutableArray *)limitedCharacterList { if (limitedCharacterList != nil) { - [store setObject:limitedCharacterList forKey:NAMES_limitedCharacterList]; + [store setObject:limitedCharacterList forKey:SDLNameLimitedCharacterList]; } else { - [store removeObjectForKey:NAMES_limitedCharacterList]; + [store removeObjectForKey:SDLNameLimitedCharacterList]; } } - (NSMutableArray *)limitedCharacterList { - return [store objectForKey:NAMES_limitedCharacterList]; + return [store objectForKey:SDLNameLimitedCharacterList]; } - (void)setAutoCompleteText:(NSString *)autoCompleteText { if (autoCompleteText != nil) { - [store setObject:autoCompleteText forKey:NAMES_autoCompleteText]; + [store setObject:autoCompleteText forKey:SDLNameAutoCompleteText]; } else { - [store removeObjectForKey:NAMES_autoCompleteText]; + [store removeObjectForKey:SDLNameAutoCompleteText]; } } - (NSString *)autoCompleteText { - return [store objectForKey:NAMES_autoCompleteText]; + return [store objectForKey:SDLNameAutoCompleteText]; } @end diff --git a/SmartDeviceLink/SDLListFiles.m b/SmartDeviceLink/SDLListFiles.m index a1110df1b..a8a756a7b 100644 --- a/SmartDeviceLink/SDLListFiles.m +++ b/SmartDeviceLink/SDLListFiles.m @@ -4,12 +4,12 @@ #import "SDLListFiles.h" -#import "SDLNames.h" + @implementation SDLListFiles - (instancetype)init { - if (self = [super initWithName:NAMES_ListFiles]) { + if (self = [super initWithName:SDLNameListFiles]) { } return self; } diff --git a/SmartDeviceLink/SDLListFilesResponse.m b/SmartDeviceLink/SDLListFilesResponse.m index 2d58371d8..1c24853fa 100644 --- a/SmartDeviceLink/SDLListFilesResponse.m +++ b/SmartDeviceLink/SDLListFilesResponse.m @@ -4,12 +4,12 @@ #import "SDLListFilesResponse.h" -#import "SDLNames.h" + @implementation SDLListFilesResponse - (instancetype)init { - if (self = [super initWithName:NAMES_ListFiles]) { + if (self = [super initWithName:SDLNameListFiles]) { } return self; } @@ -22,26 +22,26 @@ - (void)setFilenames:(NSMutableArray *)filenames { if (filenames != nil) { - [parameters setObject:filenames forKey:NAMES_filenames]; + [parameters setObject:filenames forKey:SDLNameFilenames]; } else { - [parameters removeObjectForKey:NAMES_filenames]; + [parameters removeObjectForKey:SDLNameFilenames]; } } - (NSMutableArray *)filenames { - return [parameters objectForKey:NAMES_filenames]; + return [parameters objectForKey:SDLNameFilenames]; } - (void)setSpaceAvailable:(NSNumber *)spaceAvailable { if (spaceAvailable != nil) { - [parameters setObject:spaceAvailable forKey:NAMES_spaceAvailable]; + [parameters setObject:spaceAvailable forKey:SDLNameSpaceAvailable]; } else { - [parameters removeObjectForKey:NAMES_spaceAvailable]; + [parameters removeObjectForKey:SDLNameSpaceAvailable]; } } - (NSNumber *)spaceAvailable { - return [parameters objectForKey:NAMES_spaceAvailable]; + return [parameters objectForKey:SDLNameSpaceAvailable]; } @end diff --git a/SmartDeviceLink/SDLMenuParams.m b/SmartDeviceLink/SDLMenuParams.m index 84fb595a8..c020698d7 100644 --- a/SmartDeviceLink/SDLMenuParams.m +++ b/SmartDeviceLink/SDLMenuParams.m @@ -4,7 +4,7 @@ #import "SDLMenuParams.h" -#import "SDLNames.h" + @implementation SDLMenuParams @@ -22,38 +22,38 @@ - (void)setParentID:(NSNumber *)parentID { if (parentID != nil) { - [store setObject:parentID forKey:NAMES_parentID]; + [store setObject:parentID forKey:SDLNameParentId]; } else { - [store removeObjectForKey:NAMES_parentID]; + [store removeObjectForKey:SDLNameParentId]; } } - (NSNumber *)parentID { - return [store objectForKey:NAMES_parentID]; + return [store objectForKey:SDLNameParentId]; } - (void)setPosition:(NSNumber *)position { if (position != nil) { - [store setObject:position forKey:NAMES_position]; + [store setObject:position forKey:SDLNamePosition]; } else { - [store removeObjectForKey:NAMES_position]; + [store removeObjectForKey:SDLNamePosition]; } } - (NSNumber *)position { - return [store objectForKey:NAMES_position]; + return [store objectForKey:SDLNamePosition]; } - (void)setMenuName:(NSString *)menuName { if (menuName != nil) { - [store setObject:menuName forKey:NAMES_menuName]; + [store setObject:menuName forKey:SDLNameMenuName]; } else { - [store removeObjectForKey:NAMES_menuName]; + [store removeObjectForKey:SDLNameMenuName]; } } - (NSString *)menuName { - return [store objectForKey:NAMES_menuName]; + return [store objectForKey:SDLNameMenuName]; } @end diff --git a/SmartDeviceLink/SDLMyKey.m b/SmartDeviceLink/SDLMyKey.m index ec4e5ef95..9e70f7662 100644 --- a/SmartDeviceLink/SDLMyKey.m +++ b/SmartDeviceLink/SDLMyKey.m @@ -3,7 +3,7 @@ #import "SDLMyKey.h" -#import "SDLNames.h" + #import "SDLVehicleDataStatus.h" @@ -23,14 +23,14 @@ - (void)setE911Override:(SDLVehicleDataStatus *)e911Override { if (e911Override != nil) { - [store setObject:e911Override forKey:NAMES_e911Override]; + [store setObject:e911Override forKey:SDLNameE911Override]; } else { - [store removeObjectForKey:NAMES_e911Override]; + [store removeObjectForKey:SDLNameE911Override]; } } - (SDLVehicleDataStatus *)e911Override { - NSObject *obj = [store objectForKey:NAMES_e911Override]; + NSObject *obj = [store objectForKey:SDLNameE911Override]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataStatus.class]) { return (SDLVehicleDataStatus *)obj; } else { diff --git a/SmartDeviceLink/SDLNames.h b/SmartDeviceLink/SDLNames.h index d4adb7dc6..d85a3c2b8 100644 --- a/SmartDeviceLink/SDLNames.h +++ b/SmartDeviceLink/SDLNames.h @@ -1,410 +1,413 @@ // SDLNames.h // +#import <Foundation/Foundation.h> -#define NAMES_accPedalPosition @"accPedalPosition" -#define NAMES_actual @"actual" -#define NAMES_AddCommand @"AddCommand" -#define NAMES_addressLines @"addressLines" -#define NAMES_AddSubMenu @"AddSubMenu" -#define NAMES_airbagStatus @"airbagStatus" -#define NAMES_Alert @"Alert" -#define NAMES_AlertManeuver @"AlertManeuver" -#define NAMES_alertText1 @"alertText1" -#define NAMES_alertText2 @"alertText2" -#define NAMES_alertText3 @"alertText3" -#define NAMES_alignment @"alignment" -#define NAMES_allowed @"allowed" -#define NAMES_altitude @"altitude" -#define NAMES_ambientLightSensorStatus @"ambientLightSensorStatus" -#define NAMES_ambientLightStatus @"ambientLightStatus" -#define NAMES_appBundleID @"appBundleID" -#define NAMES_appHMIType @"appHMIType" -#define NAMES_appID @"appID" -#define NAMES_appInfo @"appInfo" -#define NAMES_appName @"appName" -#define NAMES_appDisplayName @"appDisplayName" -#define NAMES_appVersion @"appVersion" -#define NAMES_audioPassThruCapabilities @"audioPassThruCapabilities" -#define NAMES_audioPassThruDisplayText1 @"audioPassThruDisplayText1" -#define NAMES_audioPassThruDisplayText2 @"audioPassThruDisplayText2" -#define NAMES_audioStreamingState @"audioStreamingState" -#define NAMES_audioType @"audioType" -#define NAMES_autoCompleteText @"autoCompleteText" -#define NAMES_auxECallNotificationStatus @"auxECallNotificationStatus" -#define NAMES_battLevelStatus @"battLevelStatus" -#define NAMES_beltStatus @"beltStatus" -#define NAMES_bitsPerSample @"bitsPerSample" -#define NAMES_bodyInformation @"bodyInformation" -#define NAMES_btIconOn @"btIconOn" -#define NAMES_bulkData @"bulkData" -#define NAMES_buttonCapabilities @"buttonCapabilities" -#define NAMES_buttonEventMode @"buttonEventMode" -#define NAMES_buttonName @"buttonName" -#define NAMES_buttonPressMode @"buttonPressMode" -#define NAMES_c @"c" -#define NAMES_callActive @"callActive" -#define NAMES_carModeStatus @"carModeStatus" -#define NAMES_carrier @"carrier" -#define NAMES_ChangeRegistration @"ChangeRegistration" -#define NAMES_characterSet @"characterSet" -#define NAMES_choiceID @"choiceID" -#define NAMES_choiceSet @"choiceSet" -#define NAMES_clusterModes @"clusterModes" -#define NAMES_clusterModeStatus @"clusterModeStatus" -#define NAMES_cmdIcon @"cmdIcon" -#define NAMES_cmdID @"cmdID" -#define NAMES_compassDirection @"compassDirection" -#define NAMES_correlationID @"correlationID" -#define NAMES_CreateInteractionChoiceSet @"CreateInteractionChoiceSet" -#define NAMES_customButtonID @"customButtonID" -#define NAMES_customPresets @"customPresets" -#define NAMES_data @"data" -#define NAMES_dataResult @"dataResult" -#define NAMES_dataType @"dataType" -#define NAMES_DeleteCommand @"DeleteCommand" -#define NAMES_DeleteFile @"DeleteFile" -#define NAMES_DeleteInteractionChoiceSet @"DeleteInteractionChoiceSet" -#define NAMES_DeleteSubMenu @"DeleteSubMenu" -#define NAMES_deviceInfo @"deviceInfo" -#define NAMES_deviceStatus @"deviceStatus" -#define NAMES_DiagnosticMessage @"DiagnosticMessage" -#define NAMES_didLocation @"didLocation" -#define NAMES_didResult @"didResult" -#define NAMES_dimension @"dimension" -#define NAMES_displayCapabilities @"displayCapabilities" -#define NAMES_displayLayout @"displayLayout" -#define NAMES_displayType @"displayType" -#define NAMES_distanceToEmpty @"distanceToEmpty" -#define NAMES_distanceToManeuver @"distanceToManeuver" -#define NAMES_distanceToManeuverScale @"distanceToManeuverScale" -#define NAMES_doublePressAvailable @"doublePressAvailable" -#define NAMES_driverAirbagDeployed @"driverAirbagDeployed" -#define NAMES_driverBeltDeployed @"driverBeltDeployed" -#define NAMES_driverBraking @"driverBraking" -#define NAMES_driverBuckleBelted @"driverBuckleBelted" -#define NAMES_driverCurtainAirbagDeployed @"driverCurtainAirbagDeployed" -#define NAMES_driverDoorAjar @"driverDoorAjar" -#define NAMES_driverKneeAirbagDeployed @"driverKneeAirbagDeployed" -#define NAMES_driverSideAirbagDeployed @"driverSideAirbagDeployed" -#define NAMES_dtc @"dtc" -#define NAMES_dtcMask @"dtcMask" -#define NAMES_duration @"duration" -#define NAMES_e911Override @"e911Override" -#define NAMES_eCallConfirmationStatus @"eCallConfirmationStatus" -#define NAMES_eCallEventActive @"eCallEventActive" -#define NAMES_eCallInfo @"eCallInfo" -#define NAMES_eCallNotificationStatus @"eCallNotificationStatus" -#define NAMES_ecuHeader @"ecuHeader" -#define NAMES_ecuName @"ecuName" -#define NAMES_emergencyEvent @"emergencyEvent" -#define NAMES_emergencyEventType @"emergencyEventType" -#define NAMES_EncodedSyncPData @"EncodedSyncPData" -#define NAMES_EndAudioPassThru @"EndAudioPassThru" -#define NAMES_endTime @"endTime" -#define NAMES_engineTorque @"engineTorque" -#define NAMES_eta @"eta" -#define NAMES_event @"event" -#define NAMES_externalTemperature @"externalTemperature" -#define NAMES_fileName @"fileName" -#define NAMES_filenames @"filenames" -#define NAMES_fileType @"fileType" -#define NAMES_firmwareRev @"firmwareRev" -#define NAMES_fuelCutoffStatus @"fuelCutoffStatus" -#define NAMES_fuelLevel @"fuelLevel" -#define NAMES_fuelLevel_State @"fuelLevel_State" -#define NAMES_fuelMaintenanceMode @"fuelMaintenanceMode" -#define NAMES_GenericResponse @"GenericResponse" -#define NAMES_GetDTCs @"GetDTCs" -#define NAMES_GetVehicleData @"GetVehicleData" -#define NAMES_gps @"gps" -#define NAMES_graphic @"graphic" -#define NAMES_graphicSupported @"graphicSupported" -#define NAMES_hardware @"hardware" -#define NAMES_hashID @"hashID" -#define NAMES_hdop @"hdop" -#define NAMES_heading @"heading" -#define NAMES_headLampStatus @"headLampStatus" -#define NAMES_helpPrompt @"helpPrompt" -#define NAMES_highBeamsOn @"highBeamsOn" -#define NAMES_hmiDisplayLanguage @"hmiDisplayLanguage" -#define NAMES_hmiDisplayLanguageDesired @"hmiDisplayLanguageDesired" -#define NAMES_hmiLevel @"hmiLevel" -#define NAMES_hmiPermissions @"hmiPermissions" -#define NAMES_hmiCapabilities @"hmiCapabilities" -#define NAMES_hmiZoneCapabilities @"hmiZoneCapabilities" -#define NAMES_hours @"hours" -#define NAMES_id @"id" -#define NAMES_ignitionStableStatus @"ignitionStableStatus" -#define NAMES_ignitionStatus @"ignitionStatus" -#define NAMES_image @"image" -#define NAMES_imageFields @"imageFields" -#define NAMES_imageResolution @"imageResolution" -#define NAMES_imageSupported @"imageSupported" -#define NAMES_imageType @"imageType" -#define NAMES_imageTypeSupported @"imageTypeSupported" -#define NAMES_info @"info" -#define NAMES_initialPrompt @"initialPrompt" -#define NAMES_initialText @"initialText" -#define NAMES_innerLeftRear @"innerLeftRear" -#define NAMES_innerRightRear @"innerRightRear" -#define NAMES_instantFuelConsumption @"instantFuelConsumption" -#define NAMES_interactionChoiceSetID @"interactionChoiceSetID" -#define NAMES_interactionChoiceSetIDList @"interactionChoiceSetIDList" -#define NAMES_interactionLayout @"interactionLayout" -#define NAMES_interactionMode @"interactionMode" -#define NAMES_isHighlighted @"isHighlighted" -#define NAMES_isMediaApplication @"isMediaApplication" -#define NAMES_keyboardLayout @"keyboardLayout" -#define NAMES_keyboardProperties @"keyboardProperties" -#define NAMES_keypressMode @"keypressMode" -#define NAMES_language @"language" -#define NAMES_languageDesired @"languageDesired" -#define NAMES_latitudeDegrees @"latitudeDegrees" -#define NAMES_leftFront @"leftFront" -#define NAMES_leftRear @"leftRear" -#define NAMES_leftRearInflatableBelted @"leftRearInflatableBelted" -#define NAMES_leftRow2BuckleBelted @"leftRow2BuckleBelted" -#define NAMES_leftRow3BuckleBelted @"leftRow3BuckleBelted" -#define NAMES_length @"length" -#define NAMES_limitedCharacterList @"limitedCharacterList" -#define NAMES_ListFiles @"ListFiles" -#define NAMES_locationDescription @"locationDescription" -#define NAMES_locationImage @"locationImage" -#define NAMES_locationName @"locationName" -#define NAMES_longitudeDegrees @"longitudeDegrees" -#define NAMES_longPress @"longPress" -#define NAMES_longPressAvailable @"longPressAvailable" -#define NAMES_lowBeamsOn @"lowBeamsOn" -#define NAMES_mainField1 @"mainField1" -#define NAMES_mainField2 @"mainField2" -#define NAMES_mainField3 @"mainField3" -#define NAMES_mainField4 @"mainField4" -#define NAMES_majorVersion @"majorVersion" -#define NAMES_make @"make" -#define NAMES_maneuverComplete @"maneuverComplete" -#define NAMES_manualTextEntry @"manualTextEntry" -#define NAMES_maxDuration @"maxDuration" -#define NAMES_maximumChangeVelocity @"maximumChangeVelocity" -#define NAMES_maxNumberRFCOMMPorts @"maxNumberRFCOMMPorts" -#define NAMES_mediaClock @"mediaClock" -#define NAMES_mediaClockFormats @"mediaClockFormats" -#define NAMES_mediaTrack @"mediaTrack" -#define NAMES_menuIcon @"menuIcon" -#define NAMES_menuID @"menuID" -#define NAMES_menuName @"menuName" -#define NAMES_menuParams @"menuParams" -#define NAMES_menuTitle @"menuTitle" -#define NAMES_messageData @"messageData" -#define NAMES_messageDataResult @"messageDataResult" -#define NAMES_messageLength @"messageLength" -#define NAMES_middleRow1BeltDeployed @"middleRow1BeltDeployed" -#define NAMES_middleRow1BuckleBelted @"middleRow1BuckleBelted" -#define NAMES_middleRow2BuckleBelted @"middleRow2BuckleBelted" -#define NAMES_middleRow3BuckleBelted @"middleRow3BuckleBelted" -#define NAMES_minorVersion @"minorVersion" -#define NAMES_minutes @"minutes" -#define NAMES_model @"model" -#define NAMES_modelYear @"modelYear" -#define NAMES_monoAudioOutputMuted @"monoAudioOutputMuted" -#define NAMES_multipleEvents @"multipleEvents" -#define NAMES_multiTouchAvailable @"multiTouchAvailable" -#define NAMES_muteAudio @"muteAudio" -#define NAMES_myKey @"myKey" -#define NAMES_name @"name" -#define NAMES_navigation @"navigation" -#define NAMES_navigationText @"navigationText" -#define NAMES_navigationText1 @"navigationText1" -#define NAMES_navigationText2 @"navigationText2" -#define NAMES_nextTurnIcon @"nextTurnIcon" -#define NAMES_ngnMediaScreenAppName @"ngnMediaScreenAppName" -#define NAMES_notification @"notification" -#define NAMES_number @"number" -#define NAMES_numCustomPresetsAvailable @"numCustomPresetsAvailable" -#define NAMES_numTicks @"numTicks" -#define NAMES_odometer @"odometer" -#define NAMES_offset @"offset" -#define NAMES_OnAppInterfaceUnregistered @"OnAppInterfaceUnregistered" -#define NAMES_OnAudioPassThru @"OnAudioPassThru" -#define NAMES_OnButtonEvent @"OnButtonEvent" -#define NAMES_OnButtonPress @"OnButtonPress" -#define NAMES_OnCommand @"OnCommand" -#define NAMES_OnDriverDistraction @"OnDriverDistraction" -#define NAMES_OnEncodedSyncPData @"OnEncodedSyncPData" -#define NAMES_OnHashChange @"OnHashChange" -#define NAMES_OnHMIStatus @"OnHMIStatus" -#define NAMES_OnKeyboardInput @"OnKeyboardInput" -#define NAMES_OnLanguageChange @"OnLanguageChange" -#define NAMES_OnPermissionsChange @"OnPermissionsChange" -#define NAMES_onScreenPresetsAvailable @"onScreenPresetsAvailable" -#define NAMES_OnSyncPData @"OnSyncPData" -#define NAMES_OnSystemRequest @"OnSystemRequest" -#define NAMES_OnTBTClientState @"OnTBTClientState" -#define NAMES_OnTouchEvent @"OnTouchEvent" -#define NAMES_OnVehicleData @"OnVehicleData" -#define NAMES_operation_name @"name" -#define NAMES_os @"os" -#define NAMES_osVersion @"osVersion" -#define NAMES_parameterPermissions @"parameterPermissions" -#define NAMES_parameters @"parameters" -#define NAMES_parentID @"parentID" -#define NAMES_parkBrakeActive @"parkBrakeActive" -#define NAMES_passengerAirbagDeployed @"passengerAirbagDeployed" -#define NAMES_passengerBeltDeployed @"passengerBeltDeployed" -#define NAMES_passengerBuckleBelted @"passengerBuckleBelted" -#define NAMES_passengerChildDetected @"passengerChildDetected" -#define NAMES_passengerCurtainAirbagDeployed @"passengerCurtainAirbagDeployed" -#define NAMES_passengerDoorAjar @"passengerDoorAjar" -#define NAMES_passengerKneeAirbagDeployed @"passengerKneeAirbagDeployed" -#define NAMES_passengerSideAirbagDeployed @"passengerSideAirbagDeployed" -#define NAMES_pdop @"pdop" -#define NAMES_PerformAudioPassThru @"PerformAudioPassThru" -#define NAMES_PerformInteraction @"PerformInteraction" -#define NAMES_permissionItem @"permissionItem" -#define NAMES_persistentFile @"persistentFile" -#define NAMES_phoneCall @"phoneCall" -#define NAMES_phoneNumber @"phoneNumber" -#define NAMES_phoneRoaming @"phoneRoaming" -#define NAMES_playTone @"playTone" -#define NAMES_position @"position" -#define NAMES_powerModeActive @"powerModeActive" -#define NAMES_powerModeQualificationStatus @"powerModeQualificationStatus" -#define NAMES_powerModeStatus @"powerModeStatus" -#define NAMES_prerecordedSpeech @"prerecordedSpeech" -#define NAMES_presetBankCapabilities @"presetBankCapabilities" -#define NAMES_pressAvailable @"pressAvailable" -#define NAMES_pressure @"pressure" -#define NAMES_pressureTelltale @"pressureTelltale" -#define NAMES_primaryAudioSource @"primaryAudioSource" -#define NAMES_prndl @"prndl" -#define NAMES_progressIndicator @"progressIndicator" -#define NAMES_properties @"properties" -#define NAMES_PutFile @"PutFile" -#define NAMES_ReadDID @"ReadDID" -#define NAMES_rearLeftDoorAjar @"rearLeftDoorAjar" -#define NAMES_rearRightDoorAjar @"rearRightDoorAjar" -#define NAMES_reason @"reason" -#define NAMES_RegisterAppInterface @"RegisterAppInterface" -#define NAMES_request @"request" -#define NAMES_requestType @"requestType" -#define NAMES_reserved @"reserved" -#define NAMES_ResetGlobalProperties @"ResetGlobalProperties" -#define NAMES_resolution @"resolution" -#define NAMES_resolutionHeight @"resolutionHeight" -#define NAMES_resolutionWidth @"resolutionWidth" -#define NAMES_response @"response" -#define NAMES_result @"result" -#define NAMES_resultCode @"resultCode" -#define NAMES_rightFront @"rightFront" -#define NAMES_rightRear @"rightRear" -#define NAMES_rightRearInflatableBelted @"rightRearInflatableBelted" -#define NAMES_rightRow2BuckleBelted @"rightRow2BuckleBelted" -#define NAMES_rightRow3BuckleBelted @"rightRow3BuckleBelted" -#define NAMES_rolloverEvent @"rolloverEvent" -#define NAMES_rows @"rows" -#define NAMES_rpcName @"rpcName" -#define NAMES_rpm @"rpm" -#define NAMES_samplingRate @"samplingRate" -#define NAMES_satellites @"satellites" -#define NAMES_screenParams @"screenParams" -#define NAMES_ScrollableMessage @"ScrollableMessage" -#define NAMES_scrollableMessageBody @"scrollableMessageBody" -#define NAMES_sdlVersion @"sdlVersion" -#define NAMES_secondaryGraphic @"secondaryGraphic" -#define NAMES_secondaryImage @"secondaryImage" -#define NAMES_secondaryText @"secondaryText" -#define NAMES_seconds @"seconds" -#define NAMES_SendLocation @"SendLocation" -#define NAMES_SetAppIcon @"SetAppIcon" -#define NAMES_SetDisplayLayout @"SetDisplayLayout" -#define NAMES_SetGlobalProperties @"SetGlobalProperties" -#define NAMES_SetMediaClockTimer @"SetMediaClockTimer" -#define NAMES_shortPress @"shortPress" -#define NAMES_shortPressAvailable @"shortPressAvailable" -#define NAMES_Show @"Show" -#define NAMES_ShowConstantTBT @"ShowConstantTBT" -#define NAMES_signalLevelStatus @"signalLevelStatus" -#define NAMES_Slider @"Slider" -#define NAMES_sliderFooter @"sliderFooter" -#define NAMES_sliderHeader @"sliderHeader" -#define NAMES_sliderPosition @"sliderPosition" -#define NAMES_softButtonCapabilities @"softButtonCapabilities" -#define NAMES_softButtonID @"softButtonID" -#define NAMES_softButtons @"softButtons" -#define NAMES_spaceAvailable @"spaceAvailable" -#define NAMES_Speak @"Speak" -#define NAMES_speechCapabilities @"speechCapabilities" -#define NAMES_speed @"speed" -#define NAMES_startTime @"startTime" -#define NAMES_state @"state" -#define NAMES_stateOfCharge @"stateOfCharge" -#define NAMES_status @"status" -#define NAMES_statusBar @"statusBar" -#define NAMES_steeringWheelAngle @"steeringWheelAngle" -#define NAMES_stereoAudioOutputMuted @"stereoAudioOutputMuted" -#define NAMES_Subscribe @"Subscribe" -#define NAMES_SubscribeButton @"SubscribeButton" -#define NAMES_SubscribeVehicleData @"SubscribeVehicleData" -#define NAMES_success @"success" -#define NAMES_supportedDiagModes @"supportedDiagModes" -#define NAMES_syncFileName @"syncFileName" -#define NAMES_syncMsgVersion @"syncMsgVersion" -#define NAMES_SyncPData @"SyncPData" -#define NAMES_systemAction @"systemAction" -#define NAMES_systemContext @"systemContext" -#define NAMES_systemFile @"systemFile" -#define NAMES_SystemRequest @"SystemRequest" -#define NAMES_systemSoftwareVersion @"systemSoftwareVersion" -#define NAMES_DialNumber @"DialNumber" -#define NAMES_targetID @"targetID" -#define NAMES_templatesAvailable @"templatesAvailable" -#define NAMES_tertiaryText @"tertiaryText" -#define NAMES_text @"text" -#define NAMES_textFields @"textFields" -#define NAMES_textMsgAvailable @"textMsgAvailable" -#define NAMES_timeout @"timeout" -#define NAMES_Timeout @"Timeout" -#define NAMES_timeoutPrompt @"timeoutPrompt" -#define NAMES_timeToDestination @"timeToDestination" -#define NAMES_tirePressure @"tirePressure" -#define NAMES_totalDistance @"totalDistance" -#define NAMES_touchEventAvailable @"touchEventAvailable" -#define NAMES_triggerSource @"triggerSource" -#define NAMES_trim @"trim" -#define NAMES_tryAgainTime @"tryAgainTime" -#define NAMES_ts @"ts" -#define NAMES_ttsChunks @"ttsChunks" -#define NAMES_ttsName @"ttsName" -#define NAMES_turnIcon @"turnIcon" -#define NAMES_turnList @"turnList" -#define NAMES_type @"type" -#define NAMES_UnregisterAppInterface @"UnregisterAppInterface" -#define NAMES_Unsubscribe @"Unsubscribe" -#define NAMES_UnsubscribeButton @"UnsubscribeButton" -#define NAMES_UnsubscribeVehicleData @"UnsubscribeVehicleData" -#define NAMES_updateMode @"updateMode" -#define NAMES_UpdateTurnList @"UpdateTurnList" -#define NAMES_upDownAvailable @"upDownAvailable" -#define NAMES_url @"url" -#define NAMES_URL @"URL" -#define NAMES_userDisallowed @"userDisallowed" -#define NAMES_utcDay @"utcDay" -#define NAMES_utcHours @"utcHours" -#define NAMES_utcMinutes @"utcMinutes" -#define NAMES_utcMonth @"utcMonth" -#define NAMES_utcSeconds @"utcSeconds" -#define NAMES_utcYear @"utcYear" -#define NAMES_value @"value" -#define NAMES_vdop @"vdop" -#define NAMES_vehicleType @"vehicleType" -#define NAMES_vin @"vin" -#define NAMES_voiceRecOn @"voiceRecOn" -#define NAMES_vrCapabilities @"vrCapabilities" -#define NAMES_vrCommands @"vrCommands" -#define NAMES_vrHelp @"vrHelp" -#define NAMES_vrHelpTitle @"vrHelpTitle" -#define NAMES_vrSynonyms @"vrSynonyms" -#define NAMES_width @"width" -#define NAMES_wiperStatus @"wiperStatus" -#define NAMES_x @"x" -#define NAMES_y @"y" +typedef NSString* SDLName NS_EXTENSIBLE_STRING_ENUM; + +extern SDLName const SDLNameAccPedalPosition; +extern SDLName const SDLNameActual; +extern SDLName const SDLNameAddCommand; +extern SDLName const SDLNameAddressLines; +extern SDLName const SDLNameAddSubMenu; +extern SDLName const SDLNameAirbagStatus; +extern SDLName const SDLNameAlert; +extern SDLName const SDLNameAlertManeuver; +extern SDLName const SDLNameAlertText1; +extern SDLName const SDLNameAlertText2; +extern SDLName const SDLNameAlertText3; +extern SDLName const SDLNameAlignment; +extern SDLName const SDLNameAllowed; +extern SDLName const SDLNameAltitude; +extern SDLName const SDLNameAmbientLightSensorStatus; +extern SDLName const SDLNameAmbientLightStatus; +extern SDLName const SDLNameAppBundleId; +extern SDLName const SDLNameAppHmiType; +extern SDLName const SDLNameAppId; +extern SDLName const SDLNameAppInfo; +extern SDLName const SDLNameAppName; +extern SDLName const SDLNameAppDisplayName; +extern SDLName const SDLNameAppVersion; +extern SDLName const SDLNameAudioPassThruCapabilities; +extern SDLName const SDLNameAudioPassThruDisplayText1; +extern SDLName const SDLNameAudioPassThruDisplayText2; +extern SDLName const SDLNameAudioStreamingState; +extern SDLName const SDLNameAudioType; +extern SDLName const SDLNameAutoCompleteText; +extern SDLName const SDLNameAuxECallNotificationStatus; +extern SDLName const SDLNameBattLevelStatus; +extern SDLName const SDLNameBeltStatus; +extern SDLName const SDLNameBitsPerSample; +extern SDLName const SDLNameBodyInformation; +extern SDLName const SDLNameBluetoothIconOn; +extern SDLName const SDLNameBulkData; +extern SDLName const SDLNameButtonCapabilities; +extern SDLName const SDLNameButtonEventMode; +extern SDLName const SDLNameButtonName; +extern SDLName const SDLNameButtonPressMode; +extern SDLName const SDLNameCoord; +extern SDLName const SDLNameCallActive; +extern SDLName const SDLNameCarModeStatus; +extern SDLName const SDLNameCarrier; +extern SDLName const SDLNameChangeRegistration; +extern SDLName const SDLNameCharacterSet; +extern SDLName const SDLNameChoiceId; +extern SDLName const SDLNameChoiceSet; +extern SDLName const SDLNameClusterModes; +extern SDLName const SDLNameClusterModeStatus; +extern SDLName const SDLNameCommandIcon; +extern SDLName const SDLNameCommandId; +extern SDLName const SDLNameCompassDirection; +extern SDLName const SDLNameCorrelationId; +extern SDLName const SDLNameCreateInteractionChoiceSet; +extern SDLName const SDLNameCustomButtonId; +extern SDLName const SDLNameCustomPresets; +extern SDLName const SDLNameData; +extern SDLName const SDLNameDataResult; +extern SDLName const SDLNameDataType; +extern SDLName const SDLNameDeleteCommand; +extern SDLName const SDLNameDeleteFile; +extern SDLName const SDLNameDeleteInteractionChoiceSet; +extern SDLName const SDLNameDeleteSubMenu; +extern SDLName const SDLNameDeviceInfo; +extern SDLName const SDLNameDeviceStatus; +extern SDLName const SDLNameDiagnosticMessage; +extern SDLName const SDLNameDidLocation; +extern SDLName const SDLNameDidResult; +extern SDLName const SDLNameDimension; +extern SDLName const SDLNameDisplayCapabilities; +extern SDLName const SDLNameDisplayLayout; +extern SDLName const SDLNameDisplayType; +extern SDLName const SDLNameDistanceToEmpty; +extern SDLName const SDLNameDistanceToManeuver; +extern SDLName const SDLNameDistanceToManeuverScale; +extern SDLName const SDLNameDoublePressAvailable; +extern SDLName const SDLNameDriverAirbagDeployed; +extern SDLName const SDLNameDriverBeltDeployed; +extern SDLName const SDLNameDriverBraking; +extern SDLName const SDLNameDriverBuckleBelted; +extern SDLName const SDLNameDriverCurtainAirbagDeployed; +extern SDLName const SDLNameDriverDoorAjar; +extern SDLName const SDLNameDriverKneeAirbagDeployed; +extern SDLName const SDLNameDriverSideAirbagDeployed; +extern SDLName const SDLNameDtc; +extern SDLName const SDLNameDtcMask; +extern SDLName const SDLNameDuration; +extern SDLName const SDLNameE911Override; +extern SDLName const SDLNameECallConfirmationStatus; +extern SDLName const SDLNameECallEventActive; +extern SDLName const SDLNameECallInfo; +extern SDLName const SDLNameECallNotificationStatus; +extern SDLName const SDLNameEcuHeader; +extern SDLName const SDLNameEcuName; +extern SDLName const SDLNameEmergencyEvent; +extern SDLName const SDLNameEmergencyEventType; +extern SDLName const SDLNameEncodedSyncPData; +extern SDLName const SDLNameEndAudioPassThru; +extern SDLName const SDLNameEndTime; +extern SDLName const SDLNameEngineTorque; +extern SDLName const SDLNameEta; +extern SDLName const SDLNameEvent; +extern SDLName const SDLNameExternalTemperature; +extern SDLName const SDLNameFileName; +extern SDLName const SDLNameFilenames; +extern SDLName const SDLNameFileType; +extern SDLName const SDLNameFirmwareRev; +extern SDLName const SDLNameFuelCutoffStatus; +extern SDLName const SDLNameFuelLevel; +extern SDLName const SDLNameFuelLevelState; +extern SDLName const SDLNameFuelMaintenanceMode; +extern SDLName const SDLNameGenericResponse; +extern SDLName const SDLNameGetDtcs; +extern SDLName const SDLNameGetVehicleData; +extern SDLName const SDLNameGps; +extern SDLName const SDLNameGraphic; +extern SDLName const SDLNameGraphicSupported; +extern SDLName const SDLNameHardware; +extern SDLName const SDLNameHashId; +extern SDLName const SDLNameHdop; +extern SDLName const SDLNameHeading; +extern SDLName const SDLNameHeadLampStatus; +extern SDLName const SDLNameHelpPrompt; +extern SDLName const SDLNameHighBeamsOn; +extern SDLName const SDLNameHmiDisplayLanguage; +extern SDLName const SDLNameHmiDisplayLanguageDesired; +extern SDLName const SDLNameHmiLevel; +extern SDLName const SDLNameHmiPermissions; +extern SDLName const SDLNameHmiCapabilities; +extern SDLName const SDLNameHmiZoneCapabilities; +extern SDLName const SDLNameHours; +extern SDLName const SDLNameId; +extern SDLName const SDLNameIgnitionStableStatus; +extern SDLName const SDLNameIgnitionStatus; +extern SDLName const SDLNameImage; +extern SDLName const SDLNameImageFields; +extern SDLName const SDLNameImageResolution; +extern SDLName const SDLNameImageSupported; +extern SDLName const SDLNameImageType; +extern SDLName const SDLNameImageTypeSupported; +extern SDLName const SDLNameInfo; +extern SDLName const SDLNameInitialPrompt; +extern SDLName const SDLNameInitialText; +extern SDLName const SDLNameInnerLeftRear; +extern SDLName const SDLNameInnerRightRear; +extern SDLName const SDLNameInstantFuelConsumption; +extern SDLName const SDLNameInteractionChoiceSetId; +extern SDLName const SDLNameInteractionChoiceSetIdList; +extern SDLName const SDLNameInteractionLayout; +extern SDLName const SDLNameInteractionMode; +extern SDLName const SDLNameIsHighlighted; +extern SDLName const SDLNameIsMediaApplication; +extern SDLName const SDLNameKeyboardLayout; +extern SDLName const SDLNameKeyboardProperties; +extern SDLName const SDLNameKeypressMode; +extern SDLName const SDLNameLanguage; +extern SDLName const SDLNameLanguageDesired; +extern SDLName const SDLNameLatitudeDegrees; +extern SDLName const SDLNameLeftFront; +extern SDLName const SDLNameLeftRear; +extern SDLName const SDLNameLeftRearInflatableBelted; +extern SDLName const SDLNameLeftRow2BuckleBelted; +extern SDLName const SDLNameLeftRow3BuckleBelted; +extern SDLName const SDLNameLength; +extern SDLName const SDLNameLimitedCharacterList; +extern SDLName const SDLNameListFiles; +extern SDLName const SDLNameLocationDescription; +extern SDLName const SDLNameLocationImage; +extern SDLName const SDLNameLocationName; +extern SDLName const SDLNameLongitudeDegrees; +extern SDLName const SDLNameLongPress; +extern SDLName const SDLNameLongPressAvailable; +extern SDLName const SDLNameLowBeamsOn; +extern SDLName const SDLNameMainField1; +extern SDLName const SDLNameMainField2; +extern SDLName const SDLNameMainField3; +extern SDLName const SDLNameMainField4; +extern SDLName const SDLNameMajorVersion; +extern SDLName const SDLNameMake; +extern SDLName const SDLNameManeuverComplete; +extern SDLName const SDLNameManualTextEntry; +extern SDLName const SDLNameMaxDuration; +extern SDLName const SDLNameMaximumChangeVelocity; +extern SDLName const SDLNameMaxNumberRfcommPorts; +extern SDLName const SDLNameMediaClock; +extern SDLName const SDLNameMediaClockFormats; +extern SDLName const SDLNameMediaTrack; +extern SDLName const SDLNameMenuIcon; +extern SDLName const SDLNameMenuId; +extern SDLName const SDLNameMenuName; +extern SDLName const SDLNameMenuParams; +extern SDLName const SDLNameMenuTitle; +extern SDLName const SDLNameMessageData; +extern SDLName const SDLNameMessageDataResult; +extern SDLName const SDLNameMessageLength; +extern SDLName const SDLNameMiddleRow1BeltDeployed; +extern SDLName const SDLNameMiddleRow1BuckleBelted; +extern SDLName const SDLNameMiddleRow2BuckleBelted; +extern SDLName const SDLNameMiddleRow3BuckleBelted; +extern SDLName const SDLNameMinorVersion; +extern SDLName const SDLNameMinutes; +extern SDLName const SDLNameModel; +extern SDLName const SDLNameModelYear; +extern SDLName const SDLNameMonoAudioOutputMuted; +extern SDLName const SDLNameMultipleEvents; +extern SDLName const SDLNameMultiTouchAvailable; +extern SDLName const SDLNameMuteAudio; +extern SDLName const SDLNameMyKey; +extern SDLName const SDLNameName; +extern SDLName const SDLNameNavigation; +extern SDLName const SDLNameNavigationText; +extern SDLName const SDLNameNavigationText1; +extern SDLName const SDLNameNavigationText2; +extern SDLName const SDLNameNextTurnIcon; +extern SDLName const SDLNameNgnMediaScreenAppName; +extern SDLName const SDLNameNotification; +extern SDLName const SDLNameNumber; +extern SDLName const SDLNameNumCustomPresetsAvailable; +extern SDLName const SDLNameNumTicks; +extern SDLName const SDLNameOdometer; +extern SDLName const SDLNameOffset; +extern SDLName const SDLNameOnAppInterfaceUnregistered; +extern SDLName const SDLNameOnAudioPassThru; +extern SDLName const SDLNameOnButtonEvent; +extern SDLName const SDLNameOnButtonPress; +extern SDLName const SDLNameOnCommand; +extern SDLName const SDLNameOnDriverDistraction; +extern SDLName const SDLNameOnEncodedSyncPData; +extern SDLName const SDLNameOnHashChange; +extern SDLName const SDLNameOnHmiStatus; +extern SDLName const SDLNameOnKeyboardInput; +extern SDLName const SDLNameOnLanguageChange; +extern SDLName const SDLNameOnPermissionsChange; +extern SDLName const SDLNameOnScreenPresetsAvailable; +extern SDLName const SDLNameOnSyncPData; +extern SDLName const SDLNameOnSystemRequest; +extern SDLName const SDLNameOnTbtClientState; +extern SDLName const SDLNameOnTouchEvent; +extern SDLName const SDLNameOnVehicleData; +extern SDLName const SDLNameOperationName; +extern SDLName const SDLNameOs; +extern SDLName const SDLNameOsVersion; +extern SDLName const SDLNameParameterPermissions; +extern SDLName const SDLNameParameters; +extern SDLName const SDLNameParentId; +extern SDLName const SDLNameParkBrakeActive; +extern SDLName const SDLNamePassengerAirbagDeployed; +extern SDLName const SDLNamePassengerBeltDeployed; +extern SDLName const SDLNamePassengerBuckleBelted; +extern SDLName const SDLNamePassengerChildDetected; +extern SDLName const SDLNamePassengerCurtainAirbagDeployed; +extern SDLName const SDLNamePassengerDoorAjar; +extern SDLName const SDLNamePassengerKneeAirbagDeployed; +extern SDLName const SDLNamePassengerSideAirbagDeployed; +extern SDLName const SDLNamePdop; +extern SDLName const SDLNamePerformAudioPassThru; +extern SDLName const SDLNamePerformInteraction; +extern SDLName const SDLNamePermissionItem; +extern SDLName const SDLNamePersistentFile; +extern SDLName const SDLNamePhoneCall; +extern SDLName const SDLNamePhoneNumber; +extern SDLName const SDLNamePhoneRoaming; +extern SDLName const SDLNamePlayTone; +extern SDLName const SDLNamePosition; +extern SDLName const SDLNamePowerModeActive; +extern SDLName const SDLNamePowerModeQualificationStatus; +extern SDLName const SDLNamePowerModeStatus; +extern SDLName const SDLNamePrerecordedSpeech; +extern SDLName const SDLNamePresetBankCapabilities; +extern SDLName const SDLNamePressAvailable; +extern SDLName const SDLNamePressure; +extern SDLName const SDLNamePressureTelltale; +extern SDLName const SDLNamePrimaryAudioSource; +extern SDLName const SDLNamePrndl; +extern SDLName const SDLNameProgressIndicator; +extern SDLName const SDLNameProperties; +extern SDLName const SDLNamePutFile; +extern SDLName const SDLNameReadDid; +extern SDLName const SDLNameRearLeftDoorAjar; +extern SDLName const SDLNameRearRightDoorAjar; +extern SDLName const SDLNameReason; +extern SDLName const SDLNameRegisterAppInterface; +extern SDLName const SDLNameRequest; +extern SDLName const SDLNameRequestType; +extern SDLName const SDLNameReserved; +extern SDLName const SDLNameResetGlobalProperties; +extern SDLName const SDLNameResolution; +extern SDLName const SDLNameResolutionHeight; +extern SDLName const SDLNameResolutionWidth; +extern SDLName const SDLNameResponse; +extern SDLName const SDLNameResult; +extern SDLName const SDLNameResultCode; +extern SDLName const SDLNameRightFront; +extern SDLName const SDLNameRightRear; +extern SDLName const SDLNameRightRearInflatableBelted; +extern SDLName const SDLNameRightRow2BuckleBelted; +extern SDLName const SDLNameRightRow3BuckleBelted; +extern SDLName const SDLNameRolloverEvent; +extern SDLName const SDLNameRows; +extern SDLName const SDLNameRpcName; +extern SDLName const SDLNameRpm; +extern SDLName const SDLNameSamplingRate; +extern SDLName const SDLNameSatellites; +extern SDLName const SDLNameScreenParams; +extern SDLName const SDLNameScrollableMessage; +extern SDLName const SDLNameScrollableMessageBody; +extern SDLName const SDLNameSdlVersion; +extern SDLName const SDLNameSecondaryGraphic; +extern SDLName const SDLNameSecondaryImage; +extern SDLName const SDLNameSecondaryText; +extern SDLName const SDLNameSeconds; +extern SDLName const SDLNameSendLocation; +extern SDLName const SDLNameSetAppIcon; +extern SDLName const SDLNameSetDisplayLayout; +extern SDLName const SDLNameSetGlobalProperties; +extern SDLName const SDLNameSetMediaClockTimer; +extern SDLName const SDLNameShortPress; +extern SDLName const SDLNameShortPressAvailable; +extern SDLName const SDLNameShow; +extern SDLName const SDLNameShowConstantTbt; +extern SDLName const SDLNameSignalLevelStatus; +extern SDLName const SDLNameSlider; +extern SDLName const SDLNameSliderFooter; +extern SDLName const SDLNameSliderHeader; +extern SDLName const SDLNameSliderPosition; +extern SDLName const SDLNameSoftButtonCapabilities; +extern SDLName const SDLNameSoftButtonId; +extern SDLName const SDLNameSoftButtons; +extern SDLName const SDLNameSpaceAvailable; +extern SDLName const SDLNameSpeak; +extern SDLName const SDLNameSpeechCapabilities; +extern SDLName const SDLNameSpeed; +extern SDLName const SDLNameStartTime; +extern SDLName const SDLNameState; +extern SDLName const SDLNameStateOfCharge; +extern SDLName const SDLNameStatus; +extern SDLName const SDLNameStatusBar; +extern SDLName const SDLNameSteeringWheelAngle; +extern SDLName const SDLNameStereoAudioOutputMuted; +extern SDLName const SDLNameSubscribe; +extern SDLName const SDLNameSubscribeButton; +extern SDLName const SDLNameSubscribeVehicleData; +extern SDLName const SDLNameSuccess; +extern SDLName const SDLNameSupportedDiagModes; +extern SDLName const SDLNameSyncFileName; +extern SDLName const SDLNameSyncMsgVersion; +extern SDLName const SDLNameSyncPData; +extern SDLName const SDLNameSystemAction; +extern SDLName const SDLNameSystemContext; +extern SDLName const SDLNameSystemFile; +extern SDLName const SDLNameSystemRequest; +extern SDLName const SDLNameSystemSoftwareVersion; +extern SDLName const SDLNameDialNumber; +extern SDLName const SDLNameTargetId; +extern SDLName const SDLNameTemplatesAvailable; +extern SDLName const SDLNameTertiaryText; +extern SDLName const SDLNameText; +extern SDLName const SDLNameTextFields; +extern SDLName const SDLNameTextMsgAvailable; +extern SDLName const SDLNameTimeout; +extern SDLName const SDLNameTimeoutCapitalized; +extern SDLName const SDLNameTimeoutPrompt; +extern SDLName const SDLNameTimeToDestination; +extern SDLName const SDLNameTirePressure; +extern SDLName const SDLNameTotalDistance; +extern SDLName const SDLNameTouchEventAvailable; +extern SDLName const SDLNameTriggerSource; +extern SDLName const SDLNameTrim; +extern SDLName const SDLNameTryAgainTime; +extern SDLName const SDLNameTs; +extern SDLName const SDLNameTtsChunks; +extern SDLName const SDLNameTtsName; +extern SDLName const SDLNameTurnIcon; +extern SDLName const SDLNameTurnList; +extern SDLName const SDLNameType; +extern SDLName const SDLNameUnregisterAppInterface; +extern SDLName const SDLNameUnsubscribe; +extern SDLName const SDLNameUnsubscribeButton; +extern SDLName const SDLNameUnsubscribeVehicleData; +extern SDLName const SDLNameUpdateMode; +extern SDLName const SDLNameUpdateTurnList; +extern SDLName const SDLNameUpDownAvailable; +extern SDLName const SDLNameUrl; +extern SDLName const SDLNameUrlUppercase; +extern SDLName const SDLNameUserDisallowed; +extern SDLName const SDLNameUtcDay; +extern SDLName const SDLNameUtcHours; +extern SDLName const SDLNameUtcMinutes; +extern SDLName const SDLNameUtcMonth; +extern SDLName const SDLNameUtcSeconds; +extern SDLName const SDLNameUtcYear; +extern SDLName const SDLNameValue; +extern SDLName const SDLNameVdop; +extern SDLName const SDLNameVehicleType; +extern SDLName const SDLNameVin; +extern SDLName const SDLNameVoiceRecOn; +extern SDLName const SDLNameVrCapabilities; +extern SDLName const SDLNameVrCommands; +extern SDLName const SDLNameVrHelp; +extern SDLName const SDLNameVrHelpTitle; +extern SDLName const SDLNameVrSynonyms; +extern SDLName const SDLNameWidth; +extern SDLName const SDLNameWiperStatus; +extern SDLName const SDLNameX; +extern SDLName const SDLNameY; diff --git a/SmartDeviceLink/SDLNames.m b/SmartDeviceLink/SDLNames.m new file mode 100644 index 000000000..8f63eb13f --- /dev/null +++ b/SmartDeviceLink/SDLNames.m @@ -0,0 +1,411 @@ +// SDLNames.h +// + +#import "SDLNames.h" + +SDLName const SDLNameAccPedalPosition = @"accPedalPosition"; +SDLName const SDLNameActual = @"actual"; +SDLName const SDLNameAddCommand = @"AddCommand"; +SDLName const SDLNameAddressLines = @"addressLines"; +SDLName const SDLNameAddSubMenu = @"AddSubMenu"; +SDLName const SDLNameAirbagStatus = @"airbagStatus"; +SDLName const SDLNameAlert = @"Alert"; +SDLName const SDLNameAlertManeuver = @"AlertManeuver"; +SDLName const SDLNameAlertText1 = @"alertText1"; +SDLName const SDLNameAlertText2 = @"alertText2"; +SDLName const SDLNameAlertText3 = @"alertText3"; +SDLName const SDLNameAlignment = @"alignment"; +SDLName const SDLNameAllowed = @"allowed"; +SDLName const SDLNameAltitude = @"altitude"; +SDLName const SDLNameAmbientLightSensorStatus = @"ambientLightSensorStatus"; +SDLName const SDLNameAmbientLightStatus = @"ambientLightStatus"; +SDLName const SDLNameAppBundleId = @"appBundleID"; +SDLName const SDLNameAppHmiType = @"appHMIType"; +SDLName const SDLNameAppId = @"appID"; +SDLName const SDLNameAppInfo = @"appInfo"; +SDLName const SDLNameAppName = @"appName"; +SDLName const SDLNameAppDisplayName = @"appDisplayName"; +SDLName const SDLNameAppVersion = @"appVersion"; +SDLName const SDLNameAudioPassThruCapabilities = @"audioPassThruCapabilities"; +SDLName const SDLNameAudioPassThruDisplayText1 = @"audioPassThruDisplayText1"; +SDLName const SDLNameAudioPassThruDisplayText2 = @"audioPassThruDisplayText2"; +SDLName const SDLNameAudioStreamingState = @"audioStreamingState"; +SDLName const SDLNameAudioType = @"audioType"; +SDLName const SDLNameAutoCompleteText = @"autoCompleteText"; +SDLName const SDLNameAuxECallNotificationStatus = @"auxECallNotificationStatus"; +SDLName const SDLNameBattLevelStatus = @"battLevelStatus"; +SDLName const SDLNameBeltStatus = @"beltStatus"; +SDLName const SDLNameBitsPerSample = @"bitsPerSample"; +SDLName const SDLNameBodyInformation = @"bodyInformation"; +SDLName const SDLNameBluetoothIconOn = @"btIconOn"; +SDLName const SDLNameBulkData = @"bulkData"; +SDLName const SDLNameButtonCapabilities = @"buttonCapabilities"; +SDLName const SDLNameButtonEventMode = @"buttonEventMode"; +SDLName const SDLNameButtonName = @"buttonName"; +SDLName const SDLNameButtonPressMode = @"buttonPressMode"; +SDLName const SDLNameCoord = @"c"; +SDLName const SDLNameCallActive = @"callActive"; +SDLName const SDLNameCarModeStatus = @"carModeStatus"; +SDLName const SDLNameCarrier = @"carrier"; +SDLName const SDLNameChangeRegistration = @"ChangeRegistration"; +SDLName const SDLNameCharacterSet = @"characterSet"; +SDLName const SDLNameChoiceId = @"choiceID"; +SDLName const SDLNameChoiceSet = @"choiceSet"; +SDLName const SDLNameClusterModes = @"clusterModes"; +SDLName const SDLNameClusterModeStatus = @"clusterModeStatus"; +SDLName const SDLNameCommandIcon = @"cmdIcon"; +SDLName const SDLNameCommandId = @"cmdID"; +SDLName const SDLNameCompassDirection = @"compassDirection"; +SDLName const SDLNameCorrelationId = @"correlationID"; +SDLName const SDLNameCreateInteractionChoiceSet = @"CreateInteractionChoiceSet"; +SDLName const SDLNameCustomButtonId = @"customButtonID"; +SDLName const SDLNameCustomPresets = @"customPresets"; +SDLName const SDLNameData = @"data"; +SDLName const SDLNameDataResult = @"dataResult"; +SDLName const SDLNameDataType = @"dataType"; +SDLName const SDLNameDeleteCommand = @"DeleteCommand"; +SDLName const SDLNameDeleteFile = @"DeleteFile"; +SDLName const SDLNameDeleteInteractionChoiceSet = @"DeleteInteractionChoiceSet"; +SDLName const SDLNameDeleteSubMenu = @"DeleteSubMenu"; +SDLName const SDLNameDeviceInfo = @"deviceInfo"; +SDLName const SDLNameDeviceStatus = @"deviceStatus"; +SDLName const SDLNameDiagnosticMessage = @"DiagnosticMessage"; +SDLName const SDLNameDidLocation = @"didLocation"; +SDLName const SDLNameDidResult = @"didResult"; +SDLName const SDLNameDimension = @"dimension"; +SDLName const SDLNameDisplayCapabilities = @"displayCapabilities"; +SDLName const SDLNameDisplayLayout = @"displayLayout"; +SDLName const SDLNameDisplayType = @"displayType"; +SDLName const SDLNameDistanceToEmpty = @"distanceToEmpty"; +SDLName const SDLNameDistanceToManeuver = @"distanceToManeuver"; +SDLName const SDLNameDistanceToManeuverScale = @"distanceToManeuverScale"; +SDLName const SDLNameDoublePressAvailable = @"doublePressAvailable"; +SDLName const SDLNameDriverAirbagDeployed = @"driverAirbagDeployed"; +SDLName const SDLNameDriverBeltDeployed = @"driverBeltDeployed"; +SDLName const SDLNameDriverBraking = @"driverBraking"; +SDLName const SDLNameDriverBuckleBelted = @"driverBuckleBelted"; +SDLName const SDLNameDriverCurtainAirbagDeployed = @"driverCurtainAirbagDeployed"; +SDLName const SDLNameDriverDoorAjar = @"driverDoorAjar"; +SDLName const SDLNameDriverKneeAirbagDeployed = @"driverKneeAirbagDeployed"; +SDLName const SDLNameDriverSideAirbagDeployed = @"driverSideAirbagDeployed"; +SDLName const SDLNameDtc = @"dtc"; +SDLName const SDLNameDtcMask = @"dtcMask"; +SDLName const SDLNameDuration = @"duration"; +SDLName const SDLNameE911Override = @"e911Override"; +SDLName const SDLNameECallConfirmationStatus = @"eCallConfirmationStatus"; +SDLName const SDLNameECallEventActive = @"eCallEventActive"; +SDLName const SDLNameECallInfo = @"eCallInfo"; +SDLName const SDLNameECallNotificationStatus = @"eCallNotificationStatus"; +SDLName const SDLNameEcuHeader = @"ecuHeader"; +SDLName const SDLNameEcuName = @"ecuName"; +SDLName const SDLNameEmergencyEvent = @"emergencyEvent"; +SDLName const SDLNameEmergencyEventType = @"emergencyEventType"; +SDLName const SDLNameEncodedSyncPData = @"EncodedSyncPData"; +SDLName const SDLNameEndAudioPassThru = @"EndAudioPassThru"; +SDLName const SDLNameEndTime = @"endTime"; +SDLName const SDLNameEngineTorque = @"engineTorque"; +SDLName const SDLNameEta = @"eta"; +SDLName const SDLNameEvent = @"event"; +SDLName const SDLNameExternalTemperature = @"externalTemperature"; +SDLName const SDLNameFileName = @"fileName"; +SDLName const SDLNameFilenames = @"filenames"; +SDLName const SDLNameFileType = @"fileType"; +SDLName const SDLNameFirmwareRev = @"firmwareRev"; +SDLName const SDLNameFuelCutoffStatus = @"fuelCutoffStatus"; +SDLName const SDLNameFuelLevel = @"fuelLevel"; +SDLName const SDLNameFuelLevelState = @"fuelLevel_State"; +SDLName const SDLNameFuelMaintenanceMode = @"fuelMaintenanceMode"; +SDLName const SDLNameGenericResponse = @"GenericResponse"; +SDLName const SDLNameGetDtcs = @"GetDTCs"; +SDLName const SDLNameGetVehicleData = @"GetVehicleData"; +SDLName const SDLNameGps = @"gps"; +SDLName const SDLNameGraphic = @"graphic"; +SDLName const SDLNameGraphicSupported = @"graphicSupported"; +SDLName const SDLNameHardware = @"hardware"; +SDLName const SDLNameHashId = @"hashID"; +SDLName const SDLNameHdop = @"hdop"; +SDLName const SDLNameHeading = @"heading"; +SDLName const SDLNameHeadLampStatus = @"headLampStatus"; +SDLName const SDLNameHelpPrompt = @"helpPrompt"; +SDLName const SDLNameHighBeamsOn = @"highBeamsOn"; +SDLName const SDLNameHmiDisplayLanguage = @"hmiDisplayLanguage"; +SDLName const SDLNameHmiDisplayLanguageDesired = @"hmiDisplayLanguageDesired"; +SDLName const SDLNameHmiLevel = @"hmiLevel"; +SDLName const SDLNameHmiPermissions = @"hmiPermissions"; +SDLName const SDLNameHmiCapabilities = @"hmiCapabilities"; +SDLName const SDLNameHmiZoneCapabilities = @"hmiZoneCapabilities"; +SDLName const SDLNameHours = @"hours"; +SDLName const SDLNameId = @"id"; +SDLName const SDLNameIgnitionStableStatus = @"ignitionStableStatus"; +SDLName const SDLNameIgnitionStatus = @"ignitionStatus"; +SDLName const SDLNameImage = @"image"; +SDLName const SDLNameImageFields = @"imageFields"; +SDLName const SDLNameImageResolution = @"imageResolution"; +SDLName const SDLNameImageSupported = @"imageSupported"; +SDLName const SDLNameImageType = @"imageType"; +SDLName const SDLNameImageTypeSupported = @"imageTypeSupported"; +SDLName const SDLNameInfo = @"info"; +SDLName const SDLNameInitialPrompt = @"initialPrompt"; +SDLName const SDLNameInitialText = @"initialText"; +SDLName const SDLNameInnerLeftRear = @"innerLeftRear"; +SDLName const SDLNameInnerRightRear = @"innerRightRear"; +SDLName const SDLNameInstantFuelConsumption = @"instantFuelConsumption"; +SDLName const SDLNameInteractionChoiceSetId = @"interactionChoiceSetID"; +SDLName const SDLNameInteractionChoiceSetIdList = @"interactionChoiceSetIDList"; +SDLName const SDLNameInteractionLayout = @"interactionLayout"; +SDLName const SDLNameInteractionMode = @"interactionMode"; +SDLName const SDLNameIsHighlighted = @"isHighlighted"; +SDLName const SDLNameIsMediaApplication = @"isMediaApplication"; +SDLName const SDLNameKeyboardLayout = @"keyboardLayout"; +SDLName const SDLNameKeyboardProperties = @"keyboardProperties"; +SDLName const SDLNameKeypressMode = @"keypressMode"; +SDLName const SDLNameLanguage = @"language"; +SDLName const SDLNameLanguageDesired = @"languageDesired"; +SDLName const SDLNameLatitudeDegrees = @"latitudeDegrees"; +SDLName const SDLNameLeftFront = @"leftFront"; +SDLName const SDLNameLeftRear = @"leftRear"; +SDLName const SDLNameLeftRearInflatableBelted = @"leftRearInflatableBelted"; +SDLName const SDLNameLeftRow2BuckleBelted = @"leftRow2BuckleBelted"; +SDLName const SDLNameLeftRow3BuckleBelted = @"leftRow3BuckleBelted"; +SDLName const SDLNameLength = @"length"; +SDLName const SDLNameLimitedCharacterList = @"limitedCharacterList"; +SDLName const SDLNameListFiles = @"ListFiles"; +SDLName const SDLNameLocationDescription = @"locationDescription"; +SDLName const SDLNameLocationImage = @"locationImage"; +SDLName const SDLNameLocationName = @"locationName"; +SDLName const SDLNameLongitudeDegrees = @"longitudeDegrees"; +SDLName const SDLNameLongPress = @"longPress"; +SDLName const SDLNameLongPressAvailable = @"longPressAvailable"; +SDLName const SDLNameLowBeamsOn = @"lowBeamsOn"; +SDLName const SDLNameMainField1 = @"mainField1"; +SDLName const SDLNameMainField2 = @"mainField2"; +SDLName const SDLNameMainField3 = @"mainField3"; +SDLName const SDLNameMainField4 = @"mainField4"; +SDLName const SDLNameMajorVersion = @"majorVersion"; +SDLName const SDLNameMake = @"make"; +SDLName const SDLNameManeuverComplete = @"maneuverComplete"; +SDLName const SDLNameManualTextEntry = @"manualTextEntry"; +SDLName const SDLNameMaxDuration = @"maxDuration"; +SDLName const SDLNameMaximumChangeVelocity = @"maximumChangeVelocity"; +SDLName const SDLNameMaxNumberRfcommPorts = @"maxNumberRFCOMMPorts"; +SDLName const SDLNameMediaClock = @"mediaClock"; +SDLName const SDLNameMediaClockFormats = @"mediaClockFormats"; +SDLName const SDLNameMediaTrack = @"mediaTrack"; +SDLName const SDLNameMenuIcon = @"menuIcon"; +SDLName const SDLNameMenuId = @"menuID"; +SDLName const SDLNameMenuName = @"menuName"; +SDLName const SDLNameMenuParams = @"menuParams"; +SDLName const SDLNameMenuTitle = @"menuTitle"; +SDLName const SDLNameMessageData = @"messageData"; +SDLName const SDLNameMessageDataResult = @"messageDataResult"; +SDLName const SDLNameMessageLength = @"messageLength"; +SDLName const SDLNameMiddleRow1BeltDeployed = @"middleRow1BeltDeployed"; +SDLName const SDLNameMiddleRow1BuckleBelted = @"middleRow1BuckleBelted"; +SDLName const SDLNameMiddleRow2BuckleBelted = @"middleRow2BuckleBelted"; +SDLName const SDLNameMiddleRow3BuckleBelted = @"middleRow3BuckleBelted"; +SDLName const SDLNameMinorVersion = @"minorVersion"; +SDLName const SDLNameMinutes = @"minutes"; +SDLName const SDLNameModel = @"model"; +SDLName const SDLNameModelYear = @"modelYear"; +SDLName const SDLNameMonoAudioOutputMuted = @"monoAudioOutputMuted"; +SDLName const SDLNameMultipleEvents = @"multipleEvents"; +SDLName const SDLNameMultiTouchAvailable = @"multiTouchAvailable"; +SDLName const SDLNameMuteAudio = @"muteAudio"; +SDLName const SDLNameMyKey = @"myKey"; +SDLName const SDLNameName = @"name"; +SDLName const SDLNameNavigation = @"navigation"; +SDLName const SDLNameNavigationText = @"navigationText"; +SDLName const SDLNameNavigationText1 = @"navigationText1"; +SDLName const SDLNameNavigationText2 = @"navigationText2"; +SDLName const SDLNameNextTurnIcon = @"nextTurnIcon"; +SDLName const SDLNameNgnMediaScreenAppName = @"ngnMediaScreenAppName"; +SDLName const SDLNameNotification = @"notification"; +SDLName const SDLNameNumber = @"number"; +SDLName const SDLNameNumCustomPresetsAvailable = @"numCustomPresetsAvailable"; +SDLName const SDLNameNumTicks = @"numTicks"; +SDLName const SDLNameOdometer = @"odometer"; +SDLName const SDLNameOffset = @"offset"; +SDLName const SDLNameOnAppInterfaceUnregistered = @"OnAppInterfaceUnregistered"; +SDLName const SDLNameOnAudioPassThru = @"OnAudioPassThru"; +SDLName const SDLNameOnButtonEvent = @"OnButtonEvent"; +SDLName const SDLNameOnButtonPress = @"OnButtonPress"; +SDLName const SDLNameOnCommand = @"OnCommand"; +SDLName const SDLNameOnDriverDistraction = @"OnDriverDistraction"; +SDLName const SDLNameOnEncodedSyncPData = @"OnEncodedSyncPData"; +SDLName const SDLNameOnHashChange = @"OnHashChange"; +SDLName const SDLNameOnHmiStatus = @"OnHMIStatus"; +SDLName const SDLNameOnKeyboardInput = @"OnKeyboardInput"; +SDLName const SDLNameOnLanguageChange = @"OnLanguageChange"; +SDLName const SDLNameOnPermissionsChange = @"OnPermissionsChange"; +SDLName const SDLNameOnScreenPresetsAvailable = @"onScreenPresetsAvailable"; +SDLName const SDLNameOnSyncPData = @"OnSyncPData"; +SDLName const SDLNameOnSystemRequest = @"OnSystemRequest"; +SDLName const SDLNameOnTbtClientState = @"OnTBTClientState"; +SDLName const SDLNameOnTouchEvent = @"OnTouchEvent"; +SDLName const SDLNameOnVehicleData = @"OnVehicleData"; +SDLName const SDLNameOperationName = @"name"; +SDLName const SDLNameOs = @"os"; +SDLName const SDLNameOsVersion = @"osVersion"; +SDLName const SDLNameParameterPermissions = @"parameterPermissions"; +SDLName const SDLNameParameters = @"parameters"; +SDLName const SDLNameParentId = @"parentID"; +SDLName const SDLNameParkBrakeActive = @"parkBrakeActive"; +SDLName const SDLNamePassengerAirbagDeployed = @"passengerAirbagDeployed"; +SDLName const SDLNamePassengerBeltDeployed = @"passengerBeltDeployed"; +SDLName const SDLNamePassengerBuckleBelted = @"passengerBuckleBelted"; +SDLName const SDLNamePassengerChildDetected = @"passengerChildDetected"; +SDLName const SDLNamePassengerCurtainAirbagDeployed = @"passengerCurtainAirbagDeployed"; +SDLName const SDLNamePassengerDoorAjar = @"passengerDoorAjar"; +SDLName const SDLNamePassengerKneeAirbagDeployed = @"passengerKneeAirbagDeployed"; +SDLName const SDLNamePassengerSideAirbagDeployed = @"passengerSideAirbagDeployed"; +SDLName const SDLNamePdop = @"pdop"; +SDLName const SDLNamePerformAudioPassThru = @"PerformAudioPassThru"; +SDLName const SDLNamePerformInteraction = @"PerformInteraction"; +SDLName const SDLNamePermissionItem = @"permissionItem"; +SDLName const SDLNamePersistentFile = @"persistentFile"; +SDLName const SDLNamePhoneCall = @"phoneCall"; +SDLName const SDLNamePhoneNumber = @"phoneNumber"; +SDLName const SDLNamePhoneRoaming = @"phoneRoaming"; +SDLName const SDLNamePlayTone = @"playTone"; +SDLName const SDLNamePosition = @"position"; +SDLName const SDLNamePowerModeActive = @"powerModeActive"; +SDLName const SDLNamePowerModeQualificationStatus = @"powerModeQualificationStatus"; +SDLName const SDLNamePowerModeStatus = @"powerModeStatus"; +SDLName const SDLNamePrerecordedSpeech = @"prerecordedSpeech"; +SDLName const SDLNamePresetBankCapabilities = @"presetBankCapabilities"; +SDLName const SDLNamePressAvailable = @"pressAvailable"; +SDLName const SDLNamePressure = @"pressure"; +SDLName const SDLNamePressureTelltale = @"pressureTelltale"; +SDLName const SDLNamePrimaryAudioSource = @"primaryAudioSource"; +SDLName const SDLNamePrndl = @"prndl"; +SDLName const SDLNameProgressIndicator = @"progressIndicator"; +SDLName const SDLNameProperties = @"properties"; +SDLName const SDLNamePutFile = @"PutFile"; +SDLName const SDLNameReadDid = @"ReadDID"; +SDLName const SDLNameRearLeftDoorAjar = @"rearLeftDoorAjar"; +SDLName const SDLNameRearRightDoorAjar = @"rearRightDoorAjar"; +SDLName const SDLNameReason = @"reason"; +SDLName const SDLNameRegisterAppInterface = @"RegisterAppInterface"; +SDLName const SDLNameRequest = @"request"; +SDLName const SDLNameRequestType = @"requestType"; +SDLName const SDLNameReserved = @"reserved"; +SDLName const SDLNameResetGlobalProperties = @"ResetGlobalProperties"; +SDLName const SDLNameResolution = @"resolution"; +SDLName const SDLNameResolutionHeight = @"resolutionHeight"; +SDLName const SDLNameResolutionWidth = @"resolutionWidth"; +SDLName const SDLNameResponse = @"response"; +SDLName const SDLNameResult = @"result"; +SDLName const SDLNameResultCode = @"resultCode"; +SDLName const SDLNameRightFront = @"rightFront"; +SDLName const SDLNameRightRear = @"rightRear"; +SDLName const SDLNameRightRearInflatableBelted = @"rightRearInflatableBelted"; +SDLName const SDLNameRightRow2BuckleBelted = @"rightRow2BuckleBelted"; +SDLName const SDLNameRightRow3BuckleBelted = @"rightRow3BuckleBelted"; +SDLName const SDLNameRolloverEvent = @"rolloverEvent"; +SDLName const SDLNameRows = @"rows"; +SDLName const SDLNameRpcName = @"rpcName"; +SDLName const SDLNameRpm = @"rpm"; +SDLName const SDLNameSamplingRate = @"samplingRate"; +SDLName const SDLNameSatellites = @"satellites"; +SDLName const SDLNameScreenParams = @"screenParams"; +SDLName const SDLNameScrollableMessage = @"ScrollableMessage"; +SDLName const SDLNameScrollableMessageBody = @"scrollableMessageBody"; +SDLName const SDLNameSdlVersion = @"sdlVersion"; +SDLName const SDLNameSecondaryGraphic = @"secondaryGraphic"; +SDLName const SDLNameSecondaryImage = @"secondaryImage"; +SDLName const SDLNameSecondaryText = @"secondaryText"; +SDLName const SDLNameSeconds = @"seconds"; +SDLName const SDLNameSendLocation = @"SendLocation"; +SDLName const SDLNameSetAppIcon = @"SetAppIcon"; +SDLName const SDLNameSetDisplayLayout = @"SetDisplayLayout"; +SDLName const SDLNameSetGlobalProperties = @"SetGlobalProperties"; +SDLName const SDLNameSetMediaClockTimer = @"SetMediaClockTimer"; +SDLName const SDLNameShortPress = @"shortPress"; +SDLName const SDLNameShortPressAvailable = @"shortPressAvailable"; +SDLName const SDLNameShow = @"Show"; +SDLName const SDLNameShowConstantTbt = @"ShowConstantTBT"; +SDLName const SDLNameSignalLevelStatus = @"signalLevelStatus"; +SDLName const SDLNameSlider = @"Slider"; +SDLName const SDLNameSliderFooter = @"sliderFooter"; +SDLName const SDLNameSliderHeader = @"sliderHeader"; +SDLName const SDLNameSliderPosition = @"sliderPosition"; +SDLName const SDLNameSoftButtonCapabilities = @"softButtonCapabilities"; +SDLName const SDLNameSoftButtonId = @"softButtonID"; +SDLName const SDLNameSoftButtons = @"softButtons"; +SDLName const SDLNameSpaceAvailable = @"spaceAvailable"; +SDLName const SDLNameSpeak = @"Speak"; +SDLName const SDLNameSpeechCapabilities = @"speechCapabilities"; +SDLName const SDLNameSpeed = @"speed"; +SDLName const SDLNameStartTime = @"startTime"; +SDLName const SDLNameState = @"state"; +SDLName const SDLNameStateOfCharge = @"stateOfCharge"; +SDLName const SDLNameStatus = @"status"; +SDLName const SDLNameStatusBar = @"statusBar"; +SDLName const SDLNameSteeringWheelAngle = @"steeringWheelAngle"; +SDLName const SDLNameStereoAudioOutputMuted = @"stereoAudioOutputMuted"; +SDLName const SDLNameSubscribe = @"Subscribe"; +SDLName const SDLNameSubscribeButton = @"SubscribeButton"; +SDLName const SDLNameSubscribeVehicleData = @"SubscribeVehicleData"; +SDLName const SDLNameSuccess = @"success"; +SDLName const SDLNameSupportedDiagModes = @"supportedDiagModes"; +SDLName const SDLNameSyncFileName = @"syncFileName"; +SDLName const SDLNameSyncMsgVersion = @"syncMsgVersion"; +SDLName const SDLNameSyncPData = @"SyncPData"; +SDLName const SDLNameSystemAction = @"systemAction"; +SDLName const SDLNameSystemContext = @"systemContext"; +SDLName const SDLNameSystemFile = @"systemFile"; +SDLName const SDLNameSystemRequest = @"SystemRequest"; +SDLName const SDLNameSystemSoftwareVersion = @"systemSoftwareVersion"; +SDLName const SDLNameDialNumber = @"DialNumber"; +SDLName const SDLNameTargetId = @"targetID"; +SDLName const SDLNameTemplatesAvailable = @"templatesAvailable"; +SDLName const SDLNameTertiaryText = @"tertiaryText"; +SDLName const SDLNameText = @"text"; +SDLName const SDLNameTextFields = @"textFields"; +SDLName const SDLNameTextMsgAvailable = @"textMsgAvailable"; +SDLName const SDLNameTimeout = @"timeout"; +SDLName const SDLNameTimeoutCapitalized = @"Timeout"; +SDLName const SDLNameTimeoutPrompt = @"timeoutPrompt"; +SDLName const SDLNameTimeToDestination = @"timeToDestination"; +SDLName const SDLNameTirePressure = @"tirePressure"; +SDLName const SDLNameTotalDistance = @"totalDistance"; +SDLName const SDLNameTouchEventAvailable = @"touchEventAvailable"; +SDLName const SDLNameTriggerSource = @"triggerSource"; +SDLName const SDLNameTrim = @"trim"; +SDLName const SDLNameTryAgainTime = @"tryAgainTime"; +SDLName const SDLNameTs = @"ts"; +SDLName const SDLNameTtsChunks = @"ttsChunks"; +SDLName const SDLNameTtsName = @"ttsName"; +SDLName const SDLNameTurnIcon = @"turnIcon"; +SDLName const SDLNameTurnList = @"turnList"; +SDLName const SDLNameType = @"type"; +SDLName const SDLNameUnregisterAppInterface = @"UnregisterAppInterface"; +SDLName const SDLNameUnsubscribe = @"Unsubscribe"; +SDLName const SDLNameUnsubscribeButton = @"UnsubscribeButton"; +SDLName const SDLNameUnsubscribeVehicleData = @"UnsubscribeVehicleData"; +SDLName const SDLNameUpdateMode = @"updateMode"; +SDLName const SDLNameUpdateTurnList = @"UpdateTurnList"; +SDLName const SDLNameUpDownAvailable = @"upDownAvailable"; +SDLName const SDLNameUrl = @"url"; +SDLName const SDLNameUrlUppercase = @"URL"; +SDLName const SDLNameUserDisallowed = @"userDisallowed"; +SDLName const SDLNameUtcDay = @"utcDay"; +SDLName const SDLNameUtcHours = @"utcHours"; +SDLName const SDLNameUtcMinutes = @"utcMinutes"; +SDLName const SDLNameUtcMonth = @"utcMonth"; +SDLName const SDLNameUtcSeconds = @"utcSeconds"; +SDLName const SDLNameUtcYear = @"utcYear"; +SDLName const SDLNameValue = @"value"; +SDLName const SDLNameVdop = @"vdop"; +SDLName const SDLNameVehicleType = @"vehicleType"; +SDLName const SDLNameVin = @"vin"; +SDLName const SDLNameVoiceRecOn = @"voiceRecOn"; +SDLName const SDLNameVrCapabilities = @"vrCapabilities"; +SDLName const SDLNameVrCommands = @"vrCommands"; +SDLName const SDLNameVrHelp = @"vrHelp"; +SDLName const SDLNameVrHelpTitle = @"vrHelpTitle"; +SDLName const SDLNameVrSynonyms = @"vrSynonyms"; +SDLName const SDLNameWidth = @"width"; +SDLName const SDLNameWiperStatus = @"wiperStatus"; +SDLName const SDLNameX = @"x"; +SDLName const SDLNameY = @"y"; diff --git a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m index 5427cf871..216c4783d 100644 --- a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m +++ b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m @@ -4,13 +4,13 @@ #import "SDLOnAppInterfaceUnregistered.h" #import "SDLAppInterfaceUnregisteredReason.h" -#import "SDLNames.h" + @implementation SDLOnAppInterfaceUnregistered - (instancetype)init { - if (self = [super initWithName:NAMES_OnAppInterfaceUnregistered]) { + if (self = [super initWithName:SDLNameOnAppInterfaceUnregistered]) { } return self; } @@ -23,14 +23,14 @@ - (void)setReason:(SDLAppInterfaceUnregisteredReason *)reason { if (reason != nil) { - [parameters setObject:reason forKey:NAMES_reason]; + [parameters setObject:reason forKey:SDLNameReason]; } else { - [parameters removeObjectForKey:NAMES_reason]; + [parameters removeObjectForKey:SDLNameReason]; } } - (SDLAppInterfaceUnregisteredReason *)reason { - NSObject *obj = [parameters objectForKey:NAMES_reason]; + NSObject *obj = [parameters objectForKey:SDLNameReason]; if (obj == nil || [obj isKindOfClass:SDLAppInterfaceUnregisteredReason.class]) { return (SDLAppInterfaceUnregisteredReason *)obj; } else { diff --git a/SmartDeviceLink/SDLOnAudioPassThru.m b/SmartDeviceLink/SDLOnAudioPassThru.m index e0360e3e4..4f8df6c54 100644 --- a/SmartDeviceLink/SDLOnAudioPassThru.m +++ b/SmartDeviceLink/SDLOnAudioPassThru.m @@ -4,12 +4,12 @@ #import "SDLOnAudioPassThru.h" -#import "SDLNames.h" + @implementation SDLOnAudioPassThru - (instancetype)init { - if (self = [super initWithName:NAMES_OnAudioPassThru]) { + if (self = [super initWithName:SDLNameOnAudioPassThru]) { } return self; } diff --git a/SmartDeviceLink/SDLOnButtonEvent.m b/SmartDeviceLink/SDLOnButtonEvent.m index d112d88ea..9fcf65225 100644 --- a/SmartDeviceLink/SDLOnButtonEvent.m +++ b/SmartDeviceLink/SDLOnButtonEvent.m @@ -5,13 +5,13 @@ #import "SDLButtonEventMode.h" #import "SDLButtonName.h" -#import "SDLNames.h" + @implementation SDLOnButtonEvent - (instancetype)init { - if (self = [super initWithName:NAMES_OnButtonEvent]) { + if (self = [super initWithName:SDLNameOnButtonEvent]) { } return self; } @@ -24,14 +24,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 { @@ -41,14 +41,14 @@ - (void)setButtonEventMode:(SDLButtonEventMode *)buttonEventMode { if (buttonEventMode != nil) { - [parameters setObject:buttonEventMode forKey:NAMES_buttonEventMode]; + [parameters setObject:buttonEventMode forKey:SDLNameButtonEventMode]; } else { - [parameters removeObjectForKey:NAMES_buttonEventMode]; + [parameters removeObjectForKey:SDLNameButtonEventMode]; } } - (SDLButtonEventMode *)buttonEventMode { - NSObject *obj = [parameters objectForKey:NAMES_buttonEventMode]; + NSObject *obj = [parameters objectForKey:SDLNameButtonEventMode]; if (obj == nil || [obj isKindOfClass:SDLButtonEventMode.class]) { return (SDLButtonEventMode *)obj; } else { @@ -58,14 +58,14 @@ - (void)setCustomButtonID:(NSNumber *)customButtonID { if (customButtonID != nil) { - [parameters setObject:customButtonID forKey:NAMES_customButtonID]; + [parameters setObject:customButtonID forKey:SDLNameCustomButtonId]; } else { - [parameters removeObjectForKey:NAMES_customButtonID]; + [parameters removeObjectForKey:SDLNameCustomButtonId]; } } - (NSNumber *)customButtonID { - return [parameters objectForKey:NAMES_customButtonID]; + return [parameters objectForKey:SDLNameCustomButtonId]; } @end diff --git a/SmartDeviceLink/SDLOnButtonPress.m b/SmartDeviceLink/SDLOnButtonPress.m index 8926b7951..fe5df171a 100644 --- a/SmartDeviceLink/SDLOnButtonPress.m +++ b/SmartDeviceLink/SDLOnButtonPress.m @@ -5,13 +5,13 @@ #import "SDLButtonName.h" #import "SDLButtonPressMode.h" -#import "SDLNames.h" + @implementation SDLOnButtonPress - (instancetype)init { - if (self = [super initWithName:NAMES_OnButtonPress]) { + if (self = [super initWithName:SDLNameOnButtonPress]) { } return self; } @@ -24,14 +24,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 { @@ -41,14 +41,14 @@ - (void)setButtonPressMode:(SDLButtonPressMode *)buttonPressMode { if (buttonPressMode != nil) { - [parameters setObject:buttonPressMode forKey:NAMES_buttonPressMode]; + [parameters setObject:buttonPressMode forKey:SDLNameButtonPressMode]; } else { - [parameters removeObjectForKey:NAMES_buttonPressMode]; + [parameters removeObjectForKey:SDLNameButtonPressMode]; } } - (SDLButtonPressMode *)buttonPressMode { - NSObject *obj = [parameters objectForKey:NAMES_buttonPressMode]; + NSObject *obj = [parameters objectForKey:SDLNameButtonPressMode]; if (obj == nil || [obj isKindOfClass:SDLButtonPressMode.class]) { return (SDLButtonPressMode *)obj; } else { @@ -58,14 +58,14 @@ - (void)setCustomButtonID:(NSNumber *)customButtonID { if (customButtonID != nil) { - [parameters setObject:customButtonID forKey:NAMES_customButtonID]; + [parameters setObject:customButtonID forKey:SDLNameCustomButtonId]; } else { - [parameters removeObjectForKey:NAMES_customButtonID]; + [parameters removeObjectForKey:SDLNameCustomButtonId]; } } - (NSNumber *)customButtonID { - return [parameters objectForKey:NAMES_customButtonID]; + return [parameters objectForKey:SDLNameCustomButtonId]; } @end diff --git a/SmartDeviceLink/SDLOnCommand.m b/SmartDeviceLink/SDLOnCommand.m index f16023d42..06312e87c 100644 --- a/SmartDeviceLink/SDLOnCommand.m +++ b/SmartDeviceLink/SDLOnCommand.m @@ -3,14 +3,14 @@ #import "SDLOnCommand.h" -#import "SDLNames.h" + #import "SDLTriggerSource.h" @implementation SDLOnCommand - (instancetype)init { - if (self = [super initWithName:NAMES_OnCommand]) { + if (self = [super initWithName:SDLNameOnCommand]) { } return self; } @@ -23,26 +23,26 @@ - (void)setCmdID:(NSNumber *)cmdID { if (cmdID != nil) { - [parameters setObject:cmdID forKey:NAMES_cmdID]; + [parameters setObject:cmdID forKey:SDLNameCommandId]; } else { - [parameters removeObjectForKey:NAMES_cmdID]; + [parameters removeObjectForKey:SDLNameCommandId]; } } - (NSNumber *)cmdID { - return [parameters objectForKey:NAMES_cmdID]; + return [parameters objectForKey:SDLNameCommandId]; } - (void)setTriggerSource:(SDLTriggerSource *)triggerSource { if (triggerSource != nil) { - [parameters setObject:triggerSource forKey:NAMES_triggerSource]; + [parameters setObject:triggerSource forKey:SDLNameTriggerSource]; } else { - [parameters removeObjectForKey:NAMES_triggerSource]; + [parameters removeObjectForKey:SDLNameTriggerSource]; } } - (SDLTriggerSource *)triggerSource { - NSObject *obj = [parameters objectForKey:NAMES_triggerSource]; + NSObject *obj = [parameters objectForKey:SDLNameTriggerSource]; if (obj == nil || [obj isKindOfClass:SDLTriggerSource.class]) { return (SDLTriggerSource *)obj; } else { diff --git a/SmartDeviceLink/SDLOnDriverDistraction.m b/SmartDeviceLink/SDLOnDriverDistraction.m index 1a87075b3..4ecd386dc 100644 --- a/SmartDeviceLink/SDLOnDriverDistraction.m +++ b/SmartDeviceLink/SDLOnDriverDistraction.m @@ -4,13 +4,13 @@ #import "SDLOnDriverDistraction.h" #import "SDLDriverDistractionState.h" -#import "SDLNames.h" + @implementation SDLOnDriverDistraction - (instancetype)init { - if (self = [super initWithName:NAMES_OnDriverDistraction]) { + if (self = [super initWithName:SDLNameOnDriverDistraction]) { } return self; } @@ -23,14 +23,14 @@ - (void)setState:(SDLDriverDistractionState *)state { if (state != nil) { - [parameters setObject:state forKey:NAMES_state]; + [parameters setObject:state forKey:SDLNameState]; } else { - [parameters removeObjectForKey:NAMES_state]; + [parameters removeObjectForKey:SDLNameState]; } } - (SDLDriverDistractionState *)state { - NSObject *obj = [parameters objectForKey:NAMES_state]; + NSObject *obj = [parameters objectForKey:SDLNameState]; if (obj == nil || [obj isKindOfClass:SDLDriverDistractionState.class]) { return (SDLDriverDistractionState *)obj; } else { diff --git a/SmartDeviceLink/SDLOnEncodedSyncPData.m b/SmartDeviceLink/SDLOnEncodedSyncPData.m index f4aca251a..16286dedb 100644 --- a/SmartDeviceLink/SDLOnEncodedSyncPData.m +++ b/SmartDeviceLink/SDLOnEncodedSyncPData.m @@ -3,13 +3,13 @@ #import "SDLOnEncodedSyncPData.h" -#import "SDLNames.h" + @implementation SDLOnEncodedSyncPData - (instancetype)init { - if (self = [super initWithName:NAMES_OnEncodedSyncPData]) { + if (self = [super initWithName:SDLNameOnEncodedSyncPData]) { } return self; } @@ -22,38 +22,38 @@ - (void)setData:(NSMutableArray *)data { if (data != nil) { - [parameters setObject:data forKey:NAMES_data]; + [parameters setObject:data forKey:SDLNameData]; } else { - [parameters removeObjectForKey:NAMES_data]; + [parameters removeObjectForKey:SDLNameData]; } } - (NSMutableArray *)data { - return [parameters objectForKey:NAMES_data]; + return [parameters objectForKey:SDLNameData]; } - (void)setURL:(NSString *)URL { if (URL != nil) { - [parameters setObject:URL forKey:NAMES_URL]; + [parameters setObject:URL forKey:SDLNameUrlUppercase]; } else { - [parameters removeObjectForKey:NAMES_URL]; + [parameters removeObjectForKey:SDLNameUrlUppercase]; } } - (NSString *)URL { - return [parameters objectForKey:NAMES_URL]; + return [parameters objectForKey:SDLNameUrlUppercase]; } - (void)setTimeout:(NSNumber *)Timeout { if (Timeout != nil) { - [parameters setObject:Timeout forKey:NAMES_Timeout]; + [parameters setObject:Timeout forKey:SDLNameTimeoutCapitalized]; } else { - [parameters removeObjectForKey:NAMES_Timeout]; + [parameters removeObjectForKey:SDLNameTimeoutCapitalized]; } } - (NSNumber *)Timeout { - return [parameters objectForKey:NAMES_Timeout]; + return [parameters objectForKey:SDLNameTimeoutCapitalized]; } @end diff --git a/SmartDeviceLink/SDLOnHMIStatus.m b/SmartDeviceLink/SDLOnHMIStatus.m index e3dc0d7fc..04be9b5ba 100644 --- a/SmartDeviceLink/SDLOnHMIStatus.m +++ b/SmartDeviceLink/SDLOnHMIStatus.m @@ -5,14 +5,14 @@ #import "SDLAudioStreamingState.h" #import "SDLHMILevel.h" -#import "SDLNames.h" + #import "SDLSystemContext.h" @implementation SDLOnHMIStatus - (instancetype)init { - if (self = [super initWithName:NAMES_OnHMIStatus]) { + if (self = [super initWithName:SDLNameOnHmiStatus]) { } return self; } @@ -25,14 +25,14 @@ - (void)setHmiLevel:(SDLHMILevel *)hmiLevel { if (hmiLevel != nil) { - [parameters setObject:hmiLevel forKey:NAMES_hmiLevel]; + [parameters setObject:hmiLevel forKey:SDLNameHmiLevel]; } else { - [parameters removeObjectForKey:NAMES_hmiLevel]; + [parameters removeObjectForKey:SDLNameHmiLevel]; } } - (SDLHMILevel *)hmiLevel { - NSObject *obj = [parameters objectForKey:NAMES_hmiLevel]; + NSObject *obj = [parameters objectForKey:SDLNameHmiLevel]; if (obj == nil || [obj isKindOfClass:SDLHMILevel.class]) { return (SDLHMILevel *)obj; } else { @@ -42,14 +42,14 @@ - (void)setAudioStreamingState:(SDLAudioStreamingState *)audioStreamingState { if (audioStreamingState != nil) { - [parameters setObject:audioStreamingState forKey:NAMES_audioStreamingState]; + [parameters setObject:audioStreamingState forKey:SDLNameAudioStreamingState]; } else { - [parameters removeObjectForKey:NAMES_audioStreamingState]; + [parameters removeObjectForKey:SDLNameAudioStreamingState]; } } - (SDLAudioStreamingState *)audioStreamingState { - NSObject *obj = [parameters objectForKey:NAMES_audioStreamingState]; + NSObject *obj = [parameters objectForKey:SDLNameAudioStreamingState]; if (obj == nil || [obj isKindOfClass:SDLAudioStreamingState.class]) { return (SDLAudioStreamingState *)obj; } else { @@ -59,14 +59,14 @@ - (void)setSystemContext:(SDLSystemContext *)systemContext { if (systemContext != nil) { - [parameters setObject:systemContext forKey:NAMES_systemContext]; + [parameters setObject:systemContext forKey:SDLNameSystemContext]; } else { - [parameters removeObjectForKey:NAMES_systemContext]; + [parameters removeObjectForKey:SDLNameSystemContext]; } } - (SDLSystemContext *)systemContext { - NSObject *obj = [parameters objectForKey:NAMES_systemContext]; + NSObject *obj = [parameters objectForKey:SDLNameSystemContext]; if (obj == nil || [obj isKindOfClass:SDLSystemContext.class]) { return (SDLSystemContext *)obj; } else { diff --git a/SmartDeviceLink/SDLOnHashChange.m b/SmartDeviceLink/SDLOnHashChange.m index b1bfd8c6a..81460d000 100644 --- a/SmartDeviceLink/SDLOnHashChange.m +++ b/SmartDeviceLink/SDLOnHashChange.m @@ -4,12 +4,12 @@ #import "SDLOnHashChange.h" -#import "SDLNames.h" + @implementation SDLOnHashChange - (instancetype)init { - if (self = [super initWithName:NAMES_OnHashChange]) { + if (self = [super initWithName:SDLNameOnHashChange]) { } return self; } @@ -22,14 +22,14 @@ - (void)setHashID:(NSString *)hashID { if (hashID != nil) { - [parameters setObject:hashID forKey:NAMES_hashID]; + [parameters setObject:hashID forKey:SDLNameHashId]; } else { - [parameters removeObjectForKey:NAMES_hashID]; + [parameters removeObjectForKey:SDLNameHashId]; } } - (NSString *)hashID { - return [parameters objectForKey:NAMES_hashID]; + return [parameters objectForKey:SDLNameHashId]; } @end diff --git a/SmartDeviceLink/SDLOnKeyboardInput.m b/SmartDeviceLink/SDLOnKeyboardInput.m index a70a7d06c..3d8dd4a25 100644 --- a/SmartDeviceLink/SDLOnKeyboardInput.m +++ b/SmartDeviceLink/SDLOnKeyboardInput.m @@ -4,13 +4,13 @@ #import "SDLOnKeyboardInput.h" #import "SDLKeyboardEvent.h" -#import "SDLNames.h" + @implementation SDLOnKeyboardInput - (instancetype)init { - if (self = [super initWithName:NAMES_OnKeyboardInput]) { + if (self = [super initWithName:SDLNameOnKeyboardInput]) { } return self; } @@ -23,14 +23,14 @@ - (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 { @@ -40,14 +40,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 diff --git a/SmartDeviceLink/SDLOnLanguageChange.m b/SmartDeviceLink/SDLOnLanguageChange.m index 216d0c4a5..d7dc28c13 100644 --- a/SmartDeviceLink/SDLOnLanguageChange.m +++ b/SmartDeviceLink/SDLOnLanguageChange.m @@ -4,13 +4,13 @@ #import "SDLOnLanguageChange.h" #import "SDLLanguage.h" -#import "SDLNames.h" + @implementation SDLOnLanguageChange - (instancetype)init { - if (self = [super initWithName:NAMES_OnLanguageChange]) { + if (self = [super initWithName:SDLNameOnLanguageChange]) { } return self; } @@ -23,14 +23,14 @@ - (void)setLanguage:(SDLLanguage *)language { if (language != nil) { - [parameters setObject:language forKey:NAMES_language]; + [parameters setObject:language forKey:SDLNameLanguage]; } else { - [parameters removeObjectForKey:NAMES_language]; + [parameters removeObjectForKey:SDLNameLanguage]; } } - (SDLLanguage *)language { - NSObject *obj = [parameters objectForKey:NAMES_language]; + NSObject *obj = [parameters objectForKey:SDLNameLanguage]; if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) { return (SDLLanguage *)obj; } else { @@ -40,14 +40,14 @@ - (void)setHmiDisplayLanguage:(SDLLanguage *)hmiDisplayLanguage { if (hmiDisplayLanguage != nil) { - [parameters setObject:hmiDisplayLanguage forKey:NAMES_hmiDisplayLanguage]; + [parameters setObject:hmiDisplayLanguage forKey:SDLNameHmiDisplayLanguage]; } else { - [parameters removeObjectForKey:NAMES_hmiDisplayLanguage]; + [parameters removeObjectForKey:SDLNameHmiDisplayLanguage]; } } - (SDLLanguage *)hmiDisplayLanguage { - NSObject *obj = [parameters objectForKey:NAMES_hmiDisplayLanguage]; + NSObject *obj = [parameters objectForKey:SDLNameHmiDisplayLanguage]; if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) { return (SDLLanguage *)obj; } else { diff --git a/SmartDeviceLink/SDLOnPermissionsChange.m b/SmartDeviceLink/SDLOnPermissionsChange.m index e80df88c4..65d6eb06c 100644 --- a/SmartDeviceLink/SDLOnPermissionsChange.m +++ b/SmartDeviceLink/SDLOnPermissionsChange.m @@ -3,14 +3,14 @@ #import "SDLOnPermissionsChange.h" -#import "SDLNames.h" + #import "SDLPermissionItem.h" @implementation SDLOnPermissionsChange - (instancetype)init { - if (self = [super initWithName:NAMES_OnPermissionsChange]) { + if (self = [super initWithName:SDLNameOnPermissionsChange]) { } return self; } @@ -23,14 +23,14 @@ - (void)setPermissionItem:(NSMutableArray *)permissionItem { if (permissionItem != nil) { - [parameters setObject:permissionItem forKey:NAMES_permissionItem]; + [parameters setObject:permissionItem forKey:SDLNamePermissionItem]; } else { - [parameters removeObjectForKey:NAMES_permissionItem]; + [parameters removeObjectForKey:SDLNamePermissionItem]; } } - (NSMutableArray *)permissionItem { - NSMutableArray *array = [parameters objectForKey:NAMES_permissionItem]; + NSMutableArray *array = [parameters objectForKey:SDLNamePermissionItem]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLPermissionItem.class]) { return array; } else { diff --git a/SmartDeviceLink/SDLOnSyncPData.m b/SmartDeviceLink/SDLOnSyncPData.m index 11fe8a3ac..51647d7ae 100644 --- a/SmartDeviceLink/SDLOnSyncPData.m +++ b/SmartDeviceLink/SDLOnSyncPData.m @@ -4,12 +4,12 @@ #import "SDLOnSyncPData.h" -#import "SDLNames.h" + @implementation SDLOnSyncPData - (instancetype)init { - if (self = [super initWithName:NAMES_OnSyncPData]) { + if (self = [super initWithName:SDLNameOnSyncPData]) { } return self; } @@ -22,26 +22,26 @@ - (void)setURL:(NSString *)URL { if (URL != nil) { - [parameters setObject:URL forKey:NAMES_URL]; + [parameters setObject:URL forKey:SDLNameUrlUppercase]; } else { - [parameters removeObjectForKey:NAMES_URL]; + [parameters removeObjectForKey:SDLNameUrlUppercase]; } } - (NSString *)URL { - return [parameters objectForKey:NAMES_URL]; + return [parameters objectForKey:SDLNameUrlUppercase]; } - (void)setTimeout:(NSNumber *)Timeout { if (Timeout != nil) { - [parameters setObject:Timeout forKey:NAMES_Timeout]; + [parameters setObject:Timeout forKey:SDLNameTimeoutCapitalized]; } else { - [parameters removeObjectForKey:NAMES_Timeout]; + [parameters removeObjectForKey:SDLNameTimeoutCapitalized]; } } - (NSNumber *)Timeout { - return [parameters objectForKey:NAMES_Timeout]; + return [parameters objectForKey:SDLNameTimeoutCapitalized]; } @end diff --git a/SmartDeviceLink/SDLOnSystemRequest.m b/SmartDeviceLink/SDLOnSystemRequest.m index c5aff7569..7b2fdf0b4 100644 --- a/SmartDeviceLink/SDLOnSystemRequest.m +++ b/SmartDeviceLink/SDLOnSystemRequest.m @@ -4,14 +4,14 @@ #import "SDLOnSystemRequest.h" #import "SDLFileType.h" -#import "SDLNames.h" + #import "SDLRequestType.h" @implementation SDLOnSystemRequest - (instancetype)init { - if (self = [super initWithName:NAMES_OnSystemRequest]) { + if (self = [super initWithName:SDLNameOnSystemRequest]) { } return self; } @@ -24,14 +24,14 @@ - (void)setRequestType:(SDLRequestType *)requestType { if (requestType != nil) { - [parameters setObject:requestType forKey:NAMES_requestType]; + [parameters setObject:requestType forKey:SDLNameRequestType]; } else { - [parameters removeObjectForKey:NAMES_requestType]; + [parameters removeObjectForKey:SDLNameRequestType]; } } - (SDLRequestType *)requestType { - NSObject *obj = [parameters objectForKey:NAMES_requestType]; + NSObject *obj = [parameters objectForKey:SDLNameRequestType]; if (obj == nil || [obj isKindOfClass:SDLRequestType.class]) { return (SDLRequestType *)obj; } else { @@ -41,38 +41,38 @@ - (void)setUrl:(NSString *)url { if (url != nil) { - [parameters setObject:url forKey:NAMES_url]; + [parameters setObject:url forKey:SDLNameUrl]; } else { - [parameters removeObjectForKey:NAMES_url]; + [parameters removeObjectForKey:SDLNameUrl]; } } - (NSString *)url { - return [parameters objectForKey:NAMES_url]; + return [parameters objectForKey:SDLNameUrl]; } - (void)setTimeout:(NSNumber *)timeout { if (timeout != nil) { - [parameters setObject:timeout forKey:NAMES_timeout]; + [parameters setObject:timeout forKey:SDLNameTimeout]; } else { - [parameters removeObjectForKey:NAMES_timeout]; + [parameters removeObjectForKey:SDLNameTimeout]; } } - (NSNumber *)timeout { - return [parameters objectForKey:NAMES_timeout]; + return [parameters objectForKey:SDLNameTimeout]; } - (void)setFileType:(SDLFileType *)fileType { if (fileType != nil) { - [parameters setObject:fileType forKey:NAMES_fileType]; + [parameters setObject:fileType forKey:SDLNameFileType]; } else { - [parameters removeObjectForKey:NAMES_fileType]; + [parameters removeObjectForKey:SDLNameFileType]; } } - (SDLFileType *)fileType { - NSObject *obj = [parameters objectForKey:NAMES_fileType]; + NSObject *obj = [parameters objectForKey:SDLNameFileType]; if (obj == nil || [obj isKindOfClass:SDLFileType.class]) { return (SDLFileType *)obj; } else { @@ -82,26 +82,26 @@ - (void)setOffset:(NSNumber *)offset { if (offset != nil) { - [parameters setObject:offset forKey:NAMES_offset]; + [parameters setObject:offset forKey:SDLNameOffset]; } else { - [parameters removeObjectForKey:NAMES_offset]; + [parameters removeObjectForKey:SDLNameOffset]; } } - (NSNumber *)offset { - return [parameters objectForKey:NAMES_offset]; + return [parameters objectForKey:SDLNameOffset]; } - (void)setLength:(NSNumber *)length { if (length != nil) { - [parameters setObject:length forKey:NAMES_length]; + [parameters setObject:length forKey:SDLNameLength]; } else { - [parameters removeObjectForKey:NAMES_length]; + [parameters removeObjectForKey:SDLNameLength]; } } - (NSNumber *)length { - return [parameters objectForKey:NAMES_length]; + return [parameters objectForKey:SDLNameLength]; } @end diff --git a/SmartDeviceLink/SDLOnTBTClientState.m b/SmartDeviceLink/SDLOnTBTClientState.m index ee0dc1efc..c7a19ed17 100644 --- a/SmartDeviceLink/SDLOnTBTClientState.m +++ b/SmartDeviceLink/SDLOnTBTClientState.m @@ -3,14 +3,14 @@ #import "SDLOnTBTClientState.h" -#import "SDLNames.h" + #import "SDLTBTState.h" @implementation SDLOnTBTClientState - (instancetype)init { - if (self = [super initWithName:NAMES_OnTBTClientState]) { + if (self = [super initWithName:SDLNameOnTbtClientState]) { } return self; } @@ -23,14 +23,14 @@ - (void)setState:(SDLTBTState *)state { if (state != nil) { - [parameters setObject:state forKey:NAMES_state]; + [parameters setObject:state forKey:SDLNameState]; } else { - [parameters removeObjectForKey:NAMES_state]; + [parameters removeObjectForKey:SDLNameState]; } } - (SDLTBTState *)state { - NSObject *obj = [parameters objectForKey:NAMES_state]; + NSObject *obj = [parameters objectForKey:SDLNameState]; if (obj == nil || [obj isKindOfClass:SDLTBTState.class]) { return (SDLTBTState *)obj; } else { diff --git a/SmartDeviceLink/SDLOnTouchEvent.m b/SmartDeviceLink/SDLOnTouchEvent.m index e73c79603..ca4a6d637 100644 --- a/SmartDeviceLink/SDLOnTouchEvent.m +++ b/SmartDeviceLink/SDLOnTouchEvent.m @@ -3,7 +3,7 @@ #import "SDLOnTouchEvent.h" -#import "SDLNames.h" + #import "SDLTouchEvent.h" #import "SDLTouchType.h" @@ -11,7 +11,7 @@ @implementation SDLOnTouchEvent - (instancetype)init { - if (self = [super initWithName:NAMES_OnTouchEvent]) { + if (self = [super initWithName:SDLNameOnTouchEvent]) { } return self; } @@ -24,14 +24,14 @@ - (void)setType:(SDLTouchType *)type { if (type != nil) { - [parameters setObject:type forKey:NAMES_type]; + [parameters setObject:type forKey:SDLNameType]; } else { - [parameters removeObjectForKey:NAMES_type]; + [parameters removeObjectForKey:SDLNameType]; } } - (SDLTouchType *)type { - NSObject *obj = [parameters objectForKey:NAMES_type]; + NSObject *obj = [parameters objectForKey:SDLNameType]; if (obj == nil || [obj isKindOfClass:SDLTouchType.class]) { return (SDLTouchType *)obj; } else { @@ -41,14 +41,14 @@ - (void)setEvent:(NSMutableArray *)event { if (event != nil) { - [parameters setObject:event forKey:NAMES_event]; + [parameters setObject:event forKey:SDLNameEvent]; } else { - [parameters removeObjectForKey:NAMES_event]; + [parameters removeObjectForKey:SDLNameEvent]; } } - (NSMutableArray *)event { - NSMutableArray *array = [parameters objectForKey:NAMES_event]; + NSMutableArray *array = [parameters objectForKey:SDLNameEvent]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTouchEvent.class]) { return array; } else { diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m index 3386ca450..169241610 100644 --- a/SmartDeviceLink/SDLOnVehicleData.m +++ b/SmartDeviceLink/SDLOnVehicleData.m @@ -14,7 +14,7 @@ #import "SDLGPSData.h" #import "SDLHeadLampStatus.h" #import "SDLMyKey.h" -#import "SDLNames.h" + #import "SDLPRNDL.h" #import "SDLTireStatus.h" #import "SDLVehicleDataEventStatus.h" @@ -24,7 +24,7 @@ @implementation SDLOnVehicleData - (instancetype)init { - if (self = [super initWithName:NAMES_OnVehicleData]) { + if (self = [super initWithName:SDLNameOnVehicleData]) { } return self; } @@ -37,14 +37,14 @@ - (void)setGps:(SDLGPSData *)gps { if (gps != nil) { - [parameters setObject:gps forKey:NAMES_gps]; + [parameters setObject:gps forKey:SDLNameGps]; } else { - [parameters removeObjectForKey:NAMES_gps]; + [parameters removeObjectForKey:SDLNameGps]; } } - (SDLGPSData *)gps { - NSObject *obj = [parameters objectForKey:NAMES_gps]; + NSObject *obj = [parameters objectForKey:SDLNameGps]; if (obj == nil || [obj isKindOfClass:SDLGPSData.class]) { return (SDLGPSData *)obj; } else { @@ -54,50 +54,50 @@ - (void)setSpeed:(NSNumber *)speed { if (speed != nil) { - [parameters setObject:speed forKey:NAMES_speed]; + [parameters setObject:speed forKey:SDLNameSpeed]; } else { - [parameters removeObjectForKey:NAMES_speed]; + [parameters removeObjectForKey:SDLNameSpeed]; } } - (NSNumber *)speed { - return [parameters objectForKey:NAMES_speed]; + return [parameters objectForKey:SDLNameSpeed]; } - (void)setRpm:(NSNumber *)rpm { if (rpm != nil) { - [parameters setObject:rpm forKey:NAMES_rpm]; + [parameters setObject:rpm forKey:SDLNameRpm]; } else { - [parameters removeObjectForKey:NAMES_rpm]; + [parameters removeObjectForKey:SDLNameRpm]; } } - (NSNumber *)rpm { - return [parameters objectForKey:NAMES_rpm]; + return [parameters objectForKey:SDLNameRpm]; } - (void)setFuelLevel:(NSNumber *)fuelLevel { if (fuelLevel != nil) { - [parameters setObject:fuelLevel forKey:NAMES_fuelLevel]; + [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel]; + [parameters removeObjectForKey:SDLNameFuelLevel]; } } - (NSNumber *)fuelLevel { - return [parameters objectForKey:NAMES_fuelLevel]; + return [parameters objectForKey:SDLNameFuelLevel]; } - (void)setFuelLevel_State:(SDLComponentVolumeStatus *)fuelLevel_State { if (fuelLevel_State != nil) { - [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State]; + [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel_State]; + [parameters removeObjectForKey:SDLNameFuelLevelState]; } } - (SDLComponentVolumeStatus *)fuelLevel_State { - NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State]; + NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState]; if (obj == nil || [obj isKindOfClass:SDLComponentVolumeStatus.class]) { return (SDLComponentVolumeStatus *)obj; } else { @@ -107,50 +107,50 @@ - (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption { if (instantFuelConsumption != nil) { - [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption]; + [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { - [parameters removeObjectForKey:NAMES_instantFuelConsumption]; + [parameters removeObjectForKey:SDLNameInstantFuelConsumption]; } } - (NSNumber *)instantFuelConsumption { - return [parameters objectForKey:NAMES_instantFuelConsumption]; + return [parameters objectForKey:SDLNameInstantFuelConsumption]; } - (void)setExternalTemperature:(NSNumber *)externalTemperature { if (externalTemperature != nil) { - [parameters setObject:externalTemperature forKey:NAMES_externalTemperature]; + [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { - [parameters removeObjectForKey:NAMES_externalTemperature]; + [parameters removeObjectForKey:SDLNameExternalTemperature]; } } - (NSNumber *)externalTemperature { - return [parameters objectForKey:NAMES_externalTemperature]; + return [parameters objectForKey:SDLNameExternalTemperature]; } - (void)setVin:(NSString *)vin { if (vin != nil) { - [parameters setObject:vin forKey:NAMES_vin]; + [parameters setObject:vin forKey:SDLNameVin]; } else { - [parameters removeObjectForKey:NAMES_vin]; + [parameters removeObjectForKey:SDLNameVin]; } } - (NSString *)vin { - return [parameters objectForKey:NAMES_vin]; + return [parameters objectForKey:SDLNameVin]; } - (void)setPrndl:(SDLPRNDL *)prndl { if (prndl != nil) { - [parameters setObject:prndl forKey:NAMES_prndl]; + [parameters setObject:prndl forKey:SDLNamePrndl]; } else { - [parameters removeObjectForKey:NAMES_prndl]; + [parameters removeObjectForKey:SDLNamePrndl]; } } - (SDLPRNDL *)prndl { - NSObject *obj = [parameters objectForKey:NAMES_prndl]; + NSObject *obj = [parameters objectForKey:SDLNamePrndl]; if (obj == nil || [obj isKindOfClass:SDLPRNDL.class]) { return (SDLPRNDL *)obj; } else { @@ -160,14 +160,14 @@ - (void)setTirePressure:(SDLTireStatus *)tirePressure { if (tirePressure != nil) { - [parameters setObject:tirePressure forKey:NAMES_tirePressure]; + [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { - [parameters removeObjectForKey:NAMES_tirePressure]; + [parameters removeObjectForKey:SDLNameTirePressure]; } } - (SDLTireStatus *)tirePressure { - NSObject *obj = [parameters objectForKey:NAMES_tirePressure]; + NSObject *obj = [parameters objectForKey:SDLNameTirePressure]; if (obj == nil || [obj isKindOfClass:SDLTireStatus.class]) { return (SDLTireStatus *)obj; } else { @@ -177,26 +177,26 @@ - (void)setOdometer:(NSNumber *)odometer { if (odometer != nil) { - [parameters setObject:odometer forKey:NAMES_odometer]; + [parameters setObject:odometer forKey:SDLNameOdometer]; } else { - [parameters removeObjectForKey:NAMES_odometer]; + [parameters removeObjectForKey:SDLNameOdometer]; } } - (NSNumber *)odometer { - return [parameters objectForKey:NAMES_odometer]; + return [parameters objectForKey:SDLNameOdometer]; } - (void)setBeltStatus:(SDLBeltStatus *)beltStatus { if (beltStatus != nil) { - [parameters setObject:beltStatus forKey:NAMES_beltStatus]; + [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { - [parameters removeObjectForKey:NAMES_beltStatus]; + [parameters removeObjectForKey:SDLNameBeltStatus]; } } - (SDLBeltStatus *)beltStatus { - NSObject *obj = [parameters objectForKey:NAMES_beltStatus]; + NSObject *obj = [parameters objectForKey:SDLNameBeltStatus]; if (obj == nil || [obj isKindOfClass:SDLBeltStatus.class]) { return (SDLBeltStatus *)obj; } else { @@ -206,14 +206,14 @@ - (void)setBodyInformation:(SDLBodyInformation *)bodyInformation { if (bodyInformation != nil) { - [parameters setObject:bodyInformation forKey:NAMES_bodyInformation]; + [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { - [parameters removeObjectForKey:NAMES_bodyInformation]; + [parameters removeObjectForKey:SDLNameBodyInformation]; } } - (SDLBodyInformation *)bodyInformation { - NSObject *obj = [parameters objectForKey:NAMES_bodyInformation]; + NSObject *obj = [parameters objectForKey:SDLNameBodyInformation]; if (obj == nil || [obj isKindOfClass:SDLBodyInformation.class]) { return (SDLBodyInformation *)obj; } else { @@ -223,14 +223,14 @@ - (void)setDeviceStatus:(SDLDeviceStatus *)deviceStatus { if (deviceStatus != nil) { - [parameters setObject:deviceStatus forKey:NAMES_deviceStatus]; + [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { - [parameters removeObjectForKey:NAMES_deviceStatus]; + [parameters removeObjectForKey:SDLNameDeviceStatus]; } } - (SDLDeviceStatus *)deviceStatus { - NSObject *obj = [parameters objectForKey:NAMES_deviceStatus]; + NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus]; if (obj == nil || [obj isKindOfClass:SDLDeviceStatus.class]) { return (SDLDeviceStatus *)obj; } else { @@ -240,14 +240,14 @@ - (void)setDriverBraking:(SDLVehicleDataEventStatus *)driverBraking { if (driverBraking != nil) { - [parameters setObject:driverBraking forKey:NAMES_driverBraking]; + [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { - [parameters removeObjectForKey:NAMES_driverBraking]; + [parameters removeObjectForKey:SDLNameDriverBraking]; } } - (SDLVehicleDataEventStatus *)driverBraking { - NSObject *obj = [parameters objectForKey:NAMES_driverBraking]; + NSObject *obj = [parameters objectForKey:SDLNameDriverBraking]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) { return (SDLVehicleDataEventStatus *)obj; } else { @@ -257,14 +257,14 @@ - (void)setWiperStatus:(SDLWiperStatus *)wiperStatus { if (wiperStatus != nil) { - [parameters setObject:wiperStatus forKey:NAMES_wiperStatus]; + [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { - [parameters removeObjectForKey:NAMES_wiperStatus]; + [parameters removeObjectForKey:SDLNameWiperStatus]; } } - (SDLWiperStatus *)wiperStatus { - NSObject *obj = [parameters objectForKey:NAMES_wiperStatus]; + NSObject *obj = [parameters objectForKey:SDLNameWiperStatus]; if (obj == nil || [obj isKindOfClass:SDLWiperStatus.class]) { return (SDLWiperStatus *)obj; } else { @@ -274,14 +274,14 @@ - (void)setHeadLampStatus:(SDLHeadLampStatus *)headLampStatus { if (headLampStatus != nil) { - [parameters setObject:headLampStatus forKey:NAMES_headLampStatus]; + [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { - [parameters removeObjectForKey:NAMES_headLampStatus]; + [parameters removeObjectForKey:SDLNameHeadLampStatus]; } } - (SDLHeadLampStatus *)headLampStatus { - NSObject *obj = [parameters objectForKey:NAMES_headLampStatus]; + NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus]; if (obj == nil || [obj isKindOfClass:SDLHeadLampStatus.class]) { return (SDLHeadLampStatus *)obj; } else { @@ -291,50 +291,50 @@ - (void)setEngineTorque:(NSNumber *)engineTorque { if (engineTorque != nil) { - [parameters setObject:engineTorque forKey:NAMES_engineTorque]; + [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { - [parameters removeObjectForKey:NAMES_engineTorque]; + [parameters removeObjectForKey:SDLNameEngineTorque]; } } - (NSNumber *)engineTorque { - return [parameters objectForKey:NAMES_engineTorque]; + return [parameters objectForKey:SDLNameEngineTorque]; } - (void)setAccPedalPosition:(NSNumber *)accPedalPosition { if (accPedalPosition != nil) { - [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition]; + [parameters setObject:accPedalPosition forKey:SDLNameAccPedalPosition]; } else { - [parameters removeObjectForKey:NAMES_accPedalPosition]; + [parameters removeObjectForKey:SDLNameAccPedalPosition]; } } - (NSNumber *)accPedalPosition { - return [parameters objectForKey:NAMES_accPedalPosition]; + return [parameters objectForKey:SDLNameAccPedalPosition]; } - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle { if (steeringWheelAngle != nil) { - [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle]; + [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { - [parameters removeObjectForKey:NAMES_steeringWheelAngle]; + [parameters removeObjectForKey:SDLNameSteeringWheelAngle]; } } - (NSNumber *)steeringWheelAngle { - return [parameters objectForKey:NAMES_steeringWheelAngle]; + return [parameters objectForKey:SDLNameSteeringWheelAngle]; } - (void)setECallInfo:(SDLECallInfo *)eCallInfo { if (eCallInfo != nil) { - [parameters setObject:eCallInfo forKey:NAMES_eCallInfo]; + [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { - [parameters removeObjectForKey:NAMES_eCallInfo]; + [parameters removeObjectForKey:SDLNameECallInfo]; } } - (SDLECallInfo *)eCallInfo { - NSObject *obj = [parameters objectForKey:NAMES_eCallInfo]; + NSObject *obj = [parameters objectForKey:SDLNameECallInfo]; if (obj == nil || [obj isKindOfClass:SDLECallInfo.class]) { return (SDLECallInfo *)obj; } else { @@ -344,14 +344,14 @@ - (void)setAirbagStatus:(SDLAirbagStatus *)airbagStatus { if (airbagStatus != nil) { - [parameters setObject:airbagStatus forKey:NAMES_airbagStatus]; + [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { - [parameters removeObjectForKey:NAMES_airbagStatus]; + [parameters removeObjectForKey:SDLNameAirbagStatus]; } } - (SDLAirbagStatus *)airbagStatus { - NSObject *obj = [parameters objectForKey:NAMES_airbagStatus]; + NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus]; if (obj == nil || [obj isKindOfClass:SDLAirbagStatus.class]) { return (SDLAirbagStatus *)obj; } else { @@ -361,14 +361,14 @@ - (void)setEmergencyEvent:(SDLEmergencyEvent *)emergencyEvent { if (emergencyEvent != nil) { - [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent]; + [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { - [parameters removeObjectForKey:NAMES_emergencyEvent]; + [parameters removeObjectForKey:SDLNameEmergencyEvent]; } } - (SDLEmergencyEvent *)emergencyEvent { - NSObject *obj = [parameters objectForKey:NAMES_emergencyEvent]; + NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent]; if (obj == nil || [obj isKindOfClass:SDLEmergencyEvent.class]) { return (SDLEmergencyEvent *)obj; } else { @@ -378,14 +378,14 @@ - (void)setClusterModeStatus:(SDLClusterModeStatus *)clusterModeStatus { if (clusterModeStatus != nil) { - [parameters setObject:clusterModeStatus forKey:NAMES_clusterModeStatus]; + [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus]; } else { - [parameters removeObjectForKey:NAMES_clusterModeStatus]; + [parameters removeObjectForKey:SDLNameClusterModeStatus]; } } - (SDLClusterModeStatus *)clusterModeStatus { - NSObject *obj = [parameters objectForKey:NAMES_clusterModeStatus]; + NSObject *obj = [parameters objectForKey:SDLNameClusterModeStatus]; if (obj == nil || [obj isKindOfClass:SDLClusterModeStatus.class]) { return (SDLClusterModeStatus *)obj; } else { @@ -395,14 +395,14 @@ - (void)setMyKey:(SDLMyKey *)myKey { if (myKey != nil) { - [parameters setObject:myKey forKey:NAMES_myKey]; + [parameters setObject:myKey forKey:SDLNameMyKey]; } else { - [parameters removeObjectForKey:NAMES_myKey]; + [parameters removeObjectForKey:SDLNameMyKey]; } } - (SDLMyKey *)myKey { - NSObject *obj = [parameters objectForKey:NAMES_myKey]; + NSObject *obj = [parameters objectForKey:SDLNameMyKey]; if (obj == nil || [obj isKindOfClass:SDLMyKey.class]) { return (SDLMyKey *)obj; } else { diff --git a/SmartDeviceLink/SDLParameterPermissions.m b/SmartDeviceLink/SDLParameterPermissions.m index e18d1ec12..1f883aca4 100644 --- a/SmartDeviceLink/SDLParameterPermissions.m +++ b/SmartDeviceLink/SDLParameterPermissions.m @@ -4,7 +4,7 @@ #import "SDLParameterPermissions.h" -#import "SDLNames.h" + @implementation SDLParameterPermissions @@ -22,26 +22,26 @@ - (void)setAllowed:(NSMutableArray *)allowed { if (allowed != nil) { - [store setObject:allowed forKey:NAMES_allowed]; + [store setObject:allowed forKey:SDLNameAllowed]; } else { - [store removeObjectForKey:NAMES_allowed]; + [store removeObjectForKey:SDLNameAllowed]; } } - (NSMutableArray *)allowed { - return [store objectForKey:NAMES_allowed]; + return [store objectForKey:SDLNameAllowed]; } - (void)setUserDisallowed:(NSMutableArray *)userDisallowed { if (userDisallowed != nil) { - [store setObject:userDisallowed forKey:NAMES_userDisallowed]; + [store setObject:userDisallowed forKey:SDLNameUserDisallowed]; } else { - [store removeObjectForKey:NAMES_userDisallowed]; + [store removeObjectForKey:SDLNameUserDisallowed]; } } - (NSMutableArray *)userDisallowed { - return [store objectForKey:NAMES_userDisallowed]; + return [store objectForKey:SDLNameUserDisallowed]; } @end diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.m b/SmartDeviceLink/SDLPerformAudioPassThru.m index 67b0f05c3..827567799 100644 --- a/SmartDeviceLink/SDLPerformAudioPassThru.m +++ b/SmartDeviceLink/SDLPerformAudioPassThru.m @@ -6,7 +6,7 @@ #import "SDLAudioType.h" #import "SDLBitsPerSample.h" -#import "SDLNames.h" + #import "SDLSamplingRate.h" #import "SDLTTSChunk.h" @@ -14,7 +14,7 @@ @implementation SDLPerformAudioPassThru - (instancetype)init { - if (self = [super initWithName:NAMES_PerformAudioPassThru]) { + if (self = [super initWithName:SDLNamePerformAudioPassThru]) { } return self; } @@ -27,14 +27,14 @@ - (void)setInitialPrompt:(NSMutableArray *)initialPrompt { if (initialPrompt != nil) { - [parameters setObject:initialPrompt forKey:NAMES_initialPrompt]; + [parameters setObject:initialPrompt forKey:SDLNameInitialPrompt]; } else { - [parameters removeObjectForKey:NAMES_initialPrompt]; + [parameters removeObjectForKey:SDLNameInitialPrompt]; } } - (NSMutableArray *)initialPrompt { - NSMutableArray *array = [parameters objectForKey:NAMES_initialPrompt]; + NSMutableArray *array = [parameters objectForKey:SDLNameInitialPrompt]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { @@ -48,38 +48,38 @@ - (void)setAudioPassThruDisplayText1:(NSString *)audioPassThruDisplayText1 { if (audioPassThruDisplayText1 != nil) { - [parameters setObject:audioPassThruDisplayText1 forKey:NAMES_audioPassThruDisplayText1]; + [parameters setObject:audioPassThruDisplayText1 forKey:SDLNameAudioPassThruDisplayText1]; } else { - [parameters removeObjectForKey:NAMES_audioPassThruDisplayText1]; + [parameters removeObjectForKey:SDLNameAudioPassThruDisplayText1]; } } - (NSString *)audioPassThruDisplayText1 { - return [parameters objectForKey:NAMES_audioPassThruDisplayText1]; + return [parameters objectForKey:SDLNameAudioPassThruDisplayText1]; } - (void)setAudioPassThruDisplayText2:(NSString *)audioPassThruDisplayText2 { if (audioPassThruDisplayText2 != nil) { - [parameters setObject:audioPassThruDisplayText2 forKey:NAMES_audioPassThruDisplayText2]; + [parameters setObject:audioPassThruDisplayText2 forKey:SDLNameAudioPassThruDisplayText2]; } else { - [parameters removeObjectForKey:NAMES_audioPassThruDisplayText2]; + [parameters removeObjectForKey:SDLNameAudioPassThruDisplayText2]; } } - (NSString *)audioPassThruDisplayText2 { - return [parameters objectForKey:NAMES_audioPassThruDisplayText2]; + return [parameters objectForKey:SDLNameAudioPassThruDisplayText2]; } - (void)setSamplingRate:(SDLSamplingRate *)samplingRate { if (samplingRate != nil) { - [parameters setObject:samplingRate forKey:NAMES_samplingRate]; + [parameters setObject:samplingRate forKey:SDLNameSamplingRate]; } else { - [parameters removeObjectForKey:NAMES_samplingRate]; + [parameters removeObjectForKey:SDLNameSamplingRate]; } } - (SDLSamplingRate *)samplingRate { - NSObject *obj = [parameters objectForKey:NAMES_samplingRate]; + NSObject *obj = [parameters objectForKey:SDLNameSamplingRate]; if (obj == nil || [obj isKindOfClass:SDLSamplingRate.class]) { return (SDLSamplingRate *)obj; } else { @@ -89,26 +89,26 @@ - (void)setMaxDuration:(NSNumber *)maxDuration { if (maxDuration != nil) { - [parameters setObject:maxDuration forKey:NAMES_maxDuration]; + [parameters setObject:maxDuration forKey:SDLNameMaxDuration]; } else { - [parameters removeObjectForKey:NAMES_maxDuration]; + [parameters removeObjectForKey:SDLNameMaxDuration]; } } - (NSNumber *)maxDuration { - return [parameters objectForKey:NAMES_maxDuration]; + return [parameters objectForKey:SDLNameMaxDuration]; } - (void)setBitsPerSample:(SDLBitsPerSample *)bitsPerSample { if (bitsPerSample != nil) { - [parameters setObject:bitsPerSample forKey:NAMES_bitsPerSample]; + [parameters setObject:bitsPerSample forKey:SDLNameBitsPerSample]; } else { - [parameters removeObjectForKey:NAMES_bitsPerSample]; + [parameters removeObjectForKey:SDLNameBitsPerSample]; } } - (SDLBitsPerSample *)bitsPerSample { - NSObject *obj = [parameters objectForKey:NAMES_bitsPerSample]; + NSObject *obj = [parameters objectForKey:SDLNameBitsPerSample]; if (obj == nil || [obj isKindOfClass:SDLBitsPerSample.class]) { return (SDLBitsPerSample *)obj; } else { @@ -118,14 +118,14 @@ - (void)setAudioType:(SDLAudioType *)audioType { if (audioType != nil) { - [parameters setObject:audioType forKey:NAMES_audioType]; + [parameters setObject:audioType forKey:SDLNameAudioType]; } else { - [parameters removeObjectForKey:NAMES_audioType]; + [parameters removeObjectForKey:SDLNameAudioType]; } } - (SDLAudioType *)audioType { - NSObject *obj = [parameters objectForKey:NAMES_audioType]; + NSObject *obj = [parameters objectForKey:SDLNameAudioType]; if (obj == nil || [obj isKindOfClass:SDLAudioType.class]) { return (SDLAudioType *)obj; } else { @@ -135,14 +135,14 @@ - (void)setMuteAudio:(NSNumber *)muteAudio { if (muteAudio != nil) { - [parameters setObject:muteAudio forKey:NAMES_muteAudio]; + [parameters setObject:muteAudio forKey:SDLNameMuteAudio]; } else { - [parameters removeObjectForKey:NAMES_muteAudio]; + [parameters removeObjectForKey:SDLNameMuteAudio]; } } - (NSNumber *)muteAudio { - return [parameters objectForKey:NAMES_muteAudio]; + return [parameters objectForKey:SDLNameMuteAudio]; } @end diff --git a/SmartDeviceLink/SDLPerformAudioPassThruResponse.m b/SmartDeviceLink/SDLPerformAudioPassThruResponse.m index ed8a1e614..f3900a15f 100644 --- a/SmartDeviceLink/SDLPerformAudioPassThruResponse.m +++ b/SmartDeviceLink/SDLPerformAudioPassThruResponse.m @@ -4,12 +4,12 @@ #import "SDLPerformAudioPassThruResponse.h" -#import "SDLNames.h" + @implementation SDLPerformAudioPassThruResponse - (instancetype)init { - if (self = [super initWithName:NAMES_PerformAudioPassThru]) { + if (self = [super initWithName:SDLNamePerformAudioPassThru]) { } return self; } diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m index de6c3622f..eba2e4ef0 100644 --- a/SmartDeviceLink/SDLPerformInteraction.m +++ b/SmartDeviceLink/SDLPerformInteraction.m @@ -6,14 +6,14 @@ #import "SDLInteractionMode.h" #import "SDLLayoutMode.h" -#import "SDLNames.h" + #import "SDLTTSChunk.h" #import "SDLVRHelpItem.h" @implementation SDLPerformInteraction - (instancetype)init { - if (self = [super initWithName:NAMES_PerformInteraction]) { + if (self = [super initWithName:SDLNamePerformInteraction]) { } return self; } @@ -26,26 +26,26 @@ - (void)setInitialText:(NSString *)initialText { if (initialText != nil) { - [parameters setObject:initialText forKey:NAMES_initialText]; + [parameters setObject:initialText forKey:SDLNameInitialText]; } else { - [parameters removeObjectForKey:NAMES_initialText]; + [parameters removeObjectForKey:SDLNameInitialText]; } } - (NSString *)initialText { - return [parameters objectForKey:NAMES_initialText]; + return [parameters objectForKey:SDLNameInitialText]; } - (void)setInitialPrompt:(NSMutableArray *)initialPrompt { if (initialPrompt != nil) { - [parameters setObject:initialPrompt forKey:NAMES_initialPrompt]; + [parameters setObject:initialPrompt forKey:SDLNameInitialPrompt]; } else { - [parameters removeObjectForKey:NAMES_initialPrompt]; + [parameters removeObjectForKey:SDLNameInitialPrompt]; } } - (NSMutableArray *)initialPrompt { - NSMutableArray *array = [parameters objectForKey:NAMES_initialPrompt]; + NSMutableArray *array = [parameters objectForKey:SDLNameInitialPrompt]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { @@ -59,14 +59,14 @@ - (void)setInteractionMode:(SDLInteractionMode *)interactionMode { if (interactionMode != nil) { - [parameters setObject:interactionMode forKey:NAMES_interactionMode]; + [parameters setObject:interactionMode forKey:SDLNameInteractionMode]; } else { - [parameters removeObjectForKey:NAMES_interactionMode]; + [parameters removeObjectForKey:SDLNameInteractionMode]; } } - (SDLInteractionMode *)interactionMode { - NSObject *obj = [parameters objectForKey:NAMES_interactionMode]; + NSObject *obj = [parameters objectForKey:SDLNameInteractionMode]; if (obj == nil || [obj isKindOfClass:SDLInteractionMode.class]) { return (SDLInteractionMode *)obj; } else { @@ -76,26 +76,26 @@ - (void)setInteractionChoiceSetIDList:(NSMutableArray *)interactionChoiceSetIDList { if (interactionChoiceSetIDList != nil) { - [parameters setObject:interactionChoiceSetIDList forKey:NAMES_interactionChoiceSetIDList]; + [parameters setObject:interactionChoiceSetIDList forKey:SDLNameInteractionChoiceSetIdList]; } else { - [parameters removeObjectForKey:NAMES_interactionChoiceSetIDList]; + [parameters removeObjectForKey:SDLNameInteractionChoiceSetIdList]; } } - (NSMutableArray *)interactionChoiceSetIDList { - return [parameters objectForKey:NAMES_interactionChoiceSetIDList]; + return [parameters objectForKey:SDLNameInteractionChoiceSetIdList]; } - (void)setHelpPrompt:(NSMutableArray *)helpPrompt { if (helpPrompt != nil) { - [parameters setObject:helpPrompt forKey:NAMES_helpPrompt]; + [parameters setObject:helpPrompt forKey:SDLNameHelpPrompt]; } else { - [parameters removeObjectForKey:NAMES_helpPrompt]; + [parameters removeObjectForKey:SDLNameHelpPrompt]; } } - (NSMutableArray *)helpPrompt { - NSMutableArray *array = [parameters objectForKey:NAMES_helpPrompt]; + NSMutableArray *array = [parameters objectForKey:SDLNameHelpPrompt]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { @@ -109,14 +109,14 @@ - (void)setTimeoutPrompt:(NSMutableArray *)timeoutPrompt { if (timeoutPrompt != nil) { - [parameters setObject:timeoutPrompt forKey:NAMES_timeoutPrompt]; + [parameters setObject:timeoutPrompt forKey:SDLNameTimeoutPrompt]; } else { - [parameters removeObjectForKey:NAMES_timeoutPrompt]; + [parameters removeObjectForKey:SDLNameTimeoutPrompt]; } } - (NSMutableArray *)timeoutPrompt { - NSMutableArray *array = [parameters objectForKey:NAMES_timeoutPrompt]; + NSMutableArray *array = [parameters objectForKey:SDLNameTimeoutPrompt]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { @@ -130,26 +130,26 @@ - (void)setTimeout:(NSNumber *)timeout { if (timeout != nil) { - [parameters setObject:timeout forKey:NAMES_timeout]; + [parameters setObject:timeout forKey:SDLNameTimeout]; } else { - [parameters removeObjectForKey:NAMES_timeout]; + [parameters removeObjectForKey:SDLNameTimeout]; } } - (NSNumber *)timeout { - return [parameters objectForKey:NAMES_timeout]; + return [parameters objectForKey:SDLNameTimeout]; } - (void)setVrHelp:(NSMutableArray *)vrHelp { if (vrHelp != nil) { - [parameters setObject:vrHelp forKey:NAMES_vrHelp]; + [parameters setObject:vrHelp forKey:SDLNameVrHelp]; } else { - [parameters removeObjectForKey:NAMES_vrHelp]; + [parameters removeObjectForKey:SDLNameVrHelp]; } } - (NSMutableArray *)vrHelp { - NSMutableArray *array = [parameters objectForKey:NAMES_vrHelp]; + NSMutableArray *array = [parameters objectForKey:SDLNameVrHelp]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRHelpItem.class]) { return array; } else { @@ -163,14 +163,14 @@ - (void)setInteractionLayout:(SDLLayoutMode *)interactionLayout { if (interactionLayout != nil) { - [parameters setObject:interactionLayout forKey:NAMES_interactionLayout]; + [parameters setObject:interactionLayout forKey:SDLNameInteractionLayout]; } else { - [parameters removeObjectForKey:NAMES_interactionLayout]; + [parameters removeObjectForKey:SDLNameInteractionLayout]; } } - (SDLLayoutMode *)interactionLayout { - NSObject *obj = [parameters objectForKey:NAMES_interactionLayout]; + NSObject *obj = [parameters objectForKey:SDLNameInteractionLayout]; if (obj == nil || [obj isKindOfClass:SDLLayoutMode.class]) { return (SDLLayoutMode *)obj; } else { diff --git a/SmartDeviceLink/SDLPerformInteractionResponse.m b/SmartDeviceLink/SDLPerformInteractionResponse.m index ae1c5e14c..7fd053a2f 100644 --- a/SmartDeviceLink/SDLPerformInteractionResponse.m +++ b/SmartDeviceLink/SDLPerformInteractionResponse.m @@ -4,14 +4,14 @@ #import "SDLPerformInteractionResponse.h" -#import "SDLNames.h" + #import "SDLTriggerSource.h" @implementation SDLPerformInteractionResponse - (instancetype)init { - if (self = [super initWithName:NAMES_PerformInteraction]) { + if (self = [super initWithName:SDLNamePerformInteraction]) { } return self; } @@ -24,38 +24,38 @@ - (void)setChoiceID:(NSNumber *)choiceID { if (choiceID != nil) { - [parameters setObject:choiceID forKey:NAMES_choiceID]; + [parameters setObject:choiceID forKey:SDLNameChoiceId]; } else { - [parameters removeObjectForKey:NAMES_choiceID]; + [parameters removeObjectForKey:SDLNameChoiceId]; } } - (NSNumber *)choiceID { - return [parameters objectForKey:NAMES_choiceID]; + return [parameters objectForKey:SDLNameChoiceId]; } - (void)setManualTextEntry:(NSString *)manualTextEntry { if (manualTextEntry != nil) { - [parameters setObject:manualTextEntry forKey:NAMES_manualTextEntry]; + [parameters setObject:manualTextEntry forKey:SDLNameManualTextEntry]; } else { - [parameters removeObjectForKey:NAMES_manualTextEntry]; + [parameters removeObjectForKey:SDLNameManualTextEntry]; } } - (NSString *)manualTextEntry { - return [parameters objectForKey:NAMES_manualTextEntry]; + return [parameters objectForKey:SDLNameManualTextEntry]; } - (void)setTriggerSource:(SDLTriggerSource *)triggerSource { if (triggerSource != nil) { - [parameters setObject:triggerSource forKey:NAMES_triggerSource]; + [parameters setObject:triggerSource forKey:SDLNameTriggerSource]; } else { - [parameters removeObjectForKey:NAMES_triggerSource]; + [parameters removeObjectForKey:SDLNameTriggerSource]; } } - (SDLTriggerSource *)triggerSource { - NSObject *obj = [parameters objectForKey:NAMES_triggerSource]; + NSObject *obj = [parameters objectForKey:SDLNameTriggerSource]; if (obj == nil || [obj isKindOfClass:SDLTriggerSource.class]) { return (SDLTriggerSource *)obj; } else { diff --git a/SmartDeviceLink/SDLPermissionItem.m b/SmartDeviceLink/SDLPermissionItem.m index 560094c2e..5f0ad6dcf 100644 --- a/SmartDeviceLink/SDLPermissionItem.m +++ b/SmartDeviceLink/SDLPermissionItem.m @@ -4,7 +4,7 @@ #import "SDLPermissionItem.h" #import "SDLHMIPermissions.h" -#import "SDLNames.h" + #import "SDLParameterPermissions.h" @@ -24,26 +24,26 @@ - (void)setRpcName:(NSString *)rpcName { if (rpcName != nil) { - [store setObject:rpcName forKey:NAMES_rpcName]; + [store setObject:rpcName forKey:SDLNameRpcName]; } else { - [store removeObjectForKey:NAMES_rpcName]; + [store removeObjectForKey:SDLNameRpcName]; } } - (NSString *)rpcName { - return [store objectForKey:NAMES_rpcName]; + return [store objectForKey:SDLNameRpcName]; } - (void)setHmiPermissions:(SDLHMIPermissions *)hmiPermissions { if (hmiPermissions != nil) { - [store setObject:hmiPermissions forKey:NAMES_hmiPermissions]; + [store setObject:hmiPermissions forKey:SDLNameHmiPermissions]; } else { - [store removeObjectForKey:NAMES_hmiPermissions]; + [store removeObjectForKey:SDLNameHmiPermissions]; } } - (SDLHMIPermissions *)hmiPermissions { - NSObject *obj = [store objectForKey:NAMES_hmiPermissions]; + NSObject *obj = [store objectForKey:SDLNameHmiPermissions]; if (obj == nil || [obj isKindOfClass:SDLHMIPermissions.class]) { return (SDLHMIPermissions *)obj; } else { @@ -53,14 +53,14 @@ - (void)setParameterPermissions:(SDLParameterPermissions *)parameterPermissions { if (parameterPermissions != nil) { - [store setObject:parameterPermissions forKey:NAMES_parameterPermissions]; + [store setObject:parameterPermissions forKey:SDLNameParameterPermissions]; } else { - [store removeObjectForKey:NAMES_parameterPermissions]; + [store removeObjectForKey:SDLNameParameterPermissions]; } } - (SDLParameterPermissions *)parameterPermissions { - NSObject *obj = [store objectForKey:NAMES_parameterPermissions]; + NSObject *obj = [store objectForKey:SDLNameParameterPermissions]; if (obj == nil || [obj isKindOfClass:SDLParameterPermissions.class]) { return (SDLParameterPermissions *)obj; } else { diff --git a/SmartDeviceLink/SDLPresetBankCapabilities.m b/SmartDeviceLink/SDLPresetBankCapabilities.m index 7654aa61d..7cdb57a45 100644 --- a/SmartDeviceLink/SDLPresetBankCapabilities.m +++ b/SmartDeviceLink/SDLPresetBankCapabilities.m @@ -4,7 +4,7 @@ #import "SDLPresetBankCapabilities.h" -#import "SDLNames.h" + @implementation SDLPresetBankCapabilities @@ -22,14 +22,14 @@ - (void)setOnScreenPresetsAvailable:(NSNumber *)onScreenPresetsAvailable { if (onScreenPresetsAvailable != nil) { - [store setObject:onScreenPresetsAvailable forKey:NAMES_onScreenPresetsAvailable]; + [store setObject:onScreenPresetsAvailable forKey:SDLNameOnScreenPresetsAvailable]; } else { - [store removeObjectForKey:NAMES_onScreenPresetsAvailable]; + [store removeObjectForKey:SDLNameOnScreenPresetsAvailable]; } } - (NSNumber *)onScreenPresetsAvailable { - return [store objectForKey:NAMES_onScreenPresetsAvailable]; + return [store objectForKey:SDLNameOnScreenPresetsAvailable]; } @end diff --git a/SmartDeviceLink/SDLProtocolMessage.h b/SmartDeviceLink/SDLProtocolMessage.h index 62abd6226..782618f3e 100644 --- a/SmartDeviceLink/SDLProtocolMessage.h +++ b/SmartDeviceLink/SDLProtocolMessage.h @@ -2,8 +2,8 @@ // #import <Foundation/Foundation.h> -@class SDLProtocolHeader; +@class SDLProtocolHeader; @interface SDLProtocolMessage : NSObject diff --git a/SmartDeviceLink/SDLProtocolMessage.m b/SmartDeviceLink/SDLProtocolMessage.m index bfc33c4d7..151f820e0 100644 --- a/SmartDeviceLink/SDLProtocolMessage.m +++ b/SmartDeviceLink/SDLProtocolMessage.m @@ -4,6 +4,7 @@ #import "SDLProtocolMessage.h" #import "SDLFunctionID.h" +#import "SDLNames.h" #import "SDLProtocolHeader.h" #import "SDLRPCPayload.h" #import "SDLV1ProtocolMessage.h" @@ -60,7 +61,7 @@ if (self.header.version >= 2) { SDLRPCPayload *rpcPayload = [SDLRPCPayload rpcPayloadWithData:self.payload]; if (rpcPayload) { - NSString *functionName = [[[SDLFunctionID alloc] init] getFunctionName:rpcPayload.functionID]; + SDLName functionName = [[[SDLFunctionID alloc] init] getFunctionName:rpcPayload.functionID]; UInt8 rpcType = rpcPayload.rpcType; NSArray *rpcTypeNames = @[@"Request", @"Response", @"Notification"]; diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m index f49569ea9..bae7bfaa7 100644 --- a/SmartDeviceLink/SDLProxy.m +++ b/SmartDeviceLink/SDLProxy.m @@ -19,7 +19,7 @@ #import "SDLLanguage.h" #import "SDLLayoutMode.h" #import "SDLLockScreenStatusManager.h" -#import "SDLNames.h" + #import "SDLOnHMIStatus.h" #import "SDLOnSystemRequest.h" #import "SDLPolicyDataParser.h" @@ -308,7 +308,7 @@ const int POLICIES_CORRELATION_ID = 65535; NSString *messageType = [message messageType]; // If it's a response, append response - if ([messageType isEqualToString:NAMES_response]) { + if ([messageType isEqualToString:SDLNameResponse]) { BOOL notGenericResponseMessage = ![functionName isEqualToString:@"GenericResponse"]; if (notGenericResponseMessage) { functionName = [NSString stringWithFormat:@"%@Response", functionName]; @@ -324,7 +324,7 @@ const int POLICIES_CORRELATION_ID = 65535; [SDLDebugTool logInfo:logMessage withType:SDLDebugType_RPC toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName]; // Intercept and handle several messages ourselves - if ([functionName isEqualToString:NAMES_OnAppInterfaceUnregistered] || [functionName isEqualToString:NAMES_UnregisterAppInterface]) { + if ([functionName isEqualToString:SDLNameOnAppInterfaceUnregistered] || [functionName isEqualToString:SDLNameUnregisterAppInterface]) { [self handleRPCUnregistered:dict]; } @@ -436,7 +436,7 @@ const int POLICIES_CORRELATION_ID = 65535; #pragma mark Handle Post-Invoke of Delegate Methods - (void)handleAfterHMIStatus:(SDLRPCMessage *)message { - NSString *statusString = (NSString *)[message getParameters:NAMES_hmiLevel]; + NSString *statusString = (NSString *)[message getParameters:SDLNameHmiLevel]; SDLHMILevel *hmiLevel = [SDLHMILevel valueOf:statusString]; _lsm.hmiLevel = hmiLevel; @@ -445,7 +445,7 @@ const int POLICIES_CORRELATION_ID = 65535; } - (void)handleAfterDriverDistraction:(SDLRPCMessage *)message { - NSString *stateString = (NSString *)[message getParameters:NAMES_state]; + NSString *stateString = (NSString *)[message getParameters:SDLNameState]; BOOL state = [stateString isEqualToString:@"DD_ON"] ? YES : NO; _lsm.driverDistracted = state; diff --git a/SmartDeviceLink/SDLPutFile.m b/SmartDeviceLink/SDLPutFile.m index 69d83edcd..770b52789 100644 --- a/SmartDeviceLink/SDLPutFile.m +++ b/SmartDeviceLink/SDLPutFile.m @@ -4,13 +4,13 @@ #import "SDLPutFile.h" #import "SDLFileType.h" -#import "SDLNames.h" + @implementation SDLPutFile - (instancetype)init { - if (self = [super initWithName:NAMES_PutFile]) { + if (self = [super initWithName:SDLNamePutFile]) { } return self; } @@ -23,26 +23,26 @@ - (void)setSyncFileName:(NSString *)syncFileName { if (syncFileName != nil) { - [parameters setObject:syncFileName forKey:NAMES_syncFileName]; + [parameters setObject:syncFileName forKey:SDLNameSyncFileName]; } else { - [parameters removeObjectForKey:NAMES_syncFileName]; + [parameters removeObjectForKey:SDLNameSyncFileName]; } } - (NSString *)syncFileName { - return [parameters objectForKey:NAMES_syncFileName]; + return [parameters objectForKey:SDLNameSyncFileName]; } - (void)setFileType:(SDLFileType *)fileType { if (fileType != nil) { - [parameters setObject:fileType forKey:NAMES_fileType]; + [parameters setObject:fileType forKey:SDLNameFileType]; } else { - [parameters removeObjectForKey:NAMES_fileType]; + [parameters removeObjectForKey:SDLNameFileType]; } } - (SDLFileType *)fileType { - NSObject *obj = [parameters objectForKey:NAMES_fileType]; + NSObject *obj = [parameters objectForKey:SDLNameFileType]; if (obj == nil || [obj isKindOfClass:SDLFileType.class]) { return (SDLFileType *)obj; } else { @@ -52,50 +52,50 @@ - (void)setPersistentFile:(NSNumber *)persistentFile { if (persistentFile != nil) { - [parameters setObject:persistentFile forKey:NAMES_persistentFile]; + [parameters setObject:persistentFile forKey:SDLNamePersistentFile]; } else { - [parameters removeObjectForKey:NAMES_persistentFile]; + [parameters removeObjectForKey:SDLNamePersistentFile]; } } - (NSNumber *)persistentFile { - return [parameters objectForKey:NAMES_persistentFile]; + return [parameters objectForKey:SDLNamePersistentFile]; } - (void)setSystemFile:(NSNumber *)systemFile { if (systemFile != nil) { - [parameters setObject:systemFile forKey:NAMES_systemFile]; + [parameters setObject:systemFile forKey:SDLNameSystemFile]; } else { - [parameters removeObjectForKey:NAMES_systemFile]; + [parameters removeObjectForKey:SDLNameSystemFile]; } } - (NSNumber *)systemFile { - return [parameters objectForKey:NAMES_systemFile]; + return [parameters objectForKey:SDLNameSystemFile]; } - (void)setOffset:(NSNumber *)offset { if (offset != nil) { - [parameters setObject:offset forKey:NAMES_offset]; + [parameters setObject:offset forKey:SDLNameOffset]; } else { - [parameters removeObjectForKey:NAMES_offset]; + [parameters removeObjectForKey:SDLNameOffset]; } } - (NSNumber *)offset { - return [parameters objectForKey:NAMES_offset]; + return [parameters objectForKey:SDLNameOffset]; } - (void)setLength:(NSNumber *)length { if (length != nil) { - [parameters setObject:length forKey:NAMES_length]; + [parameters setObject:length forKey:SDLNameLength]; } else { - [parameters removeObjectForKey:NAMES_length]; + [parameters removeObjectForKey:SDLNameLength]; } } - (NSNumber *)length { - return [parameters objectForKey:NAMES_length]; + return [parameters objectForKey:SDLNameLength]; } @end diff --git a/SmartDeviceLink/SDLPutFileResponse.m b/SmartDeviceLink/SDLPutFileResponse.m index 4a956cfbd..18f8b2fda 100644 --- a/SmartDeviceLink/SDLPutFileResponse.m +++ b/SmartDeviceLink/SDLPutFileResponse.m @@ -4,12 +4,12 @@ #import "SDLPutFileResponse.h" -#import "SDLNames.h" + @implementation SDLPutFileResponse - (instancetype)init { - if (self = [super initWithName:NAMES_PutFile]) { + if (self = [super initWithName:SDLNamePutFile]) { } return self; } @@ -22,14 +22,14 @@ - (void)setSpaceAvailable:(NSNumber *)spaceAvailable { if (spaceAvailable != nil) { - [parameters setObject:spaceAvailable forKey:NAMES_spaceAvailable]; + [parameters setObject:spaceAvailable forKey:SDLNameSpaceAvailable]; } else { - [parameters removeObjectForKey:NAMES_spaceAvailable]; + [parameters removeObjectForKey:SDLNameSpaceAvailable]; } } - (NSNumber *)spaceAvailable { - return [parameters objectForKey:NAMES_spaceAvailable]; + return [parameters objectForKey:SDLNameSpaceAvailable]; } @end diff --git a/SmartDeviceLink/SDLRPCMessage.h b/SmartDeviceLink/SDLRPCMessage.h index fc5f577ef..f13fbc8b3 100644 --- a/SmartDeviceLink/SDLRPCMessage.h +++ b/SmartDeviceLink/SDLRPCMessage.h @@ -4,6 +4,7 @@ #import "SDLEnum.h" #import "SDLRPCStruct.h" +#import "SDLNames.h" @interface SDLRPCMessage : SDLRPCStruct { NSMutableDictionary *function; diff --git a/SmartDeviceLink/SDLRPCMessage.m b/SmartDeviceLink/SDLRPCMessage.m index be5f95334..35e211338 100644 --- a/SmartDeviceLink/SDLRPCMessage.m +++ b/SmartDeviceLink/SDLRPCMessage.m @@ -4,7 +4,7 @@ #import "SDLRPCMessage.h" -#import "SDLNames.h" + @implementation SDLRPCMessage @@ -15,10 +15,10 @@ if (self = [super init]) { function = [[NSMutableDictionary alloc] initWithCapacity:3]; parameters = [[NSMutableDictionary alloc] init]; - messageType = NAMES_request; + messageType = SDLNameRequest; [store setObject:function forKey:messageType]; - [function setObject:parameters forKey:NAMES_parameters]; - [function setObject:name forKey:NAMES_operation_name]; + [function setObject:parameters forKey:SDLNameParameters]; + [function setObject:name forKey:SDLNameOperationName]; } return self; } @@ -27,27 +27,27 @@ if (self = [super initWithDictionary:dict]) { NSEnumerator *enumerator = [store keyEnumerator]; while (messageType = [enumerator nextObject]) { - if ([messageType isEqualToString:@"bulkData"] == FALSE) { + if ([messageType isEqualToString:SDLNameBulkData] == FALSE) { break; } } function = [store objectForKey:messageType]; - parameters = [function objectForKey:NAMES_parameters]; - self.bulkData = [dict objectForKey:@"bulkData"]; + parameters = [function objectForKey:SDLNameParameters]; + self.bulkData = [dict objectForKey:SDLNameBulkData]; } return self; } - (NSString *)getFunctionName { - return [function objectForKey:NAMES_operation_name]; + return [function objectForKey:SDLNameOperationName]; } - (void)setFunctionName:(NSString *)functionName { if (functionName != nil) { - [function setObject:functionName forKey:NAMES_operation_name]; + [function setObject:functionName forKey:SDLNameOperationName]; } else { - [function removeObjectForKey:NAMES_operation_name]; + [function removeObjectForKey:SDLNameOperationName]; } } @@ -69,7 +69,7 @@ } - (NSString *)name { - return [function objectForKey:NAMES_operation_name]; + return [function objectForKey:SDLNameOperationName]; } - (NSString *)description { diff --git a/SmartDeviceLink/SDLRPCNotification.m b/SmartDeviceLink/SDLRPCNotification.m index 5c2a063dd..e72b3a574 100644 --- a/SmartDeviceLink/SDLRPCNotification.m +++ b/SmartDeviceLink/SDLRPCNotification.m @@ -4,7 +4,7 @@ #import "SDLRPCNotification.h" -#import "SDLNames.h" + @implementation SDLRPCNotification @@ -14,7 +14,7 @@ return nil; } - messageType = NAMES_notification; + messageType = SDLNameNotification; [store setObject:function forKey:messageType]; return self; @@ -26,7 +26,7 @@ return nil; } - messageType = NAMES_notification; + messageType = SDLNameNotification; [store setObject:function forKey:messageType]; return self; diff --git a/SmartDeviceLink/SDLRPCRequest.m b/SmartDeviceLink/SDLRPCRequest.m index 48c568c9d..3cb7af4f6 100644 --- a/SmartDeviceLink/SDLRPCRequest.m +++ b/SmartDeviceLink/SDLRPCRequest.m @@ -4,19 +4,19 @@ #import "SDLRPCRequest.h" -#import "SDLNames.h" + @implementation SDLRPCRequest - (NSNumber *)correlationID { - return [function objectForKey:NAMES_correlationID]; + return [function objectForKey:SDLNameCorrelationId]; } - (void)setCorrelationID:(NSNumber *)corrID { if (corrID != nil) { - [function setObject:corrID forKey:NAMES_correlationID]; + [function setObject:corrID forKey:SDLNameCorrelationId]; } else { - [function removeObjectForKey:NAMES_correlationID]; + [function removeObjectForKey:SDLNameCorrelationId]; } } diff --git a/SmartDeviceLink/SDLRPCResponse.m b/SmartDeviceLink/SDLRPCResponse.m index 606781070..bebb2253a 100644 --- a/SmartDeviceLink/SDLRPCResponse.m +++ b/SmartDeviceLink/SDLRPCResponse.m @@ -4,7 +4,7 @@ #import "SDLRPCResponse.h" -#import "SDLNames.h" + #import "SDLResult.h" @implementation SDLRPCResponse @@ -15,7 +15,7 @@ return nil; } - messageType = NAMES_response; + messageType = SDLNameResponse; [store setObject:function forKey:messageType]; return self; @@ -27,46 +27,46 @@ return nil; } - messageType = NAMES_response; + messageType = SDLNameResponse; [store setObject:function forKey:messageType]; return self; } - (NSNumber *)correlationID { - return [function objectForKey:NAMES_correlationID]; + return [function objectForKey:SDLNameCorrelationId]; } - (void)setCorrelationID:(NSNumber *)corrID { if (corrID != nil) { - [function setObject:corrID forKey:NAMES_correlationID]; + [function setObject:corrID forKey:SDLNameCorrelationId]; } else { - [function removeObjectForKey:NAMES_correlationID]; + [function removeObjectForKey:SDLNameCorrelationId]; } } - (void)setSuccess:(NSNumber *)success { if (success != nil) { - [parameters setObject:success forKey:NAMES_success]; + [parameters setObject:success forKey:SDLNameSuccess]; } else { - [parameters removeObjectForKey:NAMES_success]; + [parameters removeObjectForKey:SDLNameSuccess]; } } - (NSNumber *)success { - return [parameters objectForKey:NAMES_success]; + return [parameters objectForKey:SDLNameSuccess]; } - (void)setResultCode:(SDLResult *)resultCode { if (resultCode != nil) { - [parameters setObject:resultCode forKey:NAMES_resultCode]; + [parameters setObject:resultCode forKey:SDLNameResultCode]; } else { - [parameters removeObjectForKey:NAMES_resultCode]; + [parameters removeObjectForKey:SDLNameResultCode]; } } - (SDLResult *)resultCode { - NSObject *obj = [parameters objectForKey:NAMES_resultCode]; + NSObject *obj = [parameters objectForKey:SDLNameResultCode]; if (obj == nil || [obj isKindOfClass:SDLResult.class]) { return (SDLResult *)obj; } else { @@ -76,14 +76,14 @@ - (void)setInfo:(NSString *)info { if (info != nil) { - [parameters setObject:info forKey:NAMES_info]; + [parameters setObject:info forKey:SDLNameInfo]; } else { - [parameters removeObjectForKey:NAMES_info]; + [parameters removeObjectForKey:SDLNameInfo]; } } - (NSString *)info { - return [parameters objectForKey:NAMES_info]; + return [parameters objectForKey:SDLNameInfo]; } @end diff --git a/SmartDeviceLink/SDLRPCStruct.h b/SmartDeviceLink/SDLRPCStruct.h index e6b3bcccb..3348e496c 100644 --- a/SmartDeviceLink/SDLRPCStruct.h +++ b/SmartDeviceLink/SDLRPCStruct.h @@ -4,6 +4,8 @@ #import <Foundation/Foundation.h> +#import "SDLNames.h" + @interface SDLRPCStruct : NSObject { NSMutableDictionary *store; } diff --git a/SmartDeviceLink/SDLRPCStruct.m b/SmartDeviceLink/SDLRPCStruct.m index dd96fff5d..c0c91b5dd 100644 --- a/SmartDeviceLink/SDLRPCStruct.m +++ b/SmartDeviceLink/SDLRPCStruct.m @@ -5,8 +5,6 @@ #import "SDLRPCStruct.h" #import "SDLEnum.h" -#import "SDLNames.h" - @implementation SDLRPCStruct @@ -68,7 +66,7 @@ NSString *messageType = [[store keyEnumerator] nextObject]; NSMutableDictionary *function = [store objectForKey:messageType]; if ([function isKindOfClass:NSMutableDictionary.class]) { - NSMutableDictionary *parameters = [function objectForKey:NAMES_parameters]; + NSMutableDictionary *parameters = [function objectForKey:SDLNameParameters]; return [self serializeDictionary:parameters version:version]; } else { return [self serializeDictionary:store version:version]; diff --git a/SmartDeviceLink/SDLReadDID.m b/SmartDeviceLink/SDLReadDID.m index 198d992e0..cbb826d19 100644 --- a/SmartDeviceLink/SDLReadDID.m +++ b/SmartDeviceLink/SDLReadDID.m @@ -4,12 +4,12 @@ #import "SDLReadDID.h" -#import "SDLNames.h" + @implementation SDLReadDID - (instancetype)init { - if (self = [super initWithName:NAMES_ReadDID]) { + if (self = [super initWithName:SDLNameReadDid]) { } return self; } @@ -22,26 +22,26 @@ - (void)setEcuName:(NSNumber *)ecuName { if (ecuName != nil) { - [parameters setObject:ecuName forKey:NAMES_ecuName]; + [parameters setObject:ecuName forKey:SDLNameEcuName]; } else { - [parameters removeObjectForKey:NAMES_ecuName]; + [parameters removeObjectForKey:SDLNameEcuName]; } } - (NSNumber *)ecuName { - return [parameters objectForKey:NAMES_ecuName]; + return [parameters objectForKey:SDLNameEcuName]; } - (void)setDidLocation:(NSMutableArray *)didLocation { if (didLocation != nil) { - [parameters setObject:didLocation forKey:NAMES_didLocation]; + [parameters setObject:didLocation forKey:SDLNameDidLocation]; } else { - [parameters removeObjectForKey:NAMES_didLocation]; + [parameters removeObjectForKey:SDLNameDidLocation]; } } - (NSMutableArray *)didLocation { - return [parameters objectForKey:NAMES_didLocation]; + return [parameters objectForKey:SDLNameDidLocation]; } @end diff --git a/SmartDeviceLink/SDLReadDIDResponse.m b/SmartDeviceLink/SDLReadDIDResponse.m index 08c5477f6..e928ff812 100644 --- a/SmartDeviceLink/SDLReadDIDResponse.m +++ b/SmartDeviceLink/SDLReadDIDResponse.m @@ -5,12 +5,12 @@ #import "SDLReadDIDResponse.h" #import "SDLDIDResult.h" -#import "SDLNames.h" + @implementation SDLReadDIDResponse - (instancetype)init { - if (self = [super initWithName:NAMES_ReadDID]) { + if (self = [super initWithName:SDLNameReadDid]) { } return self; } @@ -23,14 +23,14 @@ - (void)setDidResult:(NSMutableArray *)didResult { if (didResult != nil) { - [parameters setObject:didResult forKey:NAMES_didResult]; + [parameters setObject:didResult forKey:SDLNameDidResult]; } else { - [parameters removeObjectForKey:NAMES_didResult]; + [parameters removeObjectForKey:SDLNameDidResult]; } } - (NSMutableArray *)didResult { - NSMutableArray *array = [parameters objectForKey:NAMES_didResult]; + NSMutableArray *array = [parameters objectForKey:SDLNameDidResult]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLDIDResult.class]) { return array; } else { diff --git a/SmartDeviceLink/SDLRegisterAppInterface.m b/SmartDeviceLink/SDLRegisterAppInterface.m index 36fac6627..d05613aee 100644 --- a/SmartDeviceLink/SDLRegisterAppInterface.m +++ b/SmartDeviceLink/SDLRegisterAppInterface.m @@ -8,7 +8,7 @@ #import "SDLAppInfo.h" #import "SDLDeviceInfo.h" #import "SDLLanguage.h" -#import "SDLNames.h" + #import "SDLSyncMsgVersion.h" #import "SDLTTSChunk.h" @@ -16,7 +16,7 @@ @implementation SDLRegisterAppInterface - (instancetype)init { - if (self = [super initWithName:NAMES_RegisterAppInterface]) { + if (self = [super initWithName:SDLNameRegisterAppInterface]) { } return self; } @@ -29,14 +29,14 @@ - (void)setSyncMsgVersion:(SDLSyncMsgVersion *)syncMsgVersion { if (syncMsgVersion != nil) { - [parameters setObject:syncMsgVersion forKey:NAMES_syncMsgVersion]; + [parameters setObject:syncMsgVersion forKey:SDLNameSyncMsgVersion]; } else { - [parameters removeObjectForKey:NAMES_syncMsgVersion]; + [parameters removeObjectForKey:SDLNameSyncMsgVersion]; } } - (SDLSyncMsgVersion *)syncMsgVersion { - NSObject *obj = [parameters objectForKey:NAMES_syncMsgVersion]; + NSObject *obj = [parameters objectForKey:SDLNameSyncMsgVersion]; if (obj == nil || [obj isKindOfClass:SDLSyncMsgVersion.class]) { return (SDLSyncMsgVersion *)obj; } else { @@ -46,26 +46,26 @@ - (void)setAppName:(NSString *)appName { if (appName != nil) { - [parameters setObject:appName forKey:NAMES_appName]; + [parameters setObject:appName forKey:SDLNameAppName]; } else { - [parameters removeObjectForKey:NAMES_appName]; + [parameters removeObjectForKey:SDLNameAppName]; } } - (NSString *)appName { - return [parameters objectForKey:NAMES_appName]; + return [parameters objectForKey:SDLNameAppName]; } - (void)setTtsName:(NSMutableArray *)ttsName { if (ttsName != nil) { - [parameters setObject:ttsName forKey:NAMES_ttsName]; + [parameters setObject:ttsName forKey:SDLNameTtsName]; } else { - [parameters removeObjectForKey:NAMES_ttsName]; + [parameters removeObjectForKey:SDLNameTtsName]; } } - (NSMutableArray *)ttsName { - NSMutableArray *array = [parameters objectForKey:NAMES_ttsName]; + NSMutableArray *array = [parameters objectForKey:SDLNameTtsName]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { @@ -79,50 +79,50 @@ - (void)setNgnMediaScreenAppName:(NSString *)ngnMediaScreenAppName { if (ngnMediaScreenAppName != nil) { - [parameters setObject:ngnMediaScreenAppName forKey:NAMES_ngnMediaScreenAppName]; + [parameters setObject:ngnMediaScreenAppName forKey:SDLNameNgnMediaScreenAppName]; } else { - [parameters removeObjectForKey:NAMES_ngnMediaScreenAppName]; + [parameters removeObjectForKey:SDLNameNgnMediaScreenAppName]; } } - (NSString *)ngnMediaScreenAppName { - return [parameters objectForKey:NAMES_ngnMediaScreenAppName]; + return [parameters objectForKey:SDLNameNgnMediaScreenAppName]; } - (void)setVrSynonyms:(NSMutableArray *)vrSynonyms { if (vrSynonyms != nil) { - [parameters setObject:vrSynonyms forKey:NAMES_vrSynonyms]; + [parameters setObject:vrSynonyms forKey:SDLNameVrSynonyms]; } else { - [parameters removeObjectForKey:NAMES_vrSynonyms]; + [parameters removeObjectForKey:SDLNameVrSynonyms]; } } - (NSMutableArray *)vrSynonyms { - return [parameters objectForKey:NAMES_vrSynonyms]; + return [parameters objectForKey:SDLNameVrSynonyms]; } - (void)setIsMediaApplication:(NSNumber *)isMediaApplication { if (isMediaApplication != nil) { - [parameters setObject:isMediaApplication forKey:NAMES_isMediaApplication]; + [parameters setObject:isMediaApplication forKey:SDLNameIsMediaApplication]; } else { - [parameters removeObjectForKey:NAMES_isMediaApplication]; + [parameters removeObjectForKey:SDLNameIsMediaApplication]; } } - (NSNumber *)isMediaApplication { - return [parameters objectForKey:NAMES_isMediaApplication]; + return [parameters objectForKey:SDLNameIsMediaApplication]; } - (void)setLanguageDesired:(SDLLanguage *)languageDesired { if (languageDesired != nil) { - [parameters setObject:languageDesired forKey:NAMES_languageDesired]; + [parameters setObject:languageDesired forKey:SDLNameLanguageDesired]; } else { - [parameters removeObjectForKey:NAMES_languageDesired]; + [parameters removeObjectForKey:SDLNameLanguageDesired]; } } - (SDLLanguage *)languageDesired { - NSObject *obj = [parameters objectForKey:NAMES_languageDesired]; + NSObject *obj = [parameters objectForKey:SDLNameLanguageDesired]; if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) { return (SDLLanguage *)obj; } else { @@ -132,14 +132,14 @@ - (void)setHmiDisplayLanguageDesired:(SDLLanguage *)hmiDisplayLanguageDesired { if (hmiDisplayLanguageDesired != nil) { - [parameters setObject:hmiDisplayLanguageDesired forKey:NAMES_hmiDisplayLanguageDesired]; + [parameters setObject:hmiDisplayLanguageDesired forKey:SDLNameHmiDisplayLanguageDesired]; } else { - [parameters removeObjectForKey:NAMES_hmiDisplayLanguageDesired]; + [parameters removeObjectForKey:SDLNameHmiDisplayLanguageDesired]; } } - (SDLLanguage *)hmiDisplayLanguageDesired { - NSObject *obj = [parameters objectForKey:NAMES_hmiDisplayLanguageDesired]; + NSObject *obj = [parameters objectForKey:SDLNameHmiDisplayLanguageDesired]; if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) { return (SDLLanguage *)obj; } else { @@ -149,14 +149,14 @@ - (void)setAppHMIType:(NSMutableArray *)appHMIType { if (appHMIType != nil) { - [parameters setObject:appHMIType forKey:NAMES_appHMIType]; + [parameters setObject:appHMIType forKey:SDLNameAppHmiType]; } else { - [parameters removeObjectForKey:NAMES_appHMIType]; + [parameters removeObjectForKey:SDLNameAppHmiType]; } } - (NSMutableArray *)appHMIType { - NSMutableArray *array = [parameters objectForKey:NAMES_appHMIType]; + NSMutableArray *array = [parameters objectForKey:SDLNameAppHmiType]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLAppHMIType.class]) { return array; } else { @@ -170,26 +170,26 @@ - (void)setHashID:(NSString *)hashID { if (hashID != nil) { - [parameters setObject:hashID forKey:NAMES_hashID]; + [parameters setObject:hashID forKey:SDLNameHashId]; } else { - [parameters removeObjectForKey:NAMES_hashID]; + [parameters removeObjectForKey:SDLNameHashId]; } } - (NSString *)hashID { - return [parameters objectForKey:NAMES_hashID]; + return [parameters objectForKey:SDLNameHashId]; } - (void)setDeviceInfo:(SDLDeviceInfo *)deviceInfo { if (deviceInfo != nil) { - [parameters setObject:deviceInfo forKey:NAMES_deviceInfo]; + [parameters setObject:deviceInfo forKey:SDLNameDeviceInfo]; } else { - [parameters removeObjectForKey:NAMES_deviceInfo]; + [parameters removeObjectForKey:SDLNameDeviceInfo]; } } - (SDLDeviceInfo *)deviceInfo { - NSObject *obj = [parameters objectForKey:NAMES_deviceInfo]; + NSObject *obj = [parameters objectForKey:SDLNameDeviceInfo]; if (obj == nil || [obj isKindOfClass:SDLDeviceInfo.class]) { return (SDLDeviceInfo *)obj; } else { @@ -199,26 +199,26 @@ - (void)setAppID:(NSString *)appID { if (appID != nil) { - [parameters setObject:appID forKey:NAMES_appID]; + [parameters setObject:appID forKey:SDLNameAppId]; } else { - [parameters removeObjectForKey:NAMES_appID]; + [parameters removeObjectForKey:SDLNameAppId]; } } - (NSString *)appID { - return [parameters objectForKey:NAMES_appID]; + return [parameters objectForKey:SDLNameAppId]; } - (void)setAppInfo:(SDLAppInfo *)appInfo { if (appInfo != nil) { - [parameters setObject:appInfo forKey:NAMES_appInfo]; + [parameters setObject:appInfo forKey:SDLNameAppInfo]; } else { - [parameters removeObjectForKey:NAMES_appInfo]; + [parameters removeObjectForKey:SDLNameAppInfo]; } } - (SDLAppInfo *)appInfo { - NSObject *obj = [parameters objectForKey:NAMES_appInfo]; + NSObject *obj = [parameters objectForKey:SDLNameAppInfo]; if (obj == nil || [obj isKindOfClass:SDLAppInfo.class]) { return (SDLAppInfo *)obj; } else { diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m index 18356c34f..1cbe8fac4 100644 --- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m +++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m @@ -10,7 +10,7 @@ #import "SDLHMICapabilities.h" #import "SDLHMIZoneCapabilities.h" #import "SDLLanguage.h" -#import "SDLNames.h" + #import "SDLPrerecordedSpeech.h" #import "SDLPresetBankCapabilities.h" #import "SDLSoftButtonCapabilities.h" @@ -23,7 +23,7 @@ @implementation SDLRegisterAppInterfaceResponse - (instancetype)init { - if (self = [super initWithName:NAMES_RegisterAppInterface]) { + if (self = [super initWithName:SDLNameRegisterAppInterface]) { } return self; } @@ -36,14 +36,14 @@ - (void)setSyncMsgVersion:(SDLSyncMsgVersion *)syncMsgVersion { if (syncMsgVersion != nil) { - [parameters setObject:syncMsgVersion forKey:NAMES_syncMsgVersion]; + [parameters setObject:syncMsgVersion forKey:SDLNameSyncMsgVersion]; } else { - [parameters removeObjectForKey:NAMES_syncMsgVersion]; + [parameters removeObjectForKey:SDLNameSyncMsgVersion]; } } - (SDLSyncMsgVersion *)syncMsgVersion { - NSObject *obj = [parameters objectForKey:NAMES_syncMsgVersion]; + NSObject *obj = [parameters objectForKey:SDLNameSyncMsgVersion]; if (obj == nil || [obj isKindOfClass:SDLSyncMsgVersion.class]) { return (SDLSyncMsgVersion *)obj; } else { @@ -53,14 +53,14 @@ - (void)setLanguage:(SDLLanguage *)language { if (language != nil) { - [parameters setObject:language forKey:NAMES_language]; + [parameters setObject:language forKey:SDLNameLanguage]; } else { - [parameters removeObjectForKey:NAMES_language]; + [parameters removeObjectForKey:SDLNameLanguage]; } } - (SDLLanguage *)language { - NSObject *obj = [parameters objectForKey:NAMES_language]; + NSObject *obj = [parameters objectForKey:SDLNameLanguage]; if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) { return (SDLLanguage *)obj; } else { @@ -70,14 +70,14 @@ - (void)setHmiDisplayLanguage:(SDLLanguage *)hmiDisplayLanguage { if (hmiDisplayLanguage != nil) { - [parameters setObject:hmiDisplayLanguage forKey:NAMES_hmiDisplayLanguage]; + [parameters setObject:hmiDisplayLanguage forKey:SDLNameHmiDisplayLanguage]; } else { - [parameters removeObjectForKey:NAMES_hmiDisplayLanguage]; + [parameters removeObjectForKey:SDLNameHmiDisplayLanguage]; } } - (SDLLanguage *)hmiDisplayLanguage { - NSObject *obj = [parameters objectForKey:NAMES_hmiDisplayLanguage]; + NSObject *obj = [parameters objectForKey:SDLNameHmiDisplayLanguage]; if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) { return (SDLLanguage *)obj; } else { @@ -87,14 +87,14 @@ - (void)setDisplayCapabilities:(SDLDisplayCapabilities *)displayCapabilities { if (displayCapabilities != nil) { - [parameters setObject:displayCapabilities forKey:NAMES_displayCapabilities]; + [parameters setObject:displayCapabilities forKey:SDLNameDisplayCapabilities]; } else { - [parameters removeObjectForKey:NAMES_displayCapabilities]; + [parameters removeObjectForKey:SDLNameDisplayCapabilities]; } } - (SDLDisplayCapabilities *)displayCapabilities { - NSObject *obj = [parameters objectForKey:NAMES_displayCapabilities]; + NSObject *obj = [parameters objectForKey:SDLNameDisplayCapabilities]; if (obj == nil || [obj isKindOfClass:SDLDisplayCapabilities.class]) { return (SDLDisplayCapabilities *)obj; } else { @@ -104,14 +104,14 @@ - (void)setButtonCapabilities:(NSMutableArray *)buttonCapabilities { if (buttonCapabilities != nil) { - [parameters setObject:buttonCapabilities forKey:NAMES_buttonCapabilities]; + [parameters setObject:buttonCapabilities forKey:SDLNameButtonCapabilities]; } else { - [parameters removeObjectForKey:NAMES_buttonCapabilities]; + [parameters removeObjectForKey:SDLNameButtonCapabilities]; } } - (NSMutableArray *)buttonCapabilities { - NSMutableArray *array = [parameters objectForKey:NAMES_buttonCapabilities]; + NSMutableArray *array = [parameters objectForKey:SDLNameButtonCapabilities]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLButtonCapabilities.class]) { return array; } else { @@ -125,14 +125,14 @@ - (void)setSoftButtonCapabilities:(NSMutableArray *)softButtonCapabilities { if (softButtonCapabilities != nil) { - [parameters setObject:softButtonCapabilities forKey:NAMES_softButtonCapabilities]; + [parameters setObject:softButtonCapabilities forKey:SDLNameSoftButtonCapabilities]; } else { - [parameters removeObjectForKey:NAMES_softButtonCapabilities]; + [parameters removeObjectForKey:SDLNameSoftButtonCapabilities]; } } - (NSMutableArray *)softButtonCapabilities { - NSMutableArray *array = [parameters objectForKey:NAMES_softButtonCapabilities]; + NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtonCapabilities]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButtonCapabilities.class]) { return array; } else { @@ -146,14 +146,14 @@ - (void)setPresetBankCapabilities:(SDLPresetBankCapabilities *)presetBankCapabilities { if (presetBankCapabilities != nil) { - [parameters setObject:presetBankCapabilities forKey:NAMES_presetBankCapabilities]; + [parameters setObject:presetBankCapabilities forKey:SDLNamePresetBankCapabilities]; } else { - [parameters removeObjectForKey:NAMES_presetBankCapabilities]; + [parameters removeObjectForKey:SDLNamePresetBankCapabilities]; } } - (SDLPresetBankCapabilities *)presetBankCapabilities { - NSObject *obj = [parameters objectForKey:NAMES_presetBankCapabilities]; + NSObject *obj = [parameters objectForKey:SDLNamePresetBankCapabilities]; if (obj == nil || [obj isKindOfClass:SDLPresetBankCapabilities.class]) { return (SDLPresetBankCapabilities *)obj; } else { @@ -163,14 +163,14 @@ - (void)setHmiZoneCapabilities:(NSMutableArray *)hmiZoneCapabilities { if (hmiZoneCapabilities != nil) { - [parameters setObject:hmiZoneCapabilities forKey:NAMES_hmiZoneCapabilities]; + [parameters setObject:hmiZoneCapabilities forKey:SDLNameHmiZoneCapabilities]; } else { - [parameters removeObjectForKey:NAMES_hmiZoneCapabilities]; + [parameters removeObjectForKey:SDLNameHmiZoneCapabilities]; } } - (NSMutableArray *)hmiZoneCapabilities { - NSMutableArray *array = [parameters objectForKey:NAMES_hmiZoneCapabilities]; + NSMutableArray *array = [parameters objectForKey:SDLNameHmiZoneCapabilities]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLHMIZoneCapabilities.class]) { return array; } else { @@ -184,14 +184,14 @@ - (void)setSpeechCapabilities:(NSMutableArray *)speechCapabilities { if (speechCapabilities != nil) { - [parameters setObject:speechCapabilities forKey:NAMES_speechCapabilities]; + [parameters setObject:speechCapabilities forKey:SDLNameSpeechCapabilities]; } else { - [parameters removeObjectForKey:NAMES_speechCapabilities]; + [parameters removeObjectForKey:SDLNameSpeechCapabilities]; } } - (NSMutableArray *)speechCapabilities { - NSMutableArray *array = [parameters objectForKey:NAMES_speechCapabilities]; + NSMutableArray *array = [parameters objectForKey:SDLNameSpeechCapabilities]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSpeechCapabilities.class]) { return array; } else { @@ -205,14 +205,14 @@ - (void)setPrerecordedSpeech:(NSMutableArray *)prerecordedSpeech { if (prerecordedSpeech != nil) { - [parameters setObject:prerecordedSpeech forKey:NAMES_prerecordedSpeech]; + [parameters setObject:prerecordedSpeech forKey:SDLNamePrerecordedSpeech]; } else { - [parameters removeObjectForKey:NAMES_prerecordedSpeech]; + [parameters removeObjectForKey:SDLNamePrerecordedSpeech]; } } - (NSMutableArray *)prerecordedSpeech { - NSMutableArray *array = [parameters objectForKey:NAMES_prerecordedSpeech]; + NSMutableArray *array = [parameters objectForKey:SDLNamePrerecordedSpeech]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLPrerecordedSpeech.class]) { return array; } else { @@ -226,14 +226,14 @@ - (void)setVrCapabilities:(NSMutableArray *)vrCapabilities { if (vrCapabilities != nil) { - [parameters setObject:vrCapabilities forKey:NAMES_vrCapabilities]; + [parameters setObject:vrCapabilities forKey:SDLNameVrCapabilities]; } else { - [parameters removeObjectForKey:NAMES_vrCapabilities]; + [parameters removeObjectForKey:SDLNameVrCapabilities]; } } - (NSMutableArray *)vrCapabilities { - NSMutableArray *array = [parameters objectForKey:NAMES_vrCapabilities]; + NSMutableArray *array = [parameters objectForKey:SDLNameVrCapabilities]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRCapabilities.class]) { return array; } else { @@ -247,14 +247,14 @@ - (void)setAudioPassThruCapabilities:(NSMutableArray *)audioPassThruCapabilities { if (audioPassThruCapabilities != nil) { - [parameters setObject:audioPassThruCapabilities forKey:NAMES_audioPassThruCapabilities]; + [parameters setObject:audioPassThruCapabilities forKey:SDLNameAudioPassThruCapabilities]; } else { - [parameters removeObjectForKey:NAMES_audioPassThruCapabilities]; + [parameters removeObjectForKey:SDLNameAudioPassThruCapabilities]; } } - (NSMutableArray *)audioPassThruCapabilities { - NSMutableArray *array = [parameters objectForKey:NAMES_audioPassThruCapabilities]; + NSMutableArray *array = [parameters objectForKey:SDLNameAudioPassThruCapabilities]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLAudioPassThruCapabilities.class]) { return array; } else { @@ -268,14 +268,14 @@ - (void)setVehicleType:(SDLVehicleType *)vehicleType { if (vehicleType != nil) { - [parameters setObject:vehicleType forKey:NAMES_vehicleType]; + [parameters setObject:vehicleType forKey:SDLNameVehicleType]; } else { - [parameters removeObjectForKey:NAMES_vehicleType]; + [parameters removeObjectForKey:SDLNameVehicleType]; } } - (SDLVehicleType *)vehicleType { - NSObject *obj = [parameters objectForKey:NAMES_vehicleType]; + NSObject *obj = [parameters objectForKey:SDLNameVehicleType]; if (obj == nil || [obj isKindOfClass:SDLVehicleType.class]) { return (SDLVehicleType *)obj; } else { @@ -285,26 +285,26 @@ - (void)setSupportedDiagModes:(NSMutableArray *)supportedDiagModes { if (supportedDiagModes != nil) { - [parameters setObject:supportedDiagModes forKey:NAMES_supportedDiagModes]; + [parameters setObject:supportedDiagModes forKey:SDLNameSupportedDiagModes]; } else { - [parameters removeObjectForKey:NAMES_supportedDiagModes]; + [parameters removeObjectForKey:SDLNameSupportedDiagModes]; } } - (NSMutableArray *)supportedDiagModes { - return [parameters objectForKey:NAMES_supportedDiagModes]; + return [parameters objectForKey:SDLNameSupportedDiagModes]; } - (void)setHmiCapabilities:(SDLHMICapabilities *)hmiCapabilities { if (hmiCapabilities != nil) { - [parameters setObject:hmiCapabilities forKey:NAMES_hmiCapabilities]; + [parameters setObject:hmiCapabilities forKey:SDLNameHmiCapabilities]; } else { - [parameters removeObjectForKey:NAMES_hmiCapabilities]; + [parameters removeObjectForKey:SDLNameHmiCapabilities]; } } - (SDLHMICapabilities *)hmiCapabilities { - NSObject *obj = [parameters objectForKey:NAMES_hmiCapabilities]; + NSObject *obj = [parameters objectForKey:SDLNameHmiCapabilities]; if (obj == nil || [obj isKindOfClass:[SDLHMICapabilities class]]) { return (SDLHMICapabilities *)obj; } else { @@ -314,26 +314,26 @@ - (void)setSdlVersion:(NSString *)sdlVersion { if (sdlVersion != nil) { - parameters[NAMES_sdlVersion] = sdlVersion; + parameters[SDLNameSdlVersion] = sdlVersion; } else { - [parameters removeObjectForKey:NAMES_sdlVersion]; + [parameters removeObjectForKey:SDLNameSdlVersion]; } } - (NSString *)sdlVersion { - return parameters[NAMES_sdlVersion]; + return parameters[SDLNameSdlVersion]; } - (void)setSystemSoftwareVersion:(NSString *)systemSoftwareVersion { if (systemSoftwareVersion != nil) { - parameters[NAMES_systemSoftwareVersion] = systemSoftwareVersion; + parameters[SDLNameSystemSoftwareVersion] = systemSoftwareVersion; } else { - [parameters removeObjectForKey:NAMES_systemSoftwareVersion]; + [parameters removeObjectForKey:SDLNameSystemSoftwareVersion]; } } - (NSString *)systemSoftwareVersion { - return parameters[NAMES_systemSoftwareVersion]; + return parameters[SDLNameSystemSoftwareVersion]; } @end diff --git a/SmartDeviceLink/SDLResetGlobalProperties.m b/SmartDeviceLink/SDLResetGlobalProperties.m index 350f96de0..04664a9d0 100644 --- a/SmartDeviceLink/SDLResetGlobalProperties.m +++ b/SmartDeviceLink/SDLResetGlobalProperties.m @@ -5,12 +5,12 @@ #import "SDLResetGlobalProperties.h" #import "SDLGlobalProperty.h" -#import "SDLNames.h" + @implementation SDLResetGlobalProperties - (instancetype)init { - if (self = [super initWithName:NAMES_ResetGlobalProperties]) { + if (self = [super initWithName:SDLNameResetGlobalProperties]) { } return self; } @@ -23,14 +23,14 @@ - (void)setProperties:(NSMutableArray *)properties { if (properties != nil) { - [parameters setObject:properties forKey:NAMES_properties]; + [parameters setObject:properties forKey:SDLNameProperties]; } else { - [parameters removeObjectForKey:NAMES_properties]; + [parameters removeObjectForKey:SDLNameProperties]; } } - (NSMutableArray *)properties { - NSMutableArray *array = [parameters objectForKey:NAMES_properties]; + NSMutableArray *array = [parameters objectForKey:SDLNameProperties]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLGlobalProperty.class]) { return array; } else { diff --git a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m index e43b61a40..abbe6a34c 100644 --- a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m +++ b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m @@ -4,12 +4,12 @@ #import "SDLResetGlobalPropertiesResponse.h" -#import "SDLNames.h" + @implementation SDLResetGlobalPropertiesResponse - (instancetype)init { - if (self = [super initWithName:NAMES_ResetGlobalProperties]) { + if (self = [super initWithName:SDLNameResetGlobalProperties]) { } return self; } diff --git a/SmartDeviceLink/SDLScreenParams.m b/SmartDeviceLink/SDLScreenParams.m index 1debff302..c4bd6a0ba 100644 --- a/SmartDeviceLink/SDLScreenParams.m +++ b/SmartDeviceLink/SDLScreenParams.m @@ -4,7 +4,7 @@ #import "SDLScreenParams.h" #import "SDLImageResolution.h" -#import "SDLNames.h" + #import "SDLTouchEventCapabilities.h" @@ -24,14 +24,14 @@ - (void)setResolution:(SDLImageResolution *)resolution { if (resolution != nil) { - [store setObject:resolution forKey:NAMES_resolution]; + [store setObject:resolution forKey:SDLNameResolution]; } else { - [store removeObjectForKey:NAMES_resolution]; + [store removeObjectForKey:SDLNameResolution]; } } - (SDLImageResolution *)resolution { - NSObject *obj = [store objectForKey:NAMES_resolution]; + NSObject *obj = [store objectForKey:SDLNameResolution]; if (obj == nil || [obj isKindOfClass:SDLImageResolution.class]) { return (SDLImageResolution *)obj; } else { @@ -41,14 +41,14 @@ - (void)setTouchEventAvailable:(SDLTouchEventCapabilities *)touchEventAvailable { if (touchEventAvailable != nil) { - [store setObject:touchEventAvailable forKey:NAMES_touchEventAvailable]; + [store setObject:touchEventAvailable forKey:SDLNameTouchEventAvailable]; } else { - [store removeObjectForKey:NAMES_touchEventAvailable]; + [store removeObjectForKey:SDLNameTouchEventAvailable]; } } - (SDLTouchEventCapabilities *)touchEventAvailable { - NSObject *obj = [store objectForKey:NAMES_touchEventAvailable]; + NSObject *obj = [store objectForKey:SDLNameTouchEventAvailable]; if (obj == nil || [obj isKindOfClass:SDLTouchEventCapabilities.class]) { return (SDLTouchEventCapabilities *)obj; } else { diff --git a/SmartDeviceLink/SDLScrollableMessage.m b/SmartDeviceLink/SDLScrollableMessage.m index 5995e7874..be829b463 100644 --- a/SmartDeviceLink/SDLScrollableMessage.m +++ b/SmartDeviceLink/SDLScrollableMessage.m @@ -4,13 +4,13 @@ #import "SDLScrollableMessage.h" -#import "SDLNames.h" + #import "SDLSoftButton.h" @implementation SDLScrollableMessage - (instancetype)init { - if (self = [super initWithName:NAMES_ScrollableMessage]) { + if (self = [super initWithName:SDLNameScrollableMessage]) { } return self; } @@ -23,38 +23,38 @@ - (void)setScrollableMessageBody:(NSString *)scrollableMessageBody { if (scrollableMessageBody != nil) { - [parameters setObject:scrollableMessageBody forKey:NAMES_scrollableMessageBody]; + [parameters setObject:scrollableMessageBody forKey:SDLNameScrollableMessageBody]; } else { - [parameters removeObjectForKey:NAMES_scrollableMessageBody]; + [parameters removeObjectForKey:SDLNameScrollableMessageBody]; } } - (NSString *)scrollableMessageBody { - return [parameters objectForKey:NAMES_scrollableMessageBody]; + return [parameters objectForKey:SDLNameScrollableMessageBody]; } - (void)setTimeout:(NSNumber *)timeout { if (timeout != nil) { - [parameters setObject:timeout forKey:NAMES_timeout]; + [parameters setObject:timeout forKey:SDLNameTimeout]; } else { - [parameters removeObjectForKey:NAMES_timeout]; + [parameters removeObjectForKey:SDLNameTimeout]; } } - (NSNumber *)timeout { - return [parameters objectForKey:NAMES_timeout]; + return [parameters objectForKey:SDLNameTimeout]; } - (void)setSoftButtons:(NSMutableArray *)softButtons { if (softButtons != nil) { - [parameters setObject:softButtons forKey:NAMES_softButtons]; + [parameters setObject:softButtons forKey:SDLNameSoftButtons]; } else { - [parameters removeObjectForKey:NAMES_softButtons]; + [parameters removeObjectForKey:SDLNameSoftButtons]; } } - (NSMutableArray *)softButtons { - NSMutableArray *array = [parameters objectForKey:NAMES_softButtons]; + NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtons]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) { return array; } else { diff --git a/SmartDeviceLink/SDLScrollableMessageResponse.m b/SmartDeviceLink/SDLScrollableMessageResponse.m index 77473f07e..66d0f78fb 100644 --- a/SmartDeviceLink/SDLScrollableMessageResponse.m +++ b/SmartDeviceLink/SDLScrollableMessageResponse.m @@ -4,12 +4,12 @@ #import "SDLScrollableMessageResponse.h" -#import "SDLNames.h" + @implementation SDLScrollableMessageResponse - (instancetype)init { - if (self = [super initWithName:NAMES_ScrollableMessage]) { + if (self = [super initWithName:SDLNameScrollableMessage]) { } return self; } diff --git a/SmartDeviceLink/SDLSendLocation.m b/SmartDeviceLink/SDLSendLocation.m index 7bf1c5c70..dcc51a132 100644 --- a/SmartDeviceLink/SDLSendLocation.m +++ b/SmartDeviceLink/SDLSendLocation.m @@ -4,13 +4,13 @@ #import "SDLSendLocation.h" -#import "SDLNames.h" + @implementation SDLSendLocation - (instancetype)init { - self = [super initWithName:NAMES_SendLocation]; + self = [super initWithName:SDLNameSendLocation]; if (!self) { return nil; } @@ -29,86 +29,86 @@ - (void)setLongitudeDegrees:(NSNumber *)longitudeDegrees { if (longitudeDegrees != nil) { - parameters[NAMES_longitudeDegrees] = longitudeDegrees; + parameters[SDLNameLongitudeDegrees] = longitudeDegrees; } else { - [parameters removeObjectForKey:NAMES_longitudeDegrees]; + [parameters removeObjectForKey:SDLNameLongitudeDegrees]; } } - (NSNumber *)longitudeDegrees { - return parameters[NAMES_longitudeDegrees]; + return parameters[SDLNameLongitudeDegrees]; } - (void)setLatitudeDegrees:(NSNumber *)latitudeDegrees { if (latitudeDegrees != nil) { - parameters[NAMES_latitudeDegrees] = latitudeDegrees; + parameters[SDLNameLatitudeDegrees] = latitudeDegrees; } else { - [parameters removeObjectForKey:NAMES_latitudeDegrees]; + [parameters removeObjectForKey:SDLNameLatitudeDegrees]; } } - (NSNumber *)latitudeDegrees { - return parameters[NAMES_latitudeDegrees]; + return parameters[SDLNameLatitudeDegrees]; } - (void)setLocationName:(NSString *)locationName { if (locationName != nil) { - parameters[NAMES_locationName] = locationName; + parameters[SDLNameLocationName] = locationName; } else { - [parameters removeObjectForKey:NAMES_locationName]; + [parameters removeObjectForKey:SDLNameLocationName]; } } - (NSString *)locationName { - return parameters[NAMES_locationName]; + return parameters[SDLNameLocationName]; } - (void)setAddressLines:(NSArray *)addressLines { if (addressLines != nil) { - parameters[NAMES_addressLines] = addressLines; + parameters[SDLNameAddressLines] = addressLines; } else { - [parameters removeObjectForKey:NAMES_addressLines]; + [parameters removeObjectForKey:SDLNameAddressLines]; } } - (NSString *)locationDescription { - return parameters[NAMES_locationDescription]; + return parameters[SDLNameLocationDescription]; } - (void)setLocationDescription:(NSString *)locationDescription { if (locationDescription != nil) { - parameters[NAMES_locationDescription] = locationDescription; + parameters[SDLNameLocationDescription] = locationDescription; } else { - [parameters removeObjectForKey:NAMES_locationDescription]; + [parameters removeObjectForKey:SDLNameLocationDescription]; } } - (NSArray *)addressLines { - return parameters[NAMES_addressLines]; + return parameters[SDLNameAddressLines]; } - (void)setPhoneNumber:(NSString *)phoneNumber { if (phoneNumber != nil) { - parameters[NAMES_phoneNumber] = phoneNumber; + parameters[SDLNamePhoneNumber] = phoneNumber; } else { - [parameters removeObjectForKey:NAMES_phoneNumber]; + [parameters removeObjectForKey:SDLNamePhoneNumber]; } } - (NSString *)phoneNumber { - return parameters[NAMES_phoneNumber]; + return parameters[SDLNamePhoneNumber]; } - (void)setLocationImage:(SDLImage *)locationImage { if (locationImage != nil) { - parameters[NAMES_locationImage] = locationImage; + parameters[SDLNameLocationImage] = locationImage; } else { - [parameters removeObjectForKey:NAMES_locationImage]; + [parameters removeObjectForKey:SDLNameLocationImage]; } } - (SDLImage *)locationImage { - id obj = parameters[NAMES_locationImage]; + id obj = parameters[SDLNameLocationImage]; if (obj == nil || [obj isKindOfClass:[SDLImage class]]) { return (SDLImage *)obj; } else { diff --git a/SmartDeviceLink/SDLSendLocationResponse.m b/SmartDeviceLink/SDLSendLocationResponse.m index 83cde8118..17a6626ef 100644 --- a/SmartDeviceLink/SDLSendLocationResponse.m +++ b/SmartDeviceLink/SDLSendLocationResponse.m @@ -4,13 +4,13 @@ #import "SDLSendLocationResponse.h" -#import "SDLNames.h" + @implementation SDLSendLocationResponse - (instancetype)init { - self = [super initWithName:NAMES_SendLocation]; + self = [super initWithName:SDLNameSendLocation]; if (!self) { return nil; } diff --git a/SmartDeviceLink/SDLSetAppIcon.m b/SmartDeviceLink/SDLSetAppIcon.m index 717eeb023..cf118a9a2 100644 --- a/SmartDeviceLink/SDLSetAppIcon.m +++ b/SmartDeviceLink/SDLSetAppIcon.m @@ -4,12 +4,12 @@ #import "SDLSetAppIcon.h" -#import "SDLNames.h" + @implementation SDLSetAppIcon - (instancetype)init { - if (self = [super initWithName:NAMES_SetAppIcon]) { + if (self = [super initWithName:SDLNameSetAppIcon]) { } return self; } @@ -22,14 +22,14 @@ - (void)setSyncFileName:(NSString *)syncFileName { if (syncFileName != nil) { - [parameters setObject:syncFileName forKey:NAMES_syncFileName]; + [parameters setObject:syncFileName forKey:SDLNameSyncFileName]; } else { - [parameters removeObjectForKey:NAMES_syncFileName]; + [parameters removeObjectForKey:SDLNameSyncFileName]; } } - (NSString *)syncFileName { - return [parameters objectForKey:NAMES_syncFileName]; + return [parameters objectForKey:SDLNameSyncFileName]; } @end diff --git a/SmartDeviceLink/SDLSetAppIconResponse.m b/SmartDeviceLink/SDLSetAppIconResponse.m index 64c10600f..330bff069 100644 --- a/SmartDeviceLink/SDLSetAppIconResponse.m +++ b/SmartDeviceLink/SDLSetAppIconResponse.m @@ -4,12 +4,12 @@ #import "SDLSetAppIconResponse.h" -#import "SDLNames.h" + @implementation SDLSetAppIconResponse - (instancetype)init { - if (self = [super initWithName:NAMES_SetAppIcon]) { + if (self = [super initWithName:SDLNameSetAppIcon]) { } return self; } diff --git a/SmartDeviceLink/SDLSetDisplayLayout.m b/SmartDeviceLink/SDLSetDisplayLayout.m index ed812f647..a029efcf0 100644 --- a/SmartDeviceLink/SDLSetDisplayLayout.m +++ b/SmartDeviceLink/SDLSetDisplayLayout.m @@ -4,12 +4,12 @@ #import "SDLSetDisplayLayout.h" -#import "SDLNames.h" + @implementation SDLSetDisplayLayout - (instancetype)init { - if (self = [super initWithName:NAMES_SetDisplayLayout]) { + if (self = [super initWithName:SDLNameSetDisplayLayout]) { } return self; } @@ -22,14 +22,14 @@ - (void)setDisplayLayout:(NSString *)displayLayout { if (displayLayout != nil) { - [parameters setObject:displayLayout forKey:NAMES_displayLayout]; + [parameters setObject:displayLayout forKey:SDLNameDisplayLayout]; } else { - [parameters removeObjectForKey:NAMES_displayLayout]; + [parameters removeObjectForKey:SDLNameDisplayLayout]; } } - (NSString *)displayLayout { - return [parameters objectForKey:NAMES_displayLayout]; + return [parameters objectForKey:SDLNameDisplayLayout]; } @end diff --git a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m index fde37062e..1d430654c 100644 --- a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m +++ b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m @@ -6,7 +6,7 @@ #import "SDLButtonCapabilities.h" #import "SDLDisplayCapabilities.h" -#import "SDLNames.h" + #import "SDLPresetBankCapabilities.h" #import "SDLSoftButtonCapabilities.h" @@ -14,7 +14,7 @@ @implementation SDLSetDisplayLayoutResponse - (instancetype)init { - if (self = [super initWithName:NAMES_SetDisplayLayout]) { + if (self = [super initWithName:SDLNameSetDisplayLayout]) { } return self; } @@ -27,14 +27,14 @@ - (void)setDisplayCapabilities:(SDLDisplayCapabilities *)displayCapabilities { if (displayCapabilities != nil) { - [parameters setObject:displayCapabilities forKey:NAMES_displayCapabilities]; + [parameters setObject:displayCapabilities forKey:SDLNameDisplayCapabilities]; } else { - [parameters removeObjectForKey:NAMES_displayCapabilities]; + [parameters removeObjectForKey:SDLNameDisplayCapabilities]; } } - (SDLDisplayCapabilities *)displayCapabilities { - NSObject *obj = [parameters objectForKey:NAMES_displayCapabilities]; + NSObject *obj = [parameters objectForKey:SDLNameDisplayCapabilities]; if (obj == nil || [obj isKindOfClass:SDLDisplayCapabilities.class]) { return (SDLDisplayCapabilities *)obj; } else { @@ -44,14 +44,14 @@ - (void)setButtonCapabilities:(NSMutableArray *)buttonCapabilities { if (buttonCapabilities != nil) { - [parameters setObject:buttonCapabilities forKey:NAMES_buttonCapabilities]; + [parameters setObject:buttonCapabilities forKey:SDLNameButtonCapabilities]; } else { - [parameters removeObjectForKey:NAMES_buttonCapabilities]; + [parameters removeObjectForKey:SDLNameButtonCapabilities]; } } - (NSMutableArray *)buttonCapabilities { - NSMutableArray *array = [parameters objectForKey:NAMES_buttonCapabilities]; + NSMutableArray *array = [parameters objectForKey:SDLNameButtonCapabilities]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLButtonCapabilities.class]) { return array; } else { @@ -65,14 +65,14 @@ - (void)setSoftButtonCapabilities:(NSMutableArray *)softButtonCapabilities { if (softButtonCapabilities != nil) { - [parameters setObject:softButtonCapabilities forKey:NAMES_softButtonCapabilities]; + [parameters setObject:softButtonCapabilities forKey:SDLNameSoftButtonCapabilities]; } else { - [parameters removeObjectForKey:NAMES_softButtonCapabilities]; + [parameters removeObjectForKey:SDLNameSoftButtonCapabilities]; } } - (NSMutableArray *)softButtonCapabilities { - NSMutableArray *array = [parameters objectForKey:NAMES_softButtonCapabilities]; + NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtonCapabilities]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButtonCapabilities.class]) { return array; } else { @@ -86,14 +86,14 @@ - (void)setPresetBankCapabilities:(SDLPresetBankCapabilities *)presetBankCapabilities { if (presetBankCapabilities != nil) { - [parameters setObject:presetBankCapabilities forKey:NAMES_presetBankCapabilities]; + [parameters setObject:presetBankCapabilities forKey:SDLNamePresetBankCapabilities]; } else { - [parameters removeObjectForKey:NAMES_presetBankCapabilities]; + [parameters removeObjectForKey:SDLNamePresetBankCapabilities]; } } - (SDLPresetBankCapabilities *)presetBankCapabilities { - NSObject *obj = [parameters objectForKey:NAMES_presetBankCapabilities]; + NSObject *obj = [parameters objectForKey:SDLNamePresetBankCapabilities]; if (obj == nil || [obj isKindOfClass:SDLPresetBankCapabilities.class]) { return (SDLPresetBankCapabilities *)obj; } else { diff --git a/SmartDeviceLink/SDLSetGlobalProperties.m b/SmartDeviceLink/SDLSetGlobalProperties.m index ba9749e3e..f8b109671 100644 --- a/SmartDeviceLink/SDLSetGlobalProperties.m +++ b/SmartDeviceLink/SDLSetGlobalProperties.m @@ -6,7 +6,7 @@ #import "SDLImage.h" #import "SDLKeyboardProperties.h" -#import "SDLNames.h" + #import "SDLTTSChunk.h" #import "SDLVRHelpItem.h" @@ -14,7 +14,7 @@ @implementation SDLSetGlobalProperties - (instancetype)init { - if (self = [super initWithName:NAMES_SetGlobalProperties]) { + if (self = [super initWithName:SDLNameSetGlobalProperties]) { } return self; } @@ -27,14 +27,14 @@ - (void)setHelpPrompt:(NSMutableArray *)helpPrompt { if (helpPrompt != nil) { - [parameters setObject:helpPrompt forKey:NAMES_helpPrompt]; + [parameters setObject:helpPrompt forKey:SDLNameHelpPrompt]; } else { - [parameters removeObjectForKey:NAMES_helpPrompt]; + [parameters removeObjectForKey:SDLNameHelpPrompt]; } } - (NSMutableArray *)helpPrompt { - NSMutableArray *array = [parameters objectForKey:NAMES_helpPrompt]; + NSMutableArray *array = [parameters objectForKey:SDLNameHelpPrompt]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { @@ -48,14 +48,14 @@ - (void)setTimeoutPrompt:(NSMutableArray *)timeoutPrompt { if (timeoutPrompt != nil) { - [parameters setObject:timeoutPrompt forKey:NAMES_timeoutPrompt]; + [parameters setObject:timeoutPrompt forKey:SDLNameTimeoutPrompt]; } else { - [parameters removeObjectForKey:NAMES_timeoutPrompt]; + [parameters removeObjectForKey:SDLNameTimeoutPrompt]; } } - (NSMutableArray *)timeoutPrompt { - NSMutableArray *array = [parameters objectForKey:NAMES_timeoutPrompt]; + NSMutableArray *array = [parameters objectForKey:SDLNameTimeoutPrompt]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { @@ -69,26 +69,26 @@ - (void)setVrHelpTitle:(NSString *)vrHelpTitle { if (vrHelpTitle != nil) { - [parameters setObject:vrHelpTitle forKey:NAMES_vrHelpTitle]; + [parameters setObject:vrHelpTitle forKey:SDLNameVrHelpTitle]; } else { - [parameters removeObjectForKey:NAMES_vrHelpTitle]; + [parameters removeObjectForKey:SDLNameVrHelpTitle]; } } - (NSString *)vrHelpTitle { - return [parameters objectForKey:NAMES_vrHelpTitle]; + return [parameters objectForKey:SDLNameVrHelpTitle]; } - (void)setVrHelp:(NSMutableArray *)vrHelp { if (vrHelp != nil) { - [parameters setObject:vrHelp forKey:NAMES_vrHelp]; + [parameters setObject:vrHelp forKey:SDLNameVrHelp]; } else { - [parameters removeObjectForKey:NAMES_vrHelp]; + [parameters removeObjectForKey:SDLNameVrHelp]; } } - (NSMutableArray *)vrHelp { - NSMutableArray *array = [parameters objectForKey:NAMES_vrHelp]; + NSMutableArray *array = [parameters objectForKey:SDLNameVrHelp]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRHelpItem.class]) { return array; } else { @@ -102,26 +102,26 @@ - (void)setMenuTitle:(NSString *)menuTitle { if (menuTitle != nil) { - [parameters setObject:menuTitle forKey:NAMES_menuTitle]; + [parameters setObject:menuTitle forKey:SDLNameMenuTitle]; } else { - [parameters removeObjectForKey:NAMES_menuTitle]; + [parameters removeObjectForKey:SDLNameMenuTitle]; } } - (NSString *)menuTitle { - return [parameters objectForKey:NAMES_menuTitle]; + return [parameters objectForKey:SDLNameMenuTitle]; } - (void)setMenuIcon:(SDLImage *)menuIcon { if (menuIcon != nil) { - [parameters setObject:menuIcon forKey:NAMES_menuIcon]; + [parameters setObject:menuIcon forKey:SDLNameMenuIcon]; } else { - [parameters removeObjectForKey:NAMES_menuIcon]; + [parameters removeObjectForKey:SDLNameMenuIcon]; } } - (SDLImage *)menuIcon { - NSObject *obj = [parameters objectForKey:NAMES_menuIcon]; + NSObject *obj = [parameters objectForKey:SDLNameMenuIcon]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { @@ -131,14 +131,14 @@ - (void)setKeyboardProperties:(SDLKeyboardProperties *)keyboardProperties { if (keyboardProperties != nil) { - [parameters setObject:keyboardProperties forKey:NAMES_keyboardProperties]; + [parameters setObject:keyboardProperties forKey:SDLNameKeyboardProperties]; } else { - [parameters removeObjectForKey:NAMES_keyboardProperties]; + [parameters removeObjectForKey:SDLNameKeyboardProperties]; } } - (SDLKeyboardProperties *)keyboardProperties { - NSObject *obj = [parameters objectForKey:NAMES_keyboardProperties]; + NSObject *obj = [parameters objectForKey:SDLNameKeyboardProperties]; if (obj == nil || [obj isKindOfClass:SDLKeyboardProperties.class]) { return (SDLKeyboardProperties *)obj; } else { diff --git a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m index ff4db22c8..b0fbd699a 100644 --- a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m +++ b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m @@ -4,12 +4,12 @@ #import "SDLSetGlobalPropertiesResponse.h" -#import "SDLNames.h" + @implementation SDLSetGlobalPropertiesResponse - (instancetype)init { - if (self = [super initWithName:NAMES_SetGlobalProperties]) { + if (self = [super initWithName:SDLNameSetGlobalProperties]) { } return self; } diff --git a/SmartDeviceLink/SDLSetMediaClockTimer.m b/SmartDeviceLink/SDLSetMediaClockTimer.m index 325d0e347..899037e5b 100644 --- a/SmartDeviceLink/SDLSetMediaClockTimer.m +++ b/SmartDeviceLink/SDLSetMediaClockTimer.m @@ -4,7 +4,7 @@ #import "SDLSetMediaClockTimer.h" -#import "SDLNames.h" + #import "SDLStartTime.h" #import "SDLUpdateMode.h" @@ -12,7 +12,7 @@ @implementation SDLSetMediaClockTimer - (instancetype)init { - if (self = [super initWithName:NAMES_SetMediaClockTimer]) { + if (self = [super initWithName:SDLNameSetMediaClockTimer]) { } return self; } @@ -25,14 +25,14 @@ - (void)setStartTime:(SDLStartTime *)startTime { if (startTime != nil) { - [parameters setObject:startTime forKey:NAMES_startTime]; + [parameters setObject:startTime forKey:SDLNameStartTime]; } else { - [parameters removeObjectForKey:NAMES_startTime]; + [parameters removeObjectForKey:SDLNameStartTime]; } } - (SDLStartTime *)startTime { - NSObject *obj = [parameters objectForKey:NAMES_startTime]; + NSObject *obj = [parameters objectForKey:SDLNameStartTime]; if (obj == nil || [obj isKindOfClass:SDLStartTime.class]) { return (SDLStartTime *)obj; } else { @@ -42,14 +42,14 @@ - (void)setEndTime:(SDLStartTime *)endTime { if (endTime != nil) { - [parameters setObject:endTime forKey:NAMES_endTime]; + [parameters setObject:endTime forKey:SDLNameEndTime]; } else { - [parameters removeObjectForKey:NAMES_endTime]; + [parameters removeObjectForKey:SDLNameEndTime]; } } - (SDLStartTime *)endTime { - NSObject *obj = [parameters objectForKey:NAMES_endTime]; + NSObject *obj = [parameters objectForKey:SDLNameEndTime]; if (obj == nil || [obj isKindOfClass:SDLStartTime.class]) { return (SDLStartTime *)obj; } else { @@ -59,14 +59,14 @@ - (void)setUpdateMode:(SDLUpdateMode *)updateMode { if (updateMode != nil) { - [parameters setObject:updateMode forKey:NAMES_updateMode]; + [parameters setObject:updateMode forKey:SDLNameUpdateMode]; } else { - [parameters removeObjectForKey:NAMES_updateMode]; + [parameters removeObjectForKey:SDLNameUpdateMode]; } } - (SDLUpdateMode *)updateMode { - NSObject *obj = [parameters objectForKey:NAMES_updateMode]; + NSObject *obj = [parameters objectForKey:SDLNameUpdateMode]; if (obj == nil || [obj isKindOfClass:SDLUpdateMode.class]) { return (SDLUpdateMode *)obj; } else { diff --git a/SmartDeviceLink/SDLSetMediaClockTimerResponse.m b/SmartDeviceLink/SDLSetMediaClockTimerResponse.m index 098522fbd..3627e1c26 100644 --- a/SmartDeviceLink/SDLSetMediaClockTimerResponse.m +++ b/SmartDeviceLink/SDLSetMediaClockTimerResponse.m @@ -4,12 +4,12 @@ #import "SDLSetMediaClockTimerResponse.h" -#import "SDLNames.h" + @implementation SDLSetMediaClockTimerResponse - (instancetype)init { - if (self = [super initWithName:NAMES_SetMediaClockTimer]) { + if (self = [super initWithName:SDLNameSetMediaClockTimer]) { } return self; } diff --git a/SmartDeviceLink/SDLShow.m b/SmartDeviceLink/SDLShow.m index 933167159..550de0d7a 100644 --- a/SmartDeviceLink/SDLShow.m +++ b/SmartDeviceLink/SDLShow.m @@ -5,7 +5,7 @@ #import "SDLShow.h" #import "SDLImage.h" -#import "SDLNames.h" + #import "SDLSoftButton.h" #import "SDLTextAlignment.h" @@ -13,7 +13,7 @@ @implementation SDLShow - (instancetype)init { - if (self = [super initWithName:NAMES_Show]) { + if (self = [super initWithName:SDLNameShow]) { } return self; } @@ -26,62 +26,62 @@ - (void)setMainField1:(NSString *)mainField1 { if (mainField1 != nil) { - [parameters setObject:mainField1 forKey:NAMES_mainField1]; + [parameters setObject:mainField1 forKey:SDLNameMainField1]; } else { - [parameters removeObjectForKey:NAMES_mainField1]; + [parameters removeObjectForKey:SDLNameMainField1]; } } - (NSString *)mainField1 { - return [parameters objectForKey:NAMES_mainField1]; + return [parameters objectForKey:SDLNameMainField1]; } - (void)setMainField2:(NSString *)mainField2 { if (mainField2 != nil) { - [parameters setObject:mainField2 forKey:NAMES_mainField2]; + [parameters setObject:mainField2 forKey:SDLNameMainField2]; } else { - [parameters removeObjectForKey:NAMES_mainField2]; + [parameters removeObjectForKey:SDLNameMainField2]; } } - (NSString *)mainField2 { - return [parameters objectForKey:NAMES_mainField2]; + return [parameters objectForKey:SDLNameMainField2]; } - (void)setMainField3:(NSString *)mainField3 { if (mainField3 != nil) { - [parameters setObject:mainField3 forKey:NAMES_mainField3]; + [parameters setObject:mainField3 forKey:SDLNameMainField3]; } else { - [parameters removeObjectForKey:NAMES_mainField3]; + [parameters removeObjectForKey:SDLNameMainField3]; } } - (NSString *)mainField3 { - return [parameters objectForKey:NAMES_mainField3]; + return [parameters objectForKey:SDLNameMainField3]; } - (void)setMainField4:(NSString *)mainField4 { if (mainField4 != nil) { - [parameters setObject:mainField4 forKey:NAMES_mainField4]; + [parameters setObject:mainField4 forKey:SDLNameMainField4]; } else { - [parameters removeObjectForKey:NAMES_mainField4]; + [parameters removeObjectForKey:SDLNameMainField4]; } } - (NSString *)mainField4 { - return [parameters objectForKey:NAMES_mainField4]; + return [parameters objectForKey:SDLNameMainField4]; } - (void)setAlignment:(SDLTextAlignment *)alignment { if (alignment != nil) { - [parameters setObject:alignment forKey:NAMES_alignment]; + [parameters setObject:alignment forKey:SDLNameAlignment]; } else { - [parameters removeObjectForKey:NAMES_alignment]; + [parameters removeObjectForKey:SDLNameAlignment]; } } - (SDLTextAlignment *)alignment { - NSObject *obj = [parameters objectForKey:NAMES_alignment]; + NSObject *obj = [parameters objectForKey:SDLNameAlignment]; if (obj == nil || [obj isKindOfClass:SDLTextAlignment.class]) { return (SDLTextAlignment *)obj; } else { @@ -91,50 +91,50 @@ - (void)setStatusBar:(NSString *)statusBar { if (statusBar != nil) { - [parameters setObject:statusBar forKey:NAMES_statusBar]; + [parameters setObject:statusBar forKey:SDLNameStatusBar]; } else { - [parameters removeObjectForKey:NAMES_statusBar]; + [parameters removeObjectForKey:SDLNameStatusBar]; } } - (NSString *)statusBar { - return [parameters objectForKey:NAMES_statusBar]; + return [parameters objectForKey:SDLNameStatusBar]; } - (void)setMediaClock:(NSString *)mediaClock { if (mediaClock != nil) { - [parameters setObject:mediaClock forKey:NAMES_mediaClock]; + [parameters setObject:mediaClock forKey:SDLNameMediaClock]; } else { - [parameters removeObjectForKey:NAMES_mediaClock]; + [parameters removeObjectForKey:SDLNameMediaClock]; } } - (NSString *)mediaClock { - return [parameters objectForKey:NAMES_mediaClock]; + return [parameters objectForKey:SDLNameMediaClock]; } - (void)setMediaTrack:(NSString *)mediaTrack { if (mediaTrack != nil) { - [parameters setObject:mediaTrack forKey:NAMES_mediaTrack]; + [parameters setObject:mediaTrack forKey:SDLNameMediaTrack]; } else { - [parameters removeObjectForKey:NAMES_mediaTrack]; + [parameters removeObjectForKey:SDLNameMediaTrack]; } } - (NSString *)mediaTrack { - return [parameters objectForKey:NAMES_mediaTrack]; + return [parameters objectForKey:SDLNameMediaTrack]; } - (void)setGraphic:(SDLImage *)graphic { if (graphic != nil) { - [parameters setObject:graphic forKey:NAMES_graphic]; + [parameters setObject:graphic forKey:SDLNameGraphic]; } else { - [parameters removeObjectForKey:NAMES_graphic]; + [parameters removeObjectForKey:SDLNameGraphic]; } } - (SDLImage *)graphic { - NSObject *obj = [parameters objectForKey:NAMES_graphic]; + NSObject *obj = [parameters objectForKey:SDLNameGraphic]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { @@ -144,14 +144,14 @@ - (void)setSecondaryGraphic:(SDLImage *)secondaryGraphic { if (secondaryGraphic != nil) { - [parameters setObject:secondaryGraphic forKey:NAMES_secondaryGraphic]; + [parameters setObject:secondaryGraphic forKey:SDLNameSecondaryGraphic]; } else { - [parameters removeObjectForKey:NAMES_secondaryGraphic]; + [parameters removeObjectForKey:SDLNameSecondaryGraphic]; } } - (SDLImage *)secondaryGraphic { - NSObject *obj = [parameters objectForKey:NAMES_secondaryGraphic]; + NSObject *obj = [parameters objectForKey:SDLNameSecondaryGraphic]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { @@ -161,14 +161,14 @@ - (void)setSoftButtons:(NSMutableArray *)softButtons { if (softButtons != nil) { - [parameters setObject:softButtons forKey:NAMES_softButtons]; + [parameters setObject:softButtons forKey:SDLNameSoftButtons]; } else { - [parameters removeObjectForKey:NAMES_softButtons]; + [parameters removeObjectForKey:SDLNameSoftButtons]; } } - (NSMutableArray *)softButtons { - NSMutableArray *array = [parameters objectForKey:NAMES_softButtons]; + NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtons]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) { return array; } else { @@ -182,14 +182,14 @@ - (void)setCustomPresets:(NSMutableArray *)customPresets { if (customPresets != nil) { - [parameters setObject:customPresets forKey:NAMES_customPresets]; + [parameters setObject:customPresets forKey:SDLNameCustomPresets]; } else { - [parameters removeObjectForKey:NAMES_customPresets]; + [parameters removeObjectForKey:SDLNameCustomPresets]; } } - (NSMutableArray *)customPresets { - return [parameters objectForKey:NAMES_customPresets]; + return [parameters objectForKey:SDLNameCustomPresets]; } @end diff --git a/SmartDeviceLink/SDLShowConstantTBT.m b/SmartDeviceLink/SDLShowConstantTBT.m index c3f87f071..7fe4f2d64 100644 --- a/SmartDeviceLink/SDLShowConstantTBT.m +++ b/SmartDeviceLink/SDLShowConstantTBT.m @@ -5,14 +5,14 @@ #import "SDLShowConstantTBT.h" #import "SDLImage.h" -#import "SDLNames.h" + #import "SDLSoftButton.h" @implementation SDLShowConstantTBT - (instancetype)init { - if (self = [super initWithName:NAMES_ShowConstantTBT]) { + if (self = [super initWithName:SDLNameShowConstantTbt]) { } return self; } @@ -25,74 +25,74 @@ - (void)setNavigationText1:(NSString *)navigationText1 { if (navigationText1 != nil) { - [parameters setObject:navigationText1 forKey:NAMES_navigationText1]; + [parameters setObject:navigationText1 forKey:SDLNameNavigationText1]; } else { - [parameters removeObjectForKey:NAMES_navigationText1]; + [parameters removeObjectForKey:SDLNameNavigationText1]; } } - (NSString *)navigationText1 { - return [parameters objectForKey:NAMES_navigationText1]; + return [parameters objectForKey:SDLNameNavigationText1]; } - (void)setNavigationText2:(NSString *)navigationText2 { if (navigationText2 != nil) { - [parameters setObject:navigationText2 forKey:NAMES_navigationText2]; + [parameters setObject:navigationText2 forKey:SDLNameNavigationText2]; } else { - [parameters removeObjectForKey:NAMES_navigationText2]; + [parameters removeObjectForKey:SDLNameNavigationText2]; } } - (NSString *)navigationText2 { - return [parameters objectForKey:NAMES_navigationText2]; + return [parameters objectForKey:SDLNameNavigationText2]; } - (void)setEta:(NSString *)eta { if (eta != nil) { - [parameters setObject:eta forKey:NAMES_eta]; + [parameters setObject:eta forKey:SDLNameEta]; } else { - [parameters removeObjectForKey:NAMES_eta]; + [parameters removeObjectForKey:SDLNameEta]; } } - (NSString *)eta { - return [parameters objectForKey:NAMES_eta]; + return [parameters objectForKey:SDLNameEta]; } - (void)setTimeToDestination:(NSString *)timeToDestination { if (timeToDestination != nil) { - [parameters setObject:timeToDestination forKey:NAMES_timeToDestination]; + [parameters setObject:timeToDestination forKey:SDLNameTimeToDestination]; } else { - [parameters removeObjectForKey:NAMES_timeToDestination]; + [parameters removeObjectForKey:SDLNameTimeToDestination]; } } - (NSString *)timeToDestination { - return [parameters objectForKey:NAMES_timeToDestination]; + return [parameters objectForKey:SDLNameTimeToDestination]; } - (void)setTotalDistance:(NSString *)totalDistance { if (totalDistance != nil) { - [parameters setObject:totalDistance forKey:NAMES_totalDistance]; + [parameters setObject:totalDistance forKey:SDLNameTotalDistance]; } else { - [parameters removeObjectForKey:NAMES_totalDistance]; + [parameters removeObjectForKey:SDLNameTotalDistance]; } } - (NSString *)totalDistance { - return [parameters objectForKey:NAMES_totalDistance]; + return [parameters objectForKey:SDLNameTotalDistance]; } - (void)setTurnIcon:(SDLImage *)turnIcon { if (turnIcon != nil) { - [parameters setObject:turnIcon forKey:NAMES_turnIcon]; + [parameters setObject:turnIcon forKey:SDLNameTurnIcon]; } else { - [parameters removeObjectForKey:NAMES_turnIcon]; + [parameters removeObjectForKey:SDLNameTurnIcon]; } } - (SDLImage *)turnIcon { - NSObject *obj = [parameters objectForKey:NAMES_turnIcon]; + NSObject *obj = [parameters objectForKey:SDLNameTurnIcon]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { @@ -102,14 +102,14 @@ - (void)setNextTurnIcon:(SDLImage *)nextTurnIcon { if (nextTurnIcon != nil) { - [parameters setObject:nextTurnIcon forKey:NAMES_nextTurnIcon]; + [parameters setObject:nextTurnIcon forKey:SDLNameNextTurnIcon]; } else { - [parameters removeObjectForKey:NAMES_nextTurnIcon]; + [parameters removeObjectForKey:SDLNameNextTurnIcon]; } } - (SDLImage *)nextTurnIcon { - NSObject *obj = [parameters objectForKey:NAMES_nextTurnIcon]; + NSObject *obj = [parameters objectForKey:SDLNameNextTurnIcon]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { @@ -119,50 +119,50 @@ - (void)setDistanceToManeuver:(NSNumber *)distanceToManeuver { if (distanceToManeuver != nil) { - [parameters setObject:distanceToManeuver forKey:NAMES_distanceToManeuver]; + [parameters setObject:distanceToManeuver forKey:SDLNameDistanceToManeuver]; } else { - [parameters removeObjectForKey:NAMES_distanceToManeuver]; + [parameters removeObjectForKey:SDLNameDistanceToManeuver]; } } - (NSNumber *)distanceToManeuver { - return [parameters objectForKey:NAMES_distanceToManeuver]; + return [parameters objectForKey:SDLNameDistanceToManeuver]; } - (void)setDistanceToManeuverScale:(NSNumber *)distanceToManeuverScale { if (distanceToManeuverScale != nil) { - [parameters setObject:distanceToManeuverScale forKey:NAMES_distanceToManeuverScale]; + [parameters setObject:distanceToManeuverScale forKey:SDLNameDistanceToManeuverScale]; } else { - [parameters removeObjectForKey:NAMES_distanceToManeuverScale]; + [parameters removeObjectForKey:SDLNameDistanceToManeuverScale]; } } - (NSNumber *)distanceToManeuverScale { - return [parameters objectForKey:NAMES_distanceToManeuverScale]; + return [parameters objectForKey:SDLNameDistanceToManeuverScale]; } - (void)setManeuverComplete:(NSNumber *)maneuverComplete { if (maneuverComplete != nil) { - [parameters setObject:maneuverComplete forKey:NAMES_maneuverComplete]; + [parameters setObject:maneuverComplete forKey:SDLNameManeuverComplete]; } else { - [parameters removeObjectForKey:NAMES_maneuverComplete]; + [parameters removeObjectForKey:SDLNameManeuverComplete]; } } - (NSNumber *)maneuverComplete { - return [parameters objectForKey:NAMES_maneuverComplete]; + return [parameters objectForKey:SDLNameManeuverComplete]; } - (void)setSoftButtons:(NSMutableArray *)softButtons { if (softButtons != nil) { - [parameters setObject:softButtons forKey:NAMES_softButtons]; + [parameters setObject:softButtons forKey:SDLNameSoftButtons]; } else { - [parameters removeObjectForKey:NAMES_softButtons]; + [parameters removeObjectForKey:SDLNameSoftButtons]; } } - (NSMutableArray *)softButtons { - NSMutableArray *array = [parameters objectForKey:NAMES_softButtons]; + NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtons]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) { return array; } else { diff --git a/SmartDeviceLink/SDLShowConstantTBTResponse.m b/SmartDeviceLink/SDLShowConstantTBTResponse.m index 995b16e1c..9fc290c10 100644 --- a/SmartDeviceLink/SDLShowConstantTBTResponse.m +++ b/SmartDeviceLink/SDLShowConstantTBTResponse.m @@ -4,12 +4,12 @@ #import "SDLShowConstantTBTResponse.h" -#import "SDLNames.h" + @implementation SDLShowConstantTBTResponse - (instancetype)init { - if (self = [super initWithName:NAMES_ShowConstantTBT]) { + if (self = [super initWithName:SDLNameShowConstantTbt]) { } return self; } diff --git a/SmartDeviceLink/SDLShowResponse.m b/SmartDeviceLink/SDLShowResponse.m index 1ebb5dea9..4cd70124a 100644 --- a/SmartDeviceLink/SDLShowResponse.m +++ b/SmartDeviceLink/SDLShowResponse.m @@ -4,12 +4,12 @@ #import "SDLShowResponse.h" -#import "SDLNames.h" + @implementation SDLShowResponse - (instancetype)init { - if (self = [super initWithName:NAMES_Show]) { + if (self = [super initWithName:SDLNameShow]) { } return self; } diff --git a/SmartDeviceLink/SDLSingleTireStatus.m b/SmartDeviceLink/SDLSingleTireStatus.m index 87826f32b..1be2f3b86 100644 --- a/SmartDeviceLink/SDLSingleTireStatus.m +++ b/SmartDeviceLink/SDLSingleTireStatus.m @@ -4,7 +4,7 @@ #import "SDLSingleTireStatus.h" #import "SDLComponentVolumeStatus.h" -#import "SDLNames.h" + @implementation SDLSingleTireStatus @@ -23,14 +23,14 @@ - (void)setStatus:(SDLComponentVolumeStatus *)status { if (status != nil) { - [store setObject:status forKey:NAMES_status]; + [store setObject:status forKey:SDLNameStatus]; } else { - [store removeObjectForKey:NAMES_status]; + [store removeObjectForKey:SDLNameStatus]; } } - (SDLComponentVolumeStatus *)status { - NSObject *obj = [store objectForKey:NAMES_status]; + NSObject *obj = [store objectForKey:SDLNameStatus]; if (obj == nil || [obj isKindOfClass:SDLComponentVolumeStatus.class]) { return (SDLComponentVolumeStatus *)obj; } else { diff --git a/SmartDeviceLink/SDLSlider.m b/SmartDeviceLink/SDLSlider.m index 80a56d1aa..e8975d3fe 100644 --- a/SmartDeviceLink/SDLSlider.m +++ b/SmartDeviceLink/SDLSlider.m @@ -4,12 +4,12 @@ #import "SDLSlider.h" -#import "SDLNames.h" + @implementation SDLSlider - (instancetype)init { - if (self = [super initWithName:NAMES_Slider]) { + if (self = [super initWithName:SDLNameSlider]) { } return self; } @@ -22,62 +22,62 @@ - (void)setNumTicks:(NSNumber *)numTicks { if (numTicks != nil) { - [parameters setObject:numTicks forKey:NAMES_numTicks]; + [parameters setObject:numTicks forKey:SDLNameNumTicks]; } else { - [parameters removeObjectForKey:NAMES_numTicks]; + [parameters removeObjectForKey:SDLNameNumTicks]; } } - (NSNumber *)numTicks { - return [parameters objectForKey:NAMES_numTicks]; + return [parameters objectForKey:SDLNameNumTicks]; } - (void)setPosition:(NSNumber *)position { if (position != nil) { - [parameters setObject:position forKey:NAMES_position]; + [parameters setObject:position forKey:SDLNamePosition]; } else { - [parameters removeObjectForKey:NAMES_position]; + [parameters removeObjectForKey:SDLNamePosition]; } } - (NSNumber *)position { - return [parameters objectForKey:NAMES_position]; + return [parameters objectForKey:SDLNamePosition]; } - (void)setSliderHeader:(NSString *)sliderHeader { if (sliderHeader != nil) { - [parameters setObject:sliderHeader forKey:NAMES_sliderHeader]; + [parameters setObject:sliderHeader forKey:SDLNameSliderHeader]; } else { - [parameters removeObjectForKey:NAMES_sliderHeader]; + [parameters removeObjectForKey:SDLNameSliderHeader]; } } - (NSString *)sliderHeader { - return [parameters objectForKey:NAMES_sliderHeader]; + return [parameters objectForKey:SDLNameSliderHeader]; } - (void)setSliderFooter:(NSMutableArray *)sliderFooter { if (sliderFooter != nil) { - [parameters setObject:sliderFooter forKey:NAMES_sliderFooter]; + [parameters setObject:sliderFooter forKey:SDLNameSliderFooter]; } else { - [parameters removeObjectForKey:NAMES_sliderFooter]; + [parameters removeObjectForKey:SDLNameSliderFooter]; } } - (NSMutableArray *)sliderFooter { - return [parameters objectForKey:NAMES_sliderFooter]; + return [parameters objectForKey:SDLNameSliderFooter]; } - (void)setTimeout:(NSNumber *)timeout { if (timeout != nil) { - [parameters setObject:timeout forKey:NAMES_timeout]; + [parameters setObject:timeout forKey:SDLNameTimeout]; } else { - [parameters removeObjectForKey:NAMES_timeout]; + [parameters removeObjectForKey:SDLNameTimeout]; } } - (NSNumber *)timeout { - return [parameters objectForKey:NAMES_timeout]; + return [parameters objectForKey:SDLNameTimeout]; } @end diff --git a/SmartDeviceLink/SDLSliderResponse.m b/SmartDeviceLink/SDLSliderResponse.m index 927ad569d..70d2626df 100644 --- a/SmartDeviceLink/SDLSliderResponse.m +++ b/SmartDeviceLink/SDLSliderResponse.m @@ -4,12 +4,12 @@ #import "SDLSliderResponse.h" -#import "SDLNames.h" + @implementation SDLSliderResponse - (instancetype)init { - if (self = [super initWithName:NAMES_Slider]) { + if (self = [super initWithName:SDLNameSlider]) { } return self; } @@ -22,14 +22,14 @@ - (void)setSliderPosition:(NSNumber *)sliderPosition { if (sliderPosition != nil) { - [parameters setObject:sliderPosition forKey:NAMES_sliderPosition]; + [parameters setObject:sliderPosition forKey:SDLNameSliderPosition]; } else { - [parameters removeObjectForKey:NAMES_sliderPosition]; + [parameters removeObjectForKey:SDLNameSliderPosition]; } } - (NSNumber *)sliderPosition { - return [parameters objectForKey:NAMES_sliderPosition]; + return [parameters objectForKey:SDLNameSliderPosition]; } @end diff --git a/SmartDeviceLink/SDLSoftButton.m b/SmartDeviceLink/SDLSoftButton.m index 201144f20..2c5800ca9 100644 --- a/SmartDeviceLink/SDLSoftButton.m +++ b/SmartDeviceLink/SDLSoftButton.m @@ -4,7 +4,7 @@ #import "SDLSoftButton.h" #import "SDLImage.h" -#import "SDLNames.h" + #import "SDLSoftButtonType.h" #import "SDLSystemAction.h" @@ -36,14 +36,14 @@ - (void)setType:(SDLSoftButtonType *)type { if (type != nil) { - [store setObject:type forKey:NAMES_type]; + [store setObject:type forKey:SDLNameType]; } else { - [store removeObjectForKey:NAMES_type]; + [store removeObjectForKey:SDLNameType]; } } - (SDLSoftButtonType *)type { - NSObject *obj = [store objectForKey:NAMES_type]; + NSObject *obj = [store objectForKey:SDLNameType]; if (obj == nil || [obj isKindOfClass:SDLSoftButtonType.class]) { return (SDLSoftButtonType *)obj; } else { @@ -53,26 +53,26 @@ - (void)setText:(NSString *)text { if (text != nil) { - [store setObject:text forKey:NAMES_text]; + [store setObject:text forKey:SDLNameText]; } else { - [store removeObjectForKey:NAMES_text]; + [store removeObjectForKey:SDLNameText]; } } - (NSString *)text { - return [store objectForKey:NAMES_text]; + return [store objectForKey:SDLNameText]; } - (void)setImage:(SDLImage *)image { if (image != nil) { - [store setObject:image forKey:NAMES_image]; + [store setObject:image forKey:SDLNameImage]; } else { - [store removeObjectForKey:NAMES_image]; + [store removeObjectForKey:SDLNameImage]; } } - (SDLImage *)image { - NSObject *obj = [store objectForKey:NAMES_image]; + NSObject *obj = [store objectForKey:SDLNameImage]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { @@ -82,38 +82,38 @@ - (void)setIsHighlighted:(NSNumber *)isHighlighted { if (isHighlighted != nil) { - [store setObject:isHighlighted forKey:NAMES_isHighlighted]; + [store setObject:isHighlighted forKey:SDLNameIsHighlighted]; } else { - [store removeObjectForKey:NAMES_isHighlighted]; + [store removeObjectForKey:SDLNameIsHighlighted]; } } - (NSNumber *)isHighlighted { - return [store objectForKey:NAMES_isHighlighted]; + return [store objectForKey:SDLNameIsHighlighted]; } - (void)setSoftButtonID:(NSNumber *)softButtonID { if (softButtonID != nil) { - [store setObject:softButtonID forKey:NAMES_softButtonID]; + [store setObject:softButtonID forKey:SDLNameSoftButtonId]; } else { - [store removeObjectForKey:NAMES_softButtonID]; + [store removeObjectForKey:SDLNameSoftButtonId]; } } - (NSNumber *)softButtonID { - return [store objectForKey:NAMES_softButtonID]; + return [store objectForKey:SDLNameSoftButtonId]; } - (void)setSystemAction:(SDLSystemAction *)systemAction { if (systemAction != nil) { - [store setObject:systemAction forKey:NAMES_systemAction]; + [store setObject:systemAction forKey:SDLNameSystemAction]; } else { - [store removeObjectForKey:NAMES_systemAction]; + [store removeObjectForKey:SDLNameSystemAction]; } } - (SDLSystemAction *)systemAction { - NSObject *obj = [store objectForKey:NAMES_systemAction]; + NSObject *obj = [store objectForKey:SDLNameSystemAction]; if (obj == nil || [obj isKindOfClass:SDLSystemAction.class]) { return (SDLSystemAction *)obj; } else { diff --git a/SmartDeviceLink/SDLSoftButtonCapabilities.m b/SmartDeviceLink/SDLSoftButtonCapabilities.m index d9a502db1..28ef7865c 100644 --- a/SmartDeviceLink/SDLSoftButtonCapabilities.m +++ b/SmartDeviceLink/SDLSoftButtonCapabilities.m @@ -4,7 +4,7 @@ #import "SDLSoftButtonCapabilities.h" -#import "SDLNames.h" + @implementation SDLSoftButtonCapabilities @@ -22,50 +22,50 @@ - (void)setShortPressAvailable:(NSNumber *)shortPressAvailable { if (shortPressAvailable != nil) { - [store setObject:shortPressAvailable forKey:NAMES_shortPressAvailable]; + [store setObject:shortPressAvailable forKey:SDLNameShortPressAvailable]; } else { - [store removeObjectForKey:NAMES_shortPressAvailable]; + [store removeObjectForKey:SDLNameShortPressAvailable]; } } - (NSNumber *)shortPressAvailable { - return [store objectForKey:NAMES_shortPressAvailable]; + return [store objectForKey:SDLNameShortPressAvailable]; } - (void)setLongPressAvailable:(NSNumber *)longPressAvailable { if (longPressAvailable != nil) { - [store setObject:longPressAvailable forKey:NAMES_longPressAvailable]; + [store setObject:longPressAvailable forKey:SDLNameLongPressAvailable]; } else { - [store removeObjectForKey:NAMES_longPressAvailable]; + [store removeObjectForKey:SDLNameLongPressAvailable]; } } - (NSNumber *)longPressAvailable { - return [store objectForKey:NAMES_longPressAvailable]; + return [store objectForKey:SDLNameLongPressAvailable]; } - (void)setUpDownAvailable:(NSNumber *)upDownAvailable { if (upDownAvailable != nil) { - [store setObject:upDownAvailable forKey:NAMES_upDownAvailable]; + [store setObject:upDownAvailable forKey:SDLNameUpDownAvailable]; } else { - [store removeObjectForKey:NAMES_upDownAvailable]; + [store removeObjectForKey:SDLNameUpDownAvailable]; } } - (NSNumber *)upDownAvailable { - return [store objectForKey:NAMES_upDownAvailable]; + return [store objectForKey:SDLNameUpDownAvailable]; } - (void)setImageSupported:(NSNumber *)imageSupported { if (imageSupported != nil) { - [store setObject:imageSupported forKey:NAMES_imageSupported]; + [store setObject:imageSupported forKey:SDLNameImageSupported]; } else { - [store removeObjectForKey:NAMES_imageSupported]; + [store removeObjectForKey:SDLNameImageSupported]; } } - (NSNumber *)imageSupported { - return [store objectForKey:NAMES_imageSupported]; + return [store objectForKey:SDLNameImageSupported]; } @end diff --git a/SmartDeviceLink/SDLSpeak.m b/SmartDeviceLink/SDLSpeak.m index 8f19b925b..78292c089 100644 --- a/SmartDeviceLink/SDLSpeak.m +++ b/SmartDeviceLink/SDLSpeak.m @@ -4,13 +4,13 @@ #import "SDLSpeak.h" -#import "SDLNames.h" + #import "SDLTTSChunk.h" @implementation SDLSpeak - (instancetype)init { - if (self = [super initWithName:NAMES_Speak]) { + if (self = [super initWithName:SDLNameSpeak]) { } return self; } @@ -23,14 +23,14 @@ - (void)setTtsChunks:(NSMutableArray *)ttsChunks { if (ttsChunks != nil) { - [parameters setObject:ttsChunks forKey:NAMES_ttsChunks]; + [parameters setObject:ttsChunks forKey:SDLNameTtsChunks]; } else { - [parameters removeObjectForKey:NAMES_ttsChunks]; + [parameters removeObjectForKey:SDLNameTtsChunks]; } } - (NSMutableArray *)ttsChunks { - NSMutableArray *array = [parameters objectForKey:NAMES_ttsChunks]; + NSMutableArray *array = [parameters objectForKey:SDLNameTtsChunks]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { diff --git a/SmartDeviceLink/SDLSpeakResponse.m b/SmartDeviceLink/SDLSpeakResponse.m index dfb8dff33..7ad58d7f8 100644 --- a/SmartDeviceLink/SDLSpeakResponse.m +++ b/SmartDeviceLink/SDLSpeakResponse.m @@ -4,12 +4,12 @@ #import "SDLSpeakResponse.h" -#import "SDLNames.h" + @implementation SDLSpeakResponse - (instancetype)init { - if (self = [super initWithName:NAMES_Speak]) { + if (self = [super initWithName:SDLNameSpeak]) { } return self; } diff --git a/SmartDeviceLink/SDLStartTime.m b/SmartDeviceLink/SDLStartTime.m index 4745bf712..c3e1ebd29 100644 --- a/SmartDeviceLink/SDLStartTime.m +++ b/SmartDeviceLink/SDLStartTime.m @@ -4,7 +4,7 @@ #import "SDLStartTime.h" -#import "SDLNames.h" + @implementation SDLStartTime @@ -22,38 +22,38 @@ - (void)setHours:(NSNumber *)hours { if (hours != nil) { - [store setObject:hours forKey:NAMES_hours]; + [store setObject:hours forKey:SDLNameHours]; } else { - [store removeObjectForKey:NAMES_hours]; + [store removeObjectForKey:SDLNameHours]; } } - (NSNumber *)hours { - return [store objectForKey:NAMES_hours]; + return [store objectForKey:SDLNameHours]; } - (void)setMinutes:(NSNumber *)minutes { if (minutes != nil) { - [store setObject:minutes forKey:NAMES_minutes]; + [store setObject:minutes forKey:SDLNameMinutes]; } else { - [store removeObjectForKey:NAMES_minutes]; + [store removeObjectForKey:SDLNameMinutes]; } } - (NSNumber *)minutes { - return [store objectForKey:NAMES_minutes]; + return [store objectForKey:SDLNameMinutes]; } - (void)setSeconds:(NSNumber *)seconds { if (seconds != nil) { - [store setObject:seconds forKey:NAMES_seconds]; + [store setObject:seconds forKey:SDLNameSeconds]; } else { - [store removeObjectForKey:NAMES_seconds]; + [store removeObjectForKey:SDLNameSeconds]; } } - (NSNumber *)seconds { - return [store objectForKey:NAMES_seconds]; + return [store objectForKey:SDLNameSeconds]; } @end diff --git a/SmartDeviceLink/SDLSubscribeButton.m b/SmartDeviceLink/SDLSubscribeButton.m index ee0191943..0953754ec 100644 --- a/SmartDeviceLink/SDLSubscribeButton.m +++ b/SmartDeviceLink/SDLSubscribeButton.m @@ -5,13 +5,13 @@ #import "SDLSubscribeButton.h" #import "SDLButtonName.h" -#import "SDLNames.h" + @implementation SDLSubscribeButton - (instancetype)init { - if (self = [super initWithName:NAMES_SubscribeButton]) { + if (self = [super initWithName:SDLNameSubscribeButton]) { } return self; } @@ -35,14 +35,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 { diff --git a/SmartDeviceLink/SDLSubscribeButtonResponse.m b/SmartDeviceLink/SDLSubscribeButtonResponse.m index a70d58ede..aedad91de 100644 --- a/SmartDeviceLink/SDLSubscribeButtonResponse.m +++ b/SmartDeviceLink/SDLSubscribeButtonResponse.m @@ -4,12 +4,12 @@ #import "SDLSubscribeButtonResponse.h" -#import "SDLNames.h" + @implementation SDLSubscribeButtonResponse - (instancetype)init { - if (self = [super initWithName:NAMES_SubscribeButton]) { + if (self = [super initWithName:SDLNameSubscribeButton]) { } return self; } diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m index 55ec5e9d0..13b581af8 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.m +++ b/SmartDeviceLink/SDLSubscribeVehicleData.m @@ -4,12 +4,12 @@ #import "SDLSubscribeVehicleData.h" -#import "SDLNames.h" + @implementation SDLSubscribeVehicleData - (instancetype)init { - if (self = [super initWithName:NAMES_SubscribeVehicleData]) { + if (self = [super initWithName:SDLNameSubscribeVehicleData]) { } return self; } @@ -22,290 +22,290 @@ - (void)setGps:(NSNumber *)gps { if (gps != nil) { - [parameters setObject:gps forKey:NAMES_gps]; + [parameters setObject:gps forKey:SDLNameGps]; } else { - [parameters removeObjectForKey:NAMES_gps]; + [parameters removeObjectForKey:SDLNameGps]; } } - (NSNumber *)gps { - return [parameters objectForKey:NAMES_gps]; + return [parameters objectForKey:SDLNameGps]; } - (void)setSpeed:(NSNumber *)speed { if (speed != nil) { - [parameters setObject:speed forKey:NAMES_speed]; + [parameters setObject:speed forKey:SDLNameSpeed]; } else { - [parameters removeObjectForKey:NAMES_speed]; + [parameters removeObjectForKey:SDLNameSpeed]; } } - (NSNumber *)speed { - return [parameters objectForKey:NAMES_speed]; + return [parameters objectForKey:SDLNameSpeed]; } - (void)setRpm:(NSNumber *)rpm { if (rpm != nil) { - [parameters setObject:rpm forKey:NAMES_rpm]; + [parameters setObject:rpm forKey:SDLNameRpm]; } else { - [parameters removeObjectForKey:NAMES_rpm]; + [parameters removeObjectForKey:SDLNameRpm]; } } - (NSNumber *)rpm { - return [parameters objectForKey:NAMES_rpm]; + return [parameters objectForKey:SDLNameRpm]; } - (void)setFuelLevel:(NSNumber *)fuelLevel { if (fuelLevel != nil) { - [parameters setObject:fuelLevel forKey:NAMES_fuelLevel]; + [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel]; + [parameters removeObjectForKey:SDLNameFuelLevel]; } } - (NSNumber *)fuelLevel { - return [parameters objectForKey:NAMES_fuelLevel]; + return [parameters objectForKey:SDLNameFuelLevel]; } - (void)setFuelLevel_State:(NSNumber *)fuelLevel_State { if (fuelLevel_State != nil) { - [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State]; + [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel_State]; + [parameters removeObjectForKey:SDLNameFuelLevelState]; } } - (NSNumber *)fuelLevel_State { - return [parameters objectForKey:NAMES_fuelLevel_State]; + return [parameters objectForKey:SDLNameFuelLevelState]; } - (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption { if (instantFuelConsumption != nil) { - [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption]; + [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { - [parameters removeObjectForKey:NAMES_instantFuelConsumption]; + [parameters removeObjectForKey:SDLNameInstantFuelConsumption]; } } - (NSNumber *)instantFuelConsumption { - return [parameters objectForKey:NAMES_instantFuelConsumption]; + return [parameters objectForKey:SDLNameInstantFuelConsumption]; } - (void)setExternalTemperature:(NSNumber *)externalTemperature { if (externalTemperature != nil) { - [parameters setObject:externalTemperature forKey:NAMES_externalTemperature]; + [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { - [parameters removeObjectForKey:NAMES_externalTemperature]; + [parameters removeObjectForKey:SDLNameExternalTemperature]; } } - (NSNumber *)externalTemperature { - return [parameters objectForKey:NAMES_externalTemperature]; + return [parameters objectForKey:SDLNameExternalTemperature]; } - (void)setPrndl:(NSNumber *)prndl { if (prndl != nil) { - [parameters setObject:prndl forKey:NAMES_prndl]; + [parameters setObject:prndl forKey:SDLNamePrndl]; } else { - [parameters removeObjectForKey:NAMES_prndl]; + [parameters removeObjectForKey:SDLNamePrndl]; } } - (NSNumber *)prndl { - return [parameters objectForKey:NAMES_prndl]; + return [parameters objectForKey:SDLNamePrndl]; } - (void)setTirePressure:(NSNumber *)tirePressure { if (tirePressure != nil) { - [parameters setObject:tirePressure forKey:NAMES_tirePressure]; + [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { - [parameters removeObjectForKey:NAMES_tirePressure]; + [parameters removeObjectForKey:SDLNameTirePressure]; } } - (NSNumber *)tirePressure { - return [parameters objectForKey:NAMES_tirePressure]; + return [parameters objectForKey:SDLNameTirePressure]; } - (void)setOdometer:(NSNumber *)odometer { if (odometer != nil) { - [parameters setObject:odometer forKey:NAMES_odometer]; + [parameters setObject:odometer forKey:SDLNameOdometer]; } else { - [parameters removeObjectForKey:NAMES_odometer]; + [parameters removeObjectForKey:SDLNameOdometer]; } } - (NSNumber *)odometer { - return [parameters objectForKey:NAMES_odometer]; + return [parameters objectForKey:SDLNameOdometer]; } - (void)setBeltStatus:(NSNumber *)beltStatus { if (beltStatus != nil) { - [parameters setObject:beltStatus forKey:NAMES_beltStatus]; + [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { - [parameters removeObjectForKey:NAMES_beltStatus]; + [parameters removeObjectForKey:SDLNameBeltStatus]; } } - (NSNumber *)beltStatus { - return [parameters objectForKey:NAMES_beltStatus]; + return [parameters objectForKey:SDLNameBeltStatus]; } - (void)setBodyInformation:(NSNumber *)bodyInformation { if (bodyInformation != nil) { - [parameters setObject:bodyInformation forKey:NAMES_bodyInformation]; + [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { - [parameters removeObjectForKey:NAMES_bodyInformation]; + [parameters removeObjectForKey:SDLNameBodyInformation]; } } - (NSNumber *)bodyInformation { - return [parameters objectForKey:NAMES_bodyInformation]; + return [parameters objectForKey:SDLNameBodyInformation]; } - (void)setDeviceStatus:(NSNumber *)deviceStatus { if (deviceStatus != nil) { - [parameters setObject:deviceStatus forKey:NAMES_deviceStatus]; + [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { - [parameters removeObjectForKey:NAMES_deviceStatus]; + [parameters removeObjectForKey:SDLNameDeviceStatus]; } } - (NSNumber *)deviceStatus { - return [parameters objectForKey:NAMES_deviceStatus]; + return [parameters objectForKey:SDLNameDeviceStatus]; } - (void)setDriverBraking:(NSNumber *)driverBraking { if (driverBraking != nil) { - [parameters setObject:driverBraking forKey:NAMES_driverBraking]; + [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { - [parameters removeObjectForKey:NAMES_driverBraking]; + [parameters removeObjectForKey:SDLNameDriverBraking]; } } - (NSNumber *)driverBraking { - return [parameters objectForKey:NAMES_driverBraking]; + return [parameters objectForKey:SDLNameDriverBraking]; } - (void)setWiperStatus:(NSNumber *)wiperStatus { if (wiperStatus != nil) { - [parameters setObject:wiperStatus forKey:NAMES_wiperStatus]; + [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { - [parameters removeObjectForKey:NAMES_wiperStatus]; + [parameters removeObjectForKey:SDLNameWiperStatus]; } } - (NSNumber *)wiperStatus { - return [parameters objectForKey:NAMES_wiperStatus]; + return [parameters objectForKey:SDLNameWiperStatus]; } - (void)setHeadLampStatus:(NSNumber *)headLampStatus { if (headLampStatus != nil) { - [parameters setObject:headLampStatus forKey:NAMES_headLampStatus]; + [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { - [parameters removeObjectForKey:NAMES_headLampStatus]; + [parameters removeObjectForKey:SDLNameHeadLampStatus]; } } - (NSNumber *)headLampStatus { - return [parameters objectForKey:NAMES_headLampStatus]; + return [parameters objectForKey:SDLNameHeadLampStatus]; } - (void)setEngineTorque:(NSNumber *)engineTorque { if (engineTorque != nil) { - [parameters setObject:engineTorque forKey:NAMES_engineTorque]; + [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { - [parameters removeObjectForKey:NAMES_engineTorque]; + [parameters removeObjectForKey:SDLNameEngineTorque]; } } - (NSNumber *)engineTorque { - return [parameters objectForKey:NAMES_engineTorque]; + return [parameters objectForKey:SDLNameEngineTorque]; } - (void)setAccPedalPosition:(NSNumber *)accPedalPosition { if (accPedalPosition != nil) { - [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition]; + [parameters setObject:accPedalPosition forKey:SDLNameAccPedalPosition]; } else { - [parameters removeObjectForKey:NAMES_accPedalPosition]; + [parameters removeObjectForKey:SDLNameAccPedalPosition]; } } - (NSNumber *)accPedalPosition { - return [parameters objectForKey:NAMES_accPedalPosition]; + return [parameters objectForKey:SDLNameAccPedalPosition]; } - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle { if (steeringWheelAngle != nil) { - [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle]; + [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { - [parameters removeObjectForKey:NAMES_steeringWheelAngle]; + [parameters removeObjectForKey:SDLNameSteeringWheelAngle]; } } - (NSNumber *)steeringWheelAngle { - return [parameters objectForKey:NAMES_steeringWheelAngle]; + return [parameters objectForKey:SDLNameSteeringWheelAngle]; } - (void)setECallInfo:(NSNumber *)eCallInfo { if (eCallInfo != nil) { - [parameters setObject:eCallInfo forKey:NAMES_eCallInfo]; + [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { - [parameters removeObjectForKey:NAMES_eCallInfo]; + [parameters removeObjectForKey:SDLNameECallInfo]; } } - (NSNumber *)eCallInfo { - return [parameters objectForKey:NAMES_eCallInfo]; + return [parameters objectForKey:SDLNameECallInfo]; } - (void)setAirbagStatus:(NSNumber *)airbagStatus { if (airbagStatus != nil) { - [parameters setObject:airbagStatus forKey:NAMES_airbagStatus]; + [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { - [parameters removeObjectForKey:NAMES_airbagStatus]; + [parameters removeObjectForKey:SDLNameAirbagStatus]; } } - (NSNumber *)airbagStatus { - return [parameters objectForKey:NAMES_airbagStatus]; + return [parameters objectForKey:SDLNameAirbagStatus]; } - (void)setEmergencyEvent:(NSNumber *)emergencyEvent { if (emergencyEvent != nil) { - [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent]; + [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { - [parameters removeObjectForKey:NAMES_emergencyEvent]; + [parameters removeObjectForKey:SDLNameEmergencyEvent]; } } - (NSNumber *)emergencyEvent { - return [parameters objectForKey:NAMES_emergencyEvent]; + return [parameters objectForKey:SDLNameEmergencyEvent]; } - (void)setClusterModeStatus:(NSNumber *)clusterModeStatus { if (clusterModeStatus != nil) { - [parameters setObject:clusterModeStatus forKey:NAMES_clusterModeStatus]; + [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus]; } else { - [parameters removeObjectForKey:NAMES_clusterModeStatus]; + [parameters removeObjectForKey:SDLNameClusterModeStatus]; } } - (NSNumber *)clusterModeStatus { - return [parameters objectForKey:NAMES_clusterModeStatus]; + return [parameters objectForKey:SDLNameClusterModeStatus]; } - (void)setMyKey:(NSNumber *)myKey { if (myKey != nil) { - [parameters setObject:myKey forKey:NAMES_myKey]; + [parameters setObject:myKey forKey:SDLNameMyKey]; } else { - [parameters removeObjectForKey:NAMES_myKey]; + [parameters removeObjectForKey:SDLNameMyKey]; } } - (NSNumber *)myKey { - return [parameters objectForKey:NAMES_myKey]; + return [parameters objectForKey:SDLNameMyKey]; } @end diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m index 5afa5f1be..9a666e8c9 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m @@ -4,14 +4,14 @@ #import "SDLSubscribeVehicleDataResponse.h" -#import "SDLNames.h" + #import "SDLVehicleDataResult.h" @implementation SDLSubscribeVehicleDataResponse - (instancetype)init { - if (self = [super initWithName:NAMES_SubscribeVehicleData]) { + if (self = [super initWithName:SDLNameSubscribeVehicleData]) { } return self; } @@ -24,14 +24,14 @@ - (void)setGps:(SDLVehicleDataResult *)gps { if (gps != nil) { - [parameters setObject:gps forKey:NAMES_gps]; + [parameters setObject:gps forKey:SDLNameGps]; } else { - [parameters removeObjectForKey:NAMES_gps]; + [parameters removeObjectForKey:SDLNameGps]; } } - (SDLVehicleDataResult *)gps { - NSObject *obj = [parameters objectForKey:NAMES_gps]; + NSObject *obj = [parameters objectForKey:SDLNameGps]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -41,14 +41,14 @@ - (void)setSpeed:(SDLVehicleDataResult *)speed { if (speed != nil) { - [parameters setObject:speed forKey:NAMES_speed]; + [parameters setObject:speed forKey:SDLNameSpeed]; } else { - [parameters removeObjectForKey:NAMES_speed]; + [parameters removeObjectForKey:SDLNameSpeed]; } } - (SDLVehicleDataResult *)speed { - NSObject *obj = [parameters objectForKey:NAMES_speed]; + NSObject *obj = [parameters objectForKey:SDLNameSpeed]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -58,14 +58,14 @@ - (void)setRpm:(SDLVehicleDataResult *)rpm { if (rpm != nil) { - [parameters setObject:rpm forKey:NAMES_rpm]; + [parameters setObject:rpm forKey:SDLNameRpm]; } else { - [parameters removeObjectForKey:NAMES_rpm]; + [parameters removeObjectForKey:SDLNameRpm]; } } - (SDLVehicleDataResult *)rpm { - NSObject *obj = [parameters objectForKey:NAMES_rpm]; + NSObject *obj = [parameters objectForKey:SDLNameRpm]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -75,14 +75,14 @@ - (void)setFuelLevel:(SDLVehicleDataResult *)fuelLevel { if (fuelLevel != nil) { - [parameters setObject:fuelLevel forKey:NAMES_fuelLevel]; + [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel]; + [parameters removeObjectForKey:SDLNameFuelLevel]; } } - (SDLVehicleDataResult *)fuelLevel { - NSObject *obj = [parameters objectForKey:NAMES_fuelLevel]; + NSObject *obj = [parameters objectForKey:SDLNameFuelLevel]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -92,14 +92,14 @@ - (void)setFuelLevel_State:(SDLVehicleDataResult *)fuelLevel_State { if (fuelLevel_State != nil) { - [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State]; + [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel_State]; + [parameters removeObjectForKey:SDLNameFuelLevelState]; } } - (SDLVehicleDataResult *)fuelLevel_State { - NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State]; + NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -109,14 +109,14 @@ - (void)setInstantFuelConsumption:(SDLVehicleDataResult *)instantFuelConsumption { if (instantFuelConsumption != nil) { - [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption]; + [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { - [parameters removeObjectForKey:NAMES_instantFuelConsumption]; + [parameters removeObjectForKey:SDLNameInstantFuelConsumption]; } } - (SDLVehicleDataResult *)instantFuelConsumption { - NSObject *obj = [parameters objectForKey:NAMES_instantFuelConsumption]; + NSObject *obj = [parameters objectForKey:SDLNameInstantFuelConsumption]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -126,14 +126,14 @@ - (void)setExternalTemperature:(SDLVehicleDataResult *)externalTemperature { if (externalTemperature != nil) { - [parameters setObject:externalTemperature forKey:NAMES_externalTemperature]; + [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { - [parameters removeObjectForKey:NAMES_externalTemperature]; + [parameters removeObjectForKey:SDLNameExternalTemperature]; } } - (SDLVehicleDataResult *)externalTemperature { - NSObject *obj = [parameters objectForKey:NAMES_externalTemperature]; + NSObject *obj = [parameters objectForKey:SDLNameExternalTemperature]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -143,14 +143,14 @@ - (void)setPrndl:(SDLVehicleDataResult *)prndl { if (prndl != nil) { - [parameters setObject:prndl forKey:NAMES_prndl]; + [parameters setObject:prndl forKey:SDLNamePrndl]; } else { - [parameters removeObjectForKey:NAMES_prndl]; + [parameters removeObjectForKey:SDLNamePrndl]; } } - (SDLVehicleDataResult *)prndl { - NSObject *obj = [parameters objectForKey:NAMES_prndl]; + NSObject *obj = [parameters objectForKey:SDLNamePrndl]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -160,14 +160,14 @@ - (void)setTirePressure:(SDLVehicleDataResult *)tirePressure { if (tirePressure != nil) { - [parameters setObject:tirePressure forKey:NAMES_tirePressure]; + [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { - [parameters removeObjectForKey:NAMES_tirePressure]; + [parameters removeObjectForKey:SDLNameTirePressure]; } } - (SDLVehicleDataResult *)tirePressure { - NSObject *obj = [parameters objectForKey:NAMES_tirePressure]; + NSObject *obj = [parameters objectForKey:SDLNameTirePressure]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -177,14 +177,14 @@ - (void)setOdometer:(SDLVehicleDataResult *)odometer { if (odometer != nil) { - [parameters setObject:odometer forKey:NAMES_odometer]; + [parameters setObject:odometer forKey:SDLNameOdometer]; } else { - [parameters removeObjectForKey:NAMES_odometer]; + [parameters removeObjectForKey:SDLNameOdometer]; } } - (SDLVehicleDataResult *)odometer { - NSObject *obj = [parameters objectForKey:NAMES_odometer]; + NSObject *obj = [parameters objectForKey:SDLNameOdometer]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -194,14 +194,14 @@ - (void)setBeltStatus:(SDLVehicleDataResult *)beltStatus { if (beltStatus != nil) { - [parameters setObject:beltStatus forKey:NAMES_beltStatus]; + [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { - [parameters removeObjectForKey:NAMES_beltStatus]; + [parameters removeObjectForKey:SDLNameBeltStatus]; } } - (SDLVehicleDataResult *)beltStatus { - NSObject *obj = [parameters objectForKey:NAMES_beltStatus]; + NSObject *obj = [parameters objectForKey:SDLNameBeltStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -211,14 +211,14 @@ - (void)setBodyInformation:(SDLVehicleDataResult *)bodyInformation { if (bodyInformation != nil) { - [parameters setObject:bodyInformation forKey:NAMES_bodyInformation]; + [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { - [parameters removeObjectForKey:NAMES_bodyInformation]; + [parameters removeObjectForKey:SDLNameBodyInformation]; } } - (SDLVehicleDataResult *)bodyInformation { - NSObject *obj = [parameters objectForKey:NAMES_bodyInformation]; + NSObject *obj = [parameters objectForKey:SDLNameBodyInformation]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -228,14 +228,14 @@ - (void)setDeviceStatus:(SDLVehicleDataResult *)deviceStatus { if (deviceStatus != nil) { - [parameters setObject:deviceStatus forKey:NAMES_deviceStatus]; + [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { - [parameters removeObjectForKey:NAMES_deviceStatus]; + [parameters removeObjectForKey:SDLNameDeviceStatus]; } } - (SDLVehicleDataResult *)deviceStatus { - NSObject *obj = [parameters objectForKey:NAMES_deviceStatus]; + NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -245,14 +245,14 @@ - (void)setDriverBraking:(SDLVehicleDataResult *)driverBraking { if (driverBraking != nil) { - [parameters setObject:driverBraking forKey:NAMES_driverBraking]; + [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { - [parameters removeObjectForKey:NAMES_driverBraking]; + [parameters removeObjectForKey:SDLNameDriverBraking]; } } - (SDLVehicleDataResult *)driverBraking { - NSObject *obj = [parameters objectForKey:NAMES_driverBraking]; + NSObject *obj = [parameters objectForKey:SDLNameDriverBraking]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -262,14 +262,14 @@ - (void)setWiperStatus:(SDLVehicleDataResult *)wiperStatus { if (wiperStatus != nil) { - [parameters setObject:wiperStatus forKey:NAMES_wiperStatus]; + [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { - [parameters removeObjectForKey:NAMES_wiperStatus]; + [parameters removeObjectForKey:SDLNameWiperStatus]; } } - (SDLVehicleDataResult *)wiperStatus { - NSObject *obj = [parameters objectForKey:NAMES_wiperStatus]; + NSObject *obj = [parameters objectForKey:SDLNameWiperStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -279,14 +279,14 @@ - (void)setHeadLampStatus:(SDLVehicleDataResult *)headLampStatus { if (headLampStatus != nil) { - [parameters setObject:headLampStatus forKey:NAMES_headLampStatus]; + [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { - [parameters removeObjectForKey:NAMES_headLampStatus]; + [parameters removeObjectForKey:SDLNameHeadLampStatus]; } } - (SDLVehicleDataResult *)headLampStatus { - NSObject *obj = [parameters objectForKey:NAMES_headLampStatus]; + NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -296,14 +296,14 @@ - (void)setEngineTorque:(SDLVehicleDataResult *)engineTorque { if (engineTorque != nil) { - [parameters setObject:engineTorque forKey:NAMES_engineTorque]; + [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { - [parameters removeObjectForKey:NAMES_engineTorque]; + [parameters removeObjectForKey:SDLNameEngineTorque]; } } - (SDLVehicleDataResult *)engineTorque { - NSObject *obj = [parameters objectForKey:NAMES_engineTorque]; + NSObject *obj = [parameters objectForKey:SDLNameEngineTorque]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -313,14 +313,14 @@ - (void)setAccPedalPosition:(SDLVehicleDataResult *)accPedalPosition { if (accPedalPosition != nil) { - [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition]; + [parameters setObject:accPedalPosition forKey:SDLNameAccPedalPosition]; } else { - [parameters removeObjectForKey:NAMES_accPedalPosition]; + [parameters removeObjectForKey:SDLNameAccPedalPosition]; } } - (SDLVehicleDataResult *)accPedalPosition { - NSObject *obj = [parameters objectForKey:NAMES_accPedalPosition]; + NSObject *obj = [parameters objectForKey:SDLNameAccPedalPosition]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -330,14 +330,14 @@ - (void)setSteeringWheelAngle:(SDLVehicleDataResult *)steeringWheelAngle { if (steeringWheelAngle != nil) { - [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle]; + [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { - [parameters removeObjectForKey:NAMES_steeringWheelAngle]; + [parameters removeObjectForKey:SDLNameSteeringWheelAngle]; } } - (SDLVehicleDataResult *)steeringWheelAngle { - NSObject *obj = [parameters objectForKey:NAMES_steeringWheelAngle]; + NSObject *obj = [parameters objectForKey:SDLNameSteeringWheelAngle]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -347,14 +347,14 @@ - (void)setECallInfo:(SDLVehicleDataResult *)eCallInfo { if (eCallInfo != nil) { - [parameters setObject:eCallInfo forKey:NAMES_eCallInfo]; + [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { - [parameters removeObjectForKey:NAMES_eCallInfo]; + [parameters removeObjectForKey:SDLNameECallInfo]; } } - (SDLVehicleDataResult *)eCallInfo { - NSObject *obj = [parameters objectForKey:NAMES_eCallInfo]; + NSObject *obj = [parameters objectForKey:SDLNameECallInfo]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -364,14 +364,14 @@ - (void)setAirbagStatus:(SDLVehicleDataResult *)airbagStatus { if (airbagStatus != nil) { - [parameters setObject:airbagStatus forKey:NAMES_airbagStatus]; + [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { - [parameters removeObjectForKey:NAMES_airbagStatus]; + [parameters removeObjectForKey:SDLNameAirbagStatus]; } } - (SDLVehicleDataResult *)airbagStatus { - NSObject *obj = [parameters objectForKey:NAMES_airbagStatus]; + NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -381,14 +381,14 @@ - (void)setEmergencyEvent:(SDLVehicleDataResult *)emergencyEvent { if (emergencyEvent != nil) { - [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent]; + [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { - [parameters removeObjectForKey:NAMES_emergencyEvent]; + [parameters removeObjectForKey:SDLNameEmergencyEvent]; } } - (SDLVehicleDataResult *)emergencyEvent { - NSObject *obj = [parameters objectForKey:NAMES_emergencyEvent]; + NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -398,14 +398,14 @@ - (void)setClusterModes:(SDLVehicleDataResult *)clusterModes { if (clusterModes != nil) { - [parameters setObject:clusterModes forKey:NAMES_clusterModes]; + [parameters setObject:clusterModes forKey:SDLNameClusterModes]; } else { - [parameters removeObjectForKey:NAMES_clusterModes]; + [parameters removeObjectForKey:SDLNameClusterModes]; } } - (SDLVehicleDataResult *)clusterModes { - NSObject *obj = [parameters objectForKey:NAMES_clusterModes]; + NSObject *obj = [parameters objectForKey:SDLNameClusterModes]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -415,14 +415,14 @@ - (void)setMyKey:(SDLVehicleDataResult *)myKey { if (myKey != nil) { - [parameters setObject:myKey forKey:NAMES_myKey]; + [parameters setObject:myKey forKey:SDLNameMyKey]; } else { - [parameters removeObjectForKey:NAMES_myKey]; + [parameters removeObjectForKey:SDLNameMyKey]; } } - (SDLVehicleDataResult *)myKey { - NSObject *obj = [parameters objectForKey:NAMES_myKey]; + NSObject *obj = [parameters objectForKey:SDLNameMyKey]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { diff --git a/SmartDeviceLink/SDLSyncMsgVersion.m b/SmartDeviceLink/SDLSyncMsgVersion.m index 2d516539e..ce321cc75 100644 --- a/SmartDeviceLink/SDLSyncMsgVersion.m +++ b/SmartDeviceLink/SDLSyncMsgVersion.m @@ -4,7 +4,7 @@ #import "SDLSyncMsgVersion.h" -#import "SDLNames.h" + @implementation SDLSyncMsgVersion @@ -22,26 +22,26 @@ - (void)setMajorVersion:(NSNumber *)majorVersion { if (majorVersion != nil) { - [store setObject:majorVersion forKey:NAMES_majorVersion]; + [store setObject:majorVersion forKey:SDLNameMajorVersion]; } else { - [store removeObjectForKey:NAMES_majorVersion]; + [store removeObjectForKey:SDLNameMajorVersion]; } } - (NSNumber *)majorVersion { - return [store objectForKey:NAMES_majorVersion]; + return [store objectForKey:SDLNameMajorVersion]; } - (void)setMinorVersion:(NSNumber *)minorVersion { if (minorVersion != nil) { - [store setObject:minorVersion forKey:NAMES_minorVersion]; + [store setObject:minorVersion forKey:SDLNameMinorVersion]; } else { - [store removeObjectForKey:NAMES_minorVersion]; + [store removeObjectForKey:SDLNameMinorVersion]; } } - (NSNumber *)minorVersion { - return [store objectForKey:NAMES_minorVersion]; + return [store objectForKey:SDLNameMinorVersion]; } - (NSString *)description { diff --git a/SmartDeviceLink/SDLSyncPData.m b/SmartDeviceLink/SDLSyncPData.m index c8730a2f1..643580b0e 100644 --- a/SmartDeviceLink/SDLSyncPData.m +++ b/SmartDeviceLink/SDLSyncPData.m @@ -4,12 +4,12 @@ #import "SDLSyncPData.h" -#import "SDLNames.h" + @implementation SDLSyncPData - (instancetype)init { - if (self = [super initWithName:NAMES_SyncPData]) { + if (self = [super initWithName:SDLNameSyncPData]) { } return self; } diff --git a/SmartDeviceLink/SDLSyncPDataResponse.m b/SmartDeviceLink/SDLSyncPDataResponse.m index 00edf14b1..4f5ab24dd 100644 --- a/SmartDeviceLink/SDLSyncPDataResponse.m +++ b/SmartDeviceLink/SDLSyncPDataResponse.m @@ -4,12 +4,12 @@ #import "SDLSyncPDataResponse.h" -#import "SDLNames.h" + @implementation SDLSyncPDataResponse - (instancetype)init { - if (self = [super initWithName:NAMES_SyncPData]) { + if (self = [super initWithName:SDLNameSyncPData]) { } return self; } diff --git a/SmartDeviceLink/SDLSystemRequest.m b/SmartDeviceLink/SDLSystemRequest.m index 836b44447..e82675600 100644 --- a/SmartDeviceLink/SDLSystemRequest.m +++ b/SmartDeviceLink/SDLSystemRequest.m @@ -4,14 +4,14 @@ #import "SDLSystemRequest.h" -#import "SDLNames.h" + #import "SDLRequestType.h" @implementation SDLSystemRequest - (instancetype)init { - if (self = [super initWithName:NAMES_SystemRequest]) { + if (self = [super initWithName:SDLNameSystemRequest]) { } return self; } @@ -24,14 +24,14 @@ - (void)setRequestType:(SDLRequestType *)requestType { if (requestType != nil) { - [parameters setObject:requestType forKey:NAMES_requestType]; + [parameters setObject:requestType forKey:SDLNameRequestType]; } else { - [parameters removeObjectForKey:NAMES_requestType]; + [parameters removeObjectForKey:SDLNameRequestType]; } } - (SDLRequestType *)requestType { - NSObject *obj = [parameters objectForKey:NAMES_requestType]; + NSObject *obj = [parameters objectForKey:SDLNameRequestType]; if (obj == nil || [obj isKindOfClass:SDLRequestType.class]) { return (SDLRequestType *)obj; } else { @@ -41,14 +41,14 @@ - (void)setFileName:(NSString *)fileName { if (fileName != nil) { - [parameters setObject:fileName forKey:NAMES_fileName]; + [parameters setObject:fileName forKey:SDLNameFileName]; } else { - [parameters removeObjectForKey:NAMES_fileName]; + [parameters removeObjectForKey:SDLNameFileName]; } } - (NSString *)fileName { - return [parameters objectForKey:NAMES_fileName]; + return [parameters objectForKey:SDLNameFileName]; } @end diff --git a/SmartDeviceLink/SDLSystemRequestResponse.m b/SmartDeviceLink/SDLSystemRequestResponse.m index ba563e561..57ddc6718 100644 --- a/SmartDeviceLink/SDLSystemRequestResponse.m +++ b/SmartDeviceLink/SDLSystemRequestResponse.m @@ -4,12 +4,12 @@ #import "SDLSystemRequestResponse.h" -#import "SDLNames.h" + @implementation SDLSystemRequestResponse - (instancetype)init { - if (self = [super initWithName:NAMES_SystemRequest]) { + if (self = [super initWithName:SDLNameSystemRequest]) { } return self; } diff --git a/SmartDeviceLink/SDLTTSChunk.m b/SmartDeviceLink/SDLTTSChunk.m index 7e45413eb..abe0a1d03 100644 --- a/SmartDeviceLink/SDLTTSChunk.m +++ b/SmartDeviceLink/SDLTTSChunk.m @@ -3,7 +3,7 @@ #import "SDLTTSChunk.h" -#import "SDLNames.h" + #import "SDLSpeechCapabilities.h" @@ -23,26 +23,26 @@ - (void)setText:(NSString *)text { if (text != nil) { - [store setObject:text forKey:NAMES_text]; + [store setObject:text forKey:SDLNameText]; } else { - [store removeObjectForKey:NAMES_text]; + [store removeObjectForKey:SDLNameText]; } } - (NSString *)text { - return [store objectForKey:NAMES_text]; + return [store objectForKey:SDLNameText]; } - (void)setType:(SDLSpeechCapabilities *)type { if (type != nil) { - [store setObject:type forKey:NAMES_type]; + [store setObject:type forKey:SDLNameType]; } else { - [store removeObjectForKey:NAMES_type]; + [store removeObjectForKey:SDLNameType]; } } - (SDLSpeechCapabilities *)type { - NSObject *obj = [store objectForKey:NAMES_type]; + NSObject *obj = [store objectForKey:SDLNameType]; if (obj == nil || [obj isKindOfClass:SDLSpeechCapabilities.class]) { return (SDLSpeechCapabilities *)obj; } else { diff --git a/SmartDeviceLink/SDLTextField.m b/SmartDeviceLink/SDLTextField.m index 926d258f1..ce7ab5d0a 100644 --- a/SmartDeviceLink/SDLTextField.m +++ b/SmartDeviceLink/SDLTextField.m @@ -4,7 +4,7 @@ #import "SDLTextField.h" #import "SDLCharacterSet.h" -#import "SDLNames.h" + #import "SDLTextFieldName.h" @@ -24,14 +24,14 @@ - (void)setName:(SDLTextFieldName *)name { if (name != nil) { - [store setObject:name forKey:NAMES_name]; + [store setObject:name forKey:SDLNameName]; } else { - [store removeObjectForKey:NAMES_name]; + [store removeObjectForKey:SDLNameName]; } } - (SDLTextFieldName *)name { - NSObject *obj = [store objectForKey:NAMES_name]; + NSObject *obj = [store objectForKey:SDLNameName]; if (obj == nil || [obj isKindOfClass:SDLTextFieldName.class]) { return (SDLTextFieldName *)obj; } else { @@ -41,14 +41,14 @@ - (void)setCharacterSet:(SDLCharacterSet *)characterSet { if (characterSet != nil) { - [store setObject:characterSet forKey:NAMES_characterSet]; + [store setObject:characterSet forKey:SDLNameCharacterSet]; } else { - [store removeObjectForKey:NAMES_characterSet]; + [store removeObjectForKey:SDLNameCharacterSet]; } } - (SDLCharacterSet *)characterSet { - NSObject *obj = [store objectForKey:NAMES_characterSet]; + NSObject *obj = [store objectForKey:SDLNameCharacterSet]; if (obj == nil || [obj isKindOfClass:SDLCharacterSet.class]) { return (SDLCharacterSet *)obj; } else { @@ -58,26 +58,26 @@ - (void)setWidth:(NSNumber *)width { if (width != nil) { - [store setObject:width forKey:NAMES_width]; + [store setObject:width forKey:SDLNameWidth]; } else { - [store removeObjectForKey:NAMES_width]; + [store removeObjectForKey:SDLNameWidth]; } } - (NSNumber *)width { - return [store objectForKey:NAMES_width]; + return [store objectForKey:SDLNameWidth]; } - (void)setRows:(NSNumber *)rows { if (rows != nil) { - [store setObject:rows forKey:NAMES_rows]; + [store setObject:rows forKey:SDLNameRows]; } else { - [store removeObjectForKey:NAMES_rows]; + [store removeObjectForKey:SDLNameRows]; } } - (NSNumber *)rows { - return [store objectForKey:NAMES_rows]; + return [store objectForKey:SDLNameRows]; } @end diff --git a/SmartDeviceLink/SDLTireStatus.m b/SmartDeviceLink/SDLTireStatus.m index c2768565a..0d3baaa84 100644 --- a/SmartDeviceLink/SDLTireStatus.m +++ b/SmartDeviceLink/SDLTireStatus.m @@ -3,7 +3,7 @@ #import "SDLTireStatus.h" -#import "SDLNames.h" + #import "SDLSingleTireStatus.h" #import "SDLWarningLightStatus.h" @@ -24,14 +24,14 @@ - (void)setPressureTelltale:(SDLWarningLightStatus *)pressureTelltale { if (pressureTelltale != nil) { - [store setObject:pressureTelltale forKey:NAMES_pressureTelltale]; + [store setObject:pressureTelltale forKey:SDLNamePressureTelltale]; } else { - [store removeObjectForKey:NAMES_pressureTelltale]; + [store removeObjectForKey:SDLNamePressureTelltale]; } } - (SDLWarningLightStatus *)pressureTelltale { - NSObject *obj = [store objectForKey:NAMES_pressureTelltale]; + NSObject *obj = [store objectForKey:SDLNamePressureTelltale]; if (obj == nil || [obj isKindOfClass:SDLWarningLightStatus.class]) { return (SDLWarningLightStatus *)obj; } else { @@ -41,14 +41,14 @@ - (void)setLeftFront:(SDLSingleTireStatus *)leftFront { if (leftFront != nil) { - [store setObject:leftFront forKey:NAMES_leftFront]; + [store setObject:leftFront forKey:SDLNameLeftFront]; } else { - [store removeObjectForKey:NAMES_leftFront]; + [store removeObjectForKey:SDLNameLeftFront]; } } - (SDLSingleTireStatus *)leftFront { - NSObject *obj = [store objectForKey:NAMES_leftFront]; + NSObject *obj = [store objectForKey:SDLNameLeftFront]; if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { @@ -58,14 +58,14 @@ - (void)setRightFront:(SDLSingleTireStatus *)rightFront { if (rightFront != nil) { - [store setObject:rightFront forKey:NAMES_rightFront]; + [store setObject:rightFront forKey:SDLNameRightFront]; } else { - [store removeObjectForKey:NAMES_rightFront]; + [store removeObjectForKey:SDLNameRightFront]; } } - (SDLSingleTireStatus *)rightFront { - NSObject *obj = [store objectForKey:NAMES_rightFront]; + NSObject *obj = [store objectForKey:SDLNameRightFront]; if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { @@ -75,14 +75,14 @@ - (void)setLeftRear:(SDLSingleTireStatus *)leftRear { if (leftRear != nil) { - [store setObject:leftRear forKey:NAMES_leftRear]; + [store setObject:leftRear forKey:SDLNameLeftRear]; } else { - [store removeObjectForKey:NAMES_leftRear]; + [store removeObjectForKey:SDLNameLeftRear]; } } - (SDLSingleTireStatus *)leftRear { - NSObject *obj = [store objectForKey:NAMES_leftRear]; + NSObject *obj = [store objectForKey:SDLNameLeftRear]; if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { @@ -92,14 +92,14 @@ - (void)setRightRear:(SDLSingleTireStatus *)rightRear { if (rightRear != nil) { - [store setObject:rightRear forKey:NAMES_rightRear]; + [store setObject:rightRear forKey:SDLNameRightRear]; } else { - [store removeObjectForKey:NAMES_rightRear]; + [store removeObjectForKey:SDLNameRightRear]; } } - (SDLSingleTireStatus *)rightRear { - NSObject *obj = [store objectForKey:NAMES_rightRear]; + NSObject *obj = [store objectForKey:SDLNameRightRear]; if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { @@ -109,14 +109,14 @@ - (void)setInnerLeftRear:(SDLSingleTireStatus *)innerLeftRear { if (innerLeftRear != nil) { - [store setObject:innerLeftRear forKey:NAMES_innerLeftRear]; + [store setObject:innerLeftRear forKey:SDLNameInnerLeftRear]; } else { - [store removeObjectForKey:NAMES_innerLeftRear]; + [store removeObjectForKey:SDLNameInnerLeftRear]; } } - (SDLSingleTireStatus *)innerLeftRear { - NSObject *obj = [store objectForKey:NAMES_innerLeftRear]; + NSObject *obj = [store objectForKey:SDLNameInnerLeftRear]; if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { @@ -126,14 +126,14 @@ - (void)setInnerRightRear:(SDLSingleTireStatus *)innerRightRear { if (innerRightRear != nil) { - [store setObject:innerRightRear forKey:NAMES_innerRightRear]; + [store setObject:innerRightRear forKey:SDLNameInnerRightRear]; } else { - [store removeObjectForKey:NAMES_innerRightRear]; + [store removeObjectForKey:SDLNameInnerRightRear]; } } - (SDLSingleTireStatus *)innerRightRear { - NSObject *obj = [store objectForKey:NAMES_innerRightRear]; + NSObject *obj = [store objectForKey:SDLNameInnerRightRear]; if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { diff --git a/SmartDeviceLink/SDLTouchCoord.m b/SmartDeviceLink/SDLTouchCoord.m index 78895696f..7ccb77bdf 100644 --- a/SmartDeviceLink/SDLTouchCoord.m +++ b/SmartDeviceLink/SDLTouchCoord.m @@ -4,7 +4,7 @@ #import "SDLTouchCoord.h" -#import "SDLNames.h" + @implementation SDLTouchCoord @@ -22,26 +22,26 @@ - (void)setX:(NSNumber *)x { if (x != nil) { - [store setObject:x forKey:NAMES_x]; + [store setObject:x forKey:SDLNameX]; } else { - [store removeObjectForKey:NAMES_x]; + [store removeObjectForKey:SDLNameX]; } } - (NSNumber *)x { - return [store objectForKey:NAMES_x]; + return [store objectForKey:SDLNameX]; } - (void)setY:(NSNumber *)y { if (y != nil) { - [store setObject:y forKey:NAMES_y]; + [store setObject:y forKey:SDLNameY]; } else { - [store removeObjectForKey:NAMES_y]; + [store removeObjectForKey:SDLNameY]; } } - (NSNumber *)y { - return [store objectForKey:NAMES_y]; + return [store objectForKey:SDLNameY]; } @end diff --git a/SmartDeviceLink/SDLTouchEvent.m b/SmartDeviceLink/SDLTouchEvent.m index e54e8b79e..74f49a2c5 100644 --- a/SmartDeviceLink/SDLTouchEvent.m +++ b/SmartDeviceLink/SDLTouchEvent.m @@ -4,7 +4,7 @@ #import "SDLTouchEvent.h" -#import "SDLNames.h" + #import "SDLTouchCoord.h" @implementation SDLTouchEvent @@ -23,38 +23,38 @@ - (void)setTouchEventId:(NSNumber *)touchEventId { if (touchEventId != nil) { - [store setObject:touchEventId forKey:NAMES_id]; + [store setObject:touchEventId forKey:SDLNameId]; } else { - [store removeObjectForKey:NAMES_id]; + [store removeObjectForKey:SDLNameId]; } } - (NSNumber *)touchEventId { - return [store objectForKey:NAMES_id]; + return [store objectForKey:SDLNameId]; } - (void)setTimeStamp:(NSMutableArray *)timeStamp { if (timeStamp != nil) { - [store setObject:timeStamp forKey:NAMES_ts]; + [store setObject:timeStamp forKey:SDLNameTs]; } else { - [store removeObjectForKey:NAMES_ts]; + [store removeObjectForKey:SDLNameTs]; } } - (NSMutableArray *)timeStamp { - return [store objectForKey:NAMES_ts]; + return [store objectForKey:SDLNameTs]; } - (void)setCoord:(NSMutableArray *)coord { if (coord != nil) { - [store setObject:coord forKey:NAMES_c]; + [store setObject:coord forKey:SDLNameCoord]; } else { - [store removeObjectForKey:NAMES_c]; + [store removeObjectForKey:SDLNameCoord]; } } - (NSMutableArray *)coord { - NSMutableArray *array = [store objectForKey:NAMES_c]; + NSMutableArray *array = [store objectForKey:SDLNameCoord]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTouchCoord.class]) { return array; } else { diff --git a/SmartDeviceLink/SDLTouchEventCapabilities.m b/SmartDeviceLink/SDLTouchEventCapabilities.m index 4fc71cfec..31b9cd951 100644 --- a/SmartDeviceLink/SDLTouchEventCapabilities.m +++ b/SmartDeviceLink/SDLTouchEventCapabilities.m @@ -4,7 +4,7 @@ #import "SDLTouchEventCapabilities.h" -#import "SDLNames.h" + @implementation SDLTouchEventCapabilities @@ -22,38 +22,38 @@ - (void)setPressAvailable:(NSNumber *)pressAvailable { if (pressAvailable != nil) { - [store setObject:pressAvailable forKey:NAMES_pressAvailable]; + [store setObject:pressAvailable forKey:SDLNamePressAvailable]; } else { - [store removeObjectForKey:NAMES_pressAvailable]; + [store removeObjectForKey:SDLNamePressAvailable]; } } - (NSNumber *)pressAvailable { - return [store objectForKey:NAMES_pressAvailable]; + return [store objectForKey:SDLNamePressAvailable]; } - (void)setMultiTouchAvailable:(NSNumber *)multiTouchAvailable { if (multiTouchAvailable != nil) { - [store setObject:multiTouchAvailable forKey:NAMES_multiTouchAvailable]; + [store setObject:multiTouchAvailable forKey:SDLNameMultiTouchAvailable]; } else { - [store removeObjectForKey:NAMES_multiTouchAvailable]; + [store removeObjectForKey:SDLNameMultiTouchAvailable]; } } - (NSNumber *)multiTouchAvailable { - return [store objectForKey:NAMES_multiTouchAvailable]; + return [store objectForKey:SDLNameMultiTouchAvailable]; } - (void)setDoublePressAvailable:(NSNumber *)doublePressAvailable { if (doublePressAvailable != nil) { - [store setObject:doublePressAvailable forKey:NAMES_doublePressAvailable]; + [store setObject:doublePressAvailable forKey:SDLNameDoublePressAvailable]; } else { - [store removeObjectForKey:NAMES_doublePressAvailable]; + [store removeObjectForKey:SDLNameDoublePressAvailable]; } } - (NSNumber *)doublePressAvailable { - return [store objectForKey:NAMES_doublePressAvailable]; + return [store objectForKey:SDLNameDoublePressAvailable]; } @end diff --git a/SmartDeviceLink/SDLTurn.m b/SmartDeviceLink/SDLTurn.m index 875fa2e73..81e022db8 100644 --- a/SmartDeviceLink/SDLTurn.m +++ b/SmartDeviceLink/SDLTurn.m @@ -4,7 +4,7 @@ #import "SDLTurn.h" #import "SDLImage.h" -#import "SDLNames.h" + @implementation SDLTurn @@ -23,26 +23,26 @@ - (void)setNavigationText:(NSString *)navigationText { if (navigationText != nil) { - [store setObject:navigationText forKey:NAMES_navigationText]; + [store setObject:navigationText forKey:SDLNameNavigationText]; } else { - [store removeObjectForKey:NAMES_navigationText]; + [store removeObjectForKey:SDLNameNavigationText]; } } - (NSString *)navigationText { - return [store objectForKey:NAMES_navigationText]; + return [store objectForKey:SDLNameNavigationText]; } - (void)setTurnIcon:(SDLImage *)turnIcon { if (turnIcon != nil) { - [store setObject:turnIcon forKey:NAMES_turnIcon]; + [store setObject:turnIcon forKey:SDLNameTurnIcon]; } else { - [store removeObjectForKey:NAMES_turnIcon]; + [store removeObjectForKey:SDLNameTurnIcon]; } } - (SDLImage *)turnIcon { - NSObject *obj = [store objectForKey:NAMES_turnIcon]; + NSObject *obj = [store objectForKey:SDLNameTurnIcon]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { diff --git a/SmartDeviceLink/SDLUnregisterAppInterface.m b/SmartDeviceLink/SDLUnregisterAppInterface.m index 88039631d..91cb44f3c 100644 --- a/SmartDeviceLink/SDLUnregisterAppInterface.m +++ b/SmartDeviceLink/SDLUnregisterAppInterface.m @@ -4,12 +4,12 @@ #import "SDLUnregisterAppInterface.h" -#import "SDLNames.h" + @implementation SDLUnregisterAppInterface - (instancetype)init { - if (self = [super initWithName:NAMES_UnregisterAppInterface]) { + if (self = [super initWithName:SDLNameUnregisterAppInterface]) { } return self; } diff --git a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m index 6bebbe83d..0e366aec7 100644 --- a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m +++ b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m @@ -4,12 +4,12 @@ #import "SDLUnregisterAppInterfaceResponse.h" -#import "SDLNames.h" + @implementation SDLUnregisterAppInterfaceResponse - (instancetype)init { - if (self = [super initWithName:NAMES_UnregisterAppInterface]) { + if (self = [super initWithName:SDLNameUnregisterAppInterface]) { } return self; } diff --git a/SmartDeviceLink/SDLUnsubscribeButton.m b/SmartDeviceLink/SDLUnsubscribeButton.m index 9853fa9da..88c24bd34 100644 --- a/SmartDeviceLink/SDLUnsubscribeButton.m +++ b/SmartDeviceLink/SDLUnsubscribeButton.m @@ -5,13 +5,13 @@ #import "SDLUnsubscribeButton.h" #import "SDLButtonName.h" -#import "SDLNames.h" + @implementation SDLUnsubscribeButton - (instancetype)init { - if (self = [super initWithName:NAMES_UnsubscribeButton]) { + if (self = [super initWithName:SDLNameUnsubscribeButton]) { } return self; } @@ -24,14 +24,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 { diff --git a/SmartDeviceLink/SDLUnsubscribeButtonResponse.m b/SmartDeviceLink/SDLUnsubscribeButtonResponse.m index a28cf2768..8fd89def6 100644 --- a/SmartDeviceLink/SDLUnsubscribeButtonResponse.m +++ b/SmartDeviceLink/SDLUnsubscribeButtonResponse.m @@ -4,12 +4,12 @@ #import "SDLUnsubscribeButtonResponse.h" -#import "SDLNames.h" + @implementation SDLUnsubscribeButtonResponse - (instancetype)init { - if (self = [super initWithName:NAMES_UnsubscribeButton]) { + if (self = [super initWithName:SDLNameUnsubscribeButton]) { } return self; } diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m index 11aa044e1..00bbc4d2b 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m @@ -4,12 +4,12 @@ #import "SDLUnsubscribeVehicleData.h" -#import "SDLNames.h" + @implementation SDLUnsubscribeVehicleData - (instancetype)init { - if (self = [super initWithName:NAMES_UnsubscribeVehicleData]) { + if (self = [super initWithName:SDLNameUnsubscribeVehicleData]) { } return self; } @@ -22,290 +22,290 @@ - (void)setGps:(NSNumber *)gps { if (gps != nil) { - [parameters setObject:gps forKey:NAMES_gps]; + [parameters setObject:gps forKey:SDLNameGps]; } else { - [parameters removeObjectForKey:NAMES_gps]; + [parameters removeObjectForKey:SDLNameGps]; } } - (NSNumber *)gps { - return [parameters objectForKey:NAMES_gps]; + return [parameters objectForKey:SDLNameGps]; } - (void)setSpeed:(NSNumber *)speed { if (speed != nil) { - [parameters setObject:speed forKey:NAMES_speed]; + [parameters setObject:speed forKey:SDLNameSpeed]; } else { - [parameters removeObjectForKey:NAMES_speed]; + [parameters removeObjectForKey:SDLNameSpeed]; } } - (NSNumber *)speed { - return [parameters objectForKey:NAMES_speed]; + return [parameters objectForKey:SDLNameSpeed]; } - (void)setRpm:(NSNumber *)rpm { if (rpm != nil) { - [parameters setObject:rpm forKey:NAMES_rpm]; + [parameters setObject:rpm forKey:SDLNameRpm]; } else { - [parameters removeObjectForKey:NAMES_rpm]; + [parameters removeObjectForKey:SDLNameRpm]; } } - (NSNumber *)rpm { - return [parameters objectForKey:NAMES_rpm]; + return [parameters objectForKey:SDLNameRpm]; } - (void)setFuelLevel:(NSNumber *)fuelLevel { if (fuelLevel != nil) { - [parameters setObject:fuelLevel forKey:NAMES_fuelLevel]; + [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel]; + [parameters removeObjectForKey:SDLNameFuelLevel]; } } - (NSNumber *)fuelLevel { - return [parameters objectForKey:NAMES_fuelLevel]; + return [parameters objectForKey:SDLNameFuelLevel]; } - (void)setFuelLevel_State:(NSNumber *)fuelLevel_State { if (fuelLevel_State != nil) { - [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State]; + [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel_State]; + [parameters removeObjectForKey:SDLNameFuelLevelState]; } } - (NSNumber *)fuelLevel_State { - return [parameters objectForKey:NAMES_fuelLevel_State]; + return [parameters objectForKey:SDLNameFuelLevelState]; } - (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption { if (instantFuelConsumption != nil) { - [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption]; + [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { - [parameters removeObjectForKey:NAMES_instantFuelConsumption]; + [parameters removeObjectForKey:SDLNameInstantFuelConsumption]; } } - (NSNumber *)instantFuelConsumption { - return [parameters objectForKey:NAMES_instantFuelConsumption]; + return [parameters objectForKey:SDLNameInstantFuelConsumption]; } - (void)setExternalTemperature:(NSNumber *)externalTemperature { if (externalTemperature != nil) { - [parameters setObject:externalTemperature forKey:NAMES_externalTemperature]; + [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { - [parameters removeObjectForKey:NAMES_externalTemperature]; + [parameters removeObjectForKey:SDLNameExternalTemperature]; } } - (NSNumber *)externalTemperature { - return [parameters objectForKey:NAMES_externalTemperature]; + return [parameters objectForKey:SDLNameExternalTemperature]; } - (void)setPrndl:(NSNumber *)prndl { if (prndl != nil) { - [parameters setObject:prndl forKey:NAMES_prndl]; + [parameters setObject:prndl forKey:SDLNamePrndl]; } else { - [parameters removeObjectForKey:NAMES_prndl]; + [parameters removeObjectForKey:SDLNamePrndl]; } } - (NSNumber *)prndl { - return [parameters objectForKey:NAMES_prndl]; + return [parameters objectForKey:SDLNamePrndl]; } - (void)setTirePressure:(NSNumber *)tirePressure { if (tirePressure != nil) { - [parameters setObject:tirePressure forKey:NAMES_tirePressure]; + [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { - [parameters removeObjectForKey:NAMES_tirePressure]; + [parameters removeObjectForKey:SDLNameTirePressure]; } } - (NSNumber *)tirePressure { - return [parameters objectForKey:NAMES_tirePressure]; + return [parameters objectForKey:SDLNameTirePressure]; } - (void)setOdometer:(NSNumber *)odometer { if (odometer != nil) { - [parameters setObject:odometer forKey:NAMES_odometer]; + [parameters setObject:odometer forKey:SDLNameOdometer]; } else { - [parameters removeObjectForKey:NAMES_odometer]; + [parameters removeObjectForKey:SDLNameOdometer]; } } - (NSNumber *)odometer { - return [parameters objectForKey:NAMES_odometer]; + return [parameters objectForKey:SDLNameOdometer]; } - (void)setBeltStatus:(NSNumber *)beltStatus { if (beltStatus != nil) { - [parameters setObject:beltStatus forKey:NAMES_beltStatus]; + [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { - [parameters removeObjectForKey:NAMES_beltStatus]; + [parameters removeObjectForKey:SDLNameBeltStatus]; } } - (NSNumber *)beltStatus { - return [parameters objectForKey:NAMES_beltStatus]; + return [parameters objectForKey:SDLNameBeltStatus]; } - (void)setBodyInformation:(NSNumber *)bodyInformation { if (bodyInformation != nil) { - [parameters setObject:bodyInformation forKey:NAMES_bodyInformation]; + [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { - [parameters removeObjectForKey:NAMES_bodyInformation]; + [parameters removeObjectForKey:SDLNameBodyInformation]; } } - (NSNumber *)bodyInformation { - return [parameters objectForKey:NAMES_bodyInformation]; + return [parameters objectForKey:SDLNameBodyInformation]; } - (void)setDeviceStatus:(NSNumber *)deviceStatus { if (deviceStatus != nil) { - [parameters setObject:deviceStatus forKey:NAMES_deviceStatus]; + [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { - [parameters removeObjectForKey:NAMES_deviceStatus]; + [parameters removeObjectForKey:SDLNameDeviceStatus]; } } - (NSNumber *)deviceStatus { - return [parameters objectForKey:NAMES_deviceStatus]; + return [parameters objectForKey:SDLNameDeviceStatus]; } - (void)setDriverBraking:(NSNumber *)driverBraking { if (driverBraking != nil) { - [parameters setObject:driverBraking forKey:NAMES_driverBraking]; + [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { - [parameters removeObjectForKey:NAMES_driverBraking]; + [parameters removeObjectForKey:SDLNameDriverBraking]; } } - (NSNumber *)driverBraking { - return [parameters objectForKey:NAMES_driverBraking]; + return [parameters objectForKey:SDLNameDriverBraking]; } - (void)setWiperStatus:(NSNumber *)wiperStatus { if (wiperStatus != nil) { - [parameters setObject:wiperStatus forKey:NAMES_wiperStatus]; + [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { - [parameters removeObjectForKey:NAMES_wiperStatus]; + [parameters removeObjectForKey:SDLNameWiperStatus]; } } - (NSNumber *)wiperStatus { - return [parameters objectForKey:NAMES_wiperStatus]; + return [parameters objectForKey:SDLNameWiperStatus]; } - (void)setHeadLampStatus:(NSNumber *)headLampStatus { if (headLampStatus != nil) { - [parameters setObject:headLampStatus forKey:NAMES_headLampStatus]; + [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { - [parameters removeObjectForKey:NAMES_headLampStatus]; + [parameters removeObjectForKey:SDLNameHeadLampStatus]; } } - (NSNumber *)headLampStatus { - return [parameters objectForKey:NAMES_headLampStatus]; + return [parameters objectForKey:SDLNameHeadLampStatus]; } - (void)setEngineTorque:(NSNumber *)engineTorque { if (engineTorque != nil) { - [parameters setObject:engineTorque forKey:NAMES_engineTorque]; + [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { - [parameters removeObjectForKey:NAMES_engineTorque]; + [parameters removeObjectForKey:SDLNameEngineTorque]; } } - (NSNumber *)engineTorque { - return [parameters objectForKey:NAMES_engineTorque]; + return [parameters objectForKey:SDLNameEngineTorque]; } - (void)setAccPedalPosition:(NSNumber *)accPedalPosition { if (accPedalPosition != nil) { - [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition]; + [parameters setObject:accPedalPosition forKey:SDLNameAccPedalPosition]; } else { - [parameters removeObjectForKey:NAMES_accPedalPosition]; + [parameters removeObjectForKey:SDLNameAccPedalPosition]; } } - (NSNumber *)accPedalPosition { - return [parameters objectForKey:NAMES_accPedalPosition]; + return [parameters objectForKey:SDLNameAccPedalPosition]; } - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle { if (steeringWheelAngle != nil) { - [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle]; + [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { - [parameters removeObjectForKey:NAMES_steeringWheelAngle]; + [parameters removeObjectForKey:SDLNameSteeringWheelAngle]; } } - (NSNumber *)steeringWheelAngle { - return [parameters objectForKey:NAMES_steeringWheelAngle]; + return [parameters objectForKey:SDLNameSteeringWheelAngle]; } - (void)setECallInfo:(NSNumber *)eCallInfo { if (eCallInfo != nil) { - [parameters setObject:eCallInfo forKey:NAMES_eCallInfo]; + [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { - [parameters removeObjectForKey:NAMES_eCallInfo]; + [parameters removeObjectForKey:SDLNameECallInfo]; } } - (NSNumber *)eCallInfo { - return [parameters objectForKey:NAMES_eCallInfo]; + return [parameters objectForKey:SDLNameECallInfo]; } - (void)setAirbagStatus:(NSNumber *)airbagStatus { if (airbagStatus != nil) { - [parameters setObject:airbagStatus forKey:NAMES_airbagStatus]; + [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { - [parameters removeObjectForKey:NAMES_airbagStatus]; + [parameters removeObjectForKey:SDLNameAirbagStatus]; } } - (NSNumber *)airbagStatus { - return [parameters objectForKey:NAMES_airbagStatus]; + return [parameters objectForKey:SDLNameAirbagStatus]; } - (void)setEmergencyEvent:(NSNumber *)emergencyEvent { if (emergencyEvent != nil) { - [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent]; + [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { - [parameters removeObjectForKey:NAMES_emergencyEvent]; + [parameters removeObjectForKey:SDLNameEmergencyEvent]; } } - (NSNumber *)emergencyEvent { - return [parameters objectForKey:NAMES_emergencyEvent]; + return [parameters objectForKey:SDLNameEmergencyEvent]; } - (void)setClusterModeStatus:(NSNumber *)clusterModeStatus { if (clusterModeStatus != nil) { - [parameters setObject:clusterModeStatus forKey:NAMES_clusterModeStatus]; + [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus]; } else { - [parameters removeObjectForKey:NAMES_clusterModeStatus]; + [parameters removeObjectForKey:SDLNameClusterModeStatus]; } } - (NSNumber *)clusterModeStatus { - return [parameters objectForKey:NAMES_clusterModeStatus]; + return [parameters objectForKey:SDLNameClusterModeStatus]; } - (void)setMyKey:(NSNumber *)myKey { if (myKey != nil) { - [parameters setObject:myKey forKey:NAMES_myKey]; + [parameters setObject:myKey forKey:SDLNameMyKey]; } else { - [parameters removeObjectForKey:NAMES_myKey]; + [parameters removeObjectForKey:SDLNameMyKey]; } } - (NSNumber *)myKey { - return [parameters objectForKey:NAMES_myKey]; + return [parameters objectForKey:SDLNameMyKey]; } @end diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m index ec4916447..88524d9e1 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m @@ -4,14 +4,14 @@ #import "SDLUnsubscribeVehicleDataResponse.h" -#import "SDLNames.h" + #import "SDLVehicleDataResult.h" @implementation SDLUnsubscribeVehicleDataResponse - (instancetype)init { - if (self = [super initWithName:NAMES_UnsubscribeVehicleData]) { + if (self = [super initWithName:SDLNameUnsubscribeVehicleData]) { } return self; } @@ -24,14 +24,14 @@ - (void)setGps:(SDLVehicleDataResult *)gps { if (gps != nil) { - [parameters setObject:gps forKey:NAMES_gps]; + [parameters setObject:gps forKey:SDLNameGps]; } else { - [parameters removeObjectForKey:NAMES_gps]; + [parameters removeObjectForKey:SDLNameGps]; } } - (SDLVehicleDataResult *)gps { - NSObject *obj = [parameters objectForKey:NAMES_gps]; + NSObject *obj = [parameters objectForKey:SDLNameGps]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -41,14 +41,14 @@ - (void)setSpeed:(SDLVehicleDataResult *)speed { if (speed != nil) { - [parameters setObject:speed forKey:NAMES_speed]; + [parameters setObject:speed forKey:SDLNameSpeed]; } else { - [parameters removeObjectForKey:NAMES_speed]; + [parameters removeObjectForKey:SDLNameSpeed]; } } - (SDLVehicleDataResult *)speed { - NSObject *obj = [parameters objectForKey:NAMES_speed]; + NSObject *obj = [parameters objectForKey:SDLNameSpeed]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -58,14 +58,14 @@ - (void)setRpm:(SDLVehicleDataResult *)rpm { if (rpm != nil) { - [parameters setObject:rpm forKey:NAMES_rpm]; + [parameters setObject:rpm forKey:SDLNameRpm]; } else { - [parameters removeObjectForKey:NAMES_rpm]; + [parameters removeObjectForKey:SDLNameRpm]; } } - (SDLVehicleDataResult *)rpm { - NSObject *obj = [parameters objectForKey:NAMES_rpm]; + NSObject *obj = [parameters objectForKey:SDLNameRpm]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -75,14 +75,14 @@ - (void)setFuelLevel:(SDLVehicleDataResult *)fuelLevel { if (fuelLevel != nil) { - [parameters setObject:fuelLevel forKey:NAMES_fuelLevel]; + [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel]; + [parameters removeObjectForKey:SDLNameFuelLevel]; } } - (SDLVehicleDataResult *)fuelLevel { - NSObject *obj = [parameters objectForKey:NAMES_fuelLevel]; + NSObject *obj = [parameters objectForKey:SDLNameFuelLevel]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -92,14 +92,14 @@ - (void)setFuelLevel_State:(SDLVehicleDataResult *)fuelLevel_State { if (fuelLevel_State != nil) { - [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State]; + [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel_State]; + [parameters removeObjectForKey:SDLNameFuelLevelState]; } } - (SDLVehicleDataResult *)fuelLevel_State { - NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State]; + NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -109,14 +109,14 @@ - (void)setInstantFuelConsumption:(SDLVehicleDataResult *)instantFuelConsumption { if (instantFuelConsumption != nil) { - [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption]; + [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { - [parameters removeObjectForKey:NAMES_instantFuelConsumption]; + [parameters removeObjectForKey:SDLNameInstantFuelConsumption]; } } - (SDLVehicleDataResult *)instantFuelConsumption { - NSObject *obj = [parameters objectForKey:NAMES_instantFuelConsumption]; + NSObject *obj = [parameters objectForKey:SDLNameInstantFuelConsumption]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -126,14 +126,14 @@ - (void)setExternalTemperature:(SDLVehicleDataResult *)externalTemperature { if (externalTemperature != nil) { - [parameters setObject:externalTemperature forKey:NAMES_externalTemperature]; + [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { - [parameters removeObjectForKey:NAMES_externalTemperature]; + [parameters removeObjectForKey:SDLNameExternalTemperature]; } } - (SDLVehicleDataResult *)externalTemperature { - NSObject *obj = [parameters objectForKey:NAMES_externalTemperature]; + NSObject *obj = [parameters objectForKey:SDLNameExternalTemperature]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -143,14 +143,14 @@ - (void)setPrndl:(SDLVehicleDataResult *)prndl { if (prndl != nil) { - [parameters setObject:prndl forKey:NAMES_prndl]; + [parameters setObject:prndl forKey:SDLNamePrndl]; } else { - [parameters removeObjectForKey:NAMES_prndl]; + [parameters removeObjectForKey:SDLNamePrndl]; } } - (SDLVehicleDataResult *)prndl { - NSObject *obj = [parameters objectForKey:NAMES_prndl]; + NSObject *obj = [parameters objectForKey:SDLNamePrndl]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -160,14 +160,14 @@ - (void)setTirePressure:(SDLVehicleDataResult *)tirePressure { if (tirePressure != nil) { - [parameters setObject:tirePressure forKey:NAMES_tirePressure]; + [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { - [parameters removeObjectForKey:NAMES_tirePressure]; + [parameters removeObjectForKey:SDLNameTirePressure]; } } - (SDLVehicleDataResult *)tirePressure { - NSObject *obj = [parameters objectForKey:NAMES_tirePressure]; + NSObject *obj = [parameters objectForKey:SDLNameTirePressure]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -177,14 +177,14 @@ - (void)setOdometer:(SDLVehicleDataResult *)odometer { if (odometer != nil) { - [parameters setObject:odometer forKey:NAMES_odometer]; + [parameters setObject:odometer forKey:SDLNameOdometer]; } else { - [parameters removeObjectForKey:NAMES_odometer]; + [parameters removeObjectForKey:SDLNameOdometer]; } } - (SDLVehicleDataResult *)odometer { - NSObject *obj = [parameters objectForKey:NAMES_odometer]; + NSObject *obj = [parameters objectForKey:SDLNameOdometer]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -194,14 +194,14 @@ - (void)setBeltStatus:(SDLVehicleDataResult *)beltStatus { if (beltStatus != nil) { - [parameters setObject:beltStatus forKey:NAMES_beltStatus]; + [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { - [parameters removeObjectForKey:NAMES_beltStatus]; + [parameters removeObjectForKey:SDLNameBeltStatus]; } } - (SDLVehicleDataResult *)beltStatus { - NSObject *obj = [parameters objectForKey:NAMES_beltStatus]; + NSObject *obj = [parameters objectForKey:SDLNameBeltStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -211,14 +211,14 @@ - (void)setBodyInformation:(SDLVehicleDataResult *)bodyInformation { if (bodyInformation != nil) { - [parameters setObject:bodyInformation forKey:NAMES_bodyInformation]; + [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { - [parameters removeObjectForKey:NAMES_bodyInformation]; + [parameters removeObjectForKey:SDLNameBodyInformation]; } } - (SDLVehicleDataResult *)bodyInformation { - NSObject *obj = [parameters objectForKey:NAMES_bodyInformation]; + NSObject *obj = [parameters objectForKey:SDLNameBodyInformation]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -228,14 +228,14 @@ - (void)setDeviceStatus:(SDLVehicleDataResult *)deviceStatus { if (deviceStatus != nil) { - [parameters setObject:deviceStatus forKey:NAMES_deviceStatus]; + [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { - [parameters removeObjectForKey:NAMES_deviceStatus]; + [parameters removeObjectForKey:SDLNameDeviceStatus]; } } - (SDLVehicleDataResult *)deviceStatus { - NSObject *obj = [parameters objectForKey:NAMES_deviceStatus]; + NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -245,14 +245,14 @@ - (void)setDriverBraking:(SDLVehicleDataResult *)driverBraking { if (driverBraking != nil) { - [parameters setObject:driverBraking forKey:NAMES_driverBraking]; + [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { - [parameters removeObjectForKey:NAMES_driverBraking]; + [parameters removeObjectForKey:SDLNameDriverBraking]; } } - (SDLVehicleDataResult *)driverBraking { - NSObject *obj = [parameters objectForKey:NAMES_driverBraking]; + NSObject *obj = [parameters objectForKey:SDLNameDriverBraking]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -262,14 +262,14 @@ - (void)setWiperStatus:(SDLVehicleDataResult *)wiperStatus { if (wiperStatus != nil) { - [parameters setObject:wiperStatus forKey:NAMES_wiperStatus]; + [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { - [parameters removeObjectForKey:NAMES_wiperStatus]; + [parameters removeObjectForKey:SDLNameWiperStatus]; } } - (SDLVehicleDataResult *)wiperStatus { - NSObject *obj = [parameters objectForKey:NAMES_wiperStatus]; + NSObject *obj = [parameters objectForKey:SDLNameWiperStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -279,14 +279,14 @@ - (void)setHeadLampStatus:(SDLVehicleDataResult *)headLampStatus { if (headLampStatus != nil) { - [parameters setObject:headLampStatus forKey:NAMES_headLampStatus]; + [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { - [parameters removeObjectForKey:NAMES_headLampStatus]; + [parameters removeObjectForKey:SDLNameHeadLampStatus]; } } - (SDLVehicleDataResult *)headLampStatus { - NSObject *obj = [parameters objectForKey:NAMES_headLampStatus]; + NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -296,14 +296,14 @@ - (void)setEngineTorque:(SDLVehicleDataResult *)engineTorque { if (engineTorque != nil) { - [parameters setObject:engineTorque forKey:NAMES_engineTorque]; + [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { - [parameters removeObjectForKey:NAMES_engineTorque]; + [parameters removeObjectForKey:SDLNameEngineTorque]; } } - (SDLVehicleDataResult *)engineTorque { - NSObject *obj = [parameters objectForKey:NAMES_engineTorque]; + NSObject *obj = [parameters objectForKey:SDLNameEngineTorque]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -313,14 +313,14 @@ - (void)setAccPedalPosition:(SDLVehicleDataResult *)accPedalPosition { if (accPedalPosition != nil) { - [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition]; + [parameters setObject:accPedalPosition forKey:SDLNameAccPedalPosition]; } else { - [parameters removeObjectForKey:NAMES_accPedalPosition]; + [parameters removeObjectForKey:SDLNameAccPedalPosition]; } } - (SDLVehicleDataResult *)accPedalPosition { - NSObject *obj = [parameters objectForKey:NAMES_accPedalPosition]; + NSObject *obj = [parameters objectForKey:SDLNameAccPedalPosition]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -330,14 +330,14 @@ - (void)setSteeringWheelAngle:(SDLVehicleDataResult *)steeringWheelAngle { if (steeringWheelAngle != nil) { - [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle]; + [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { - [parameters removeObjectForKey:NAMES_steeringWheelAngle]; + [parameters removeObjectForKey:SDLNameSteeringWheelAngle]; } } - (SDLVehicleDataResult *)steeringWheelAngle { - NSObject *obj = [parameters objectForKey:NAMES_steeringWheelAngle]; + NSObject *obj = [parameters objectForKey:SDLNameSteeringWheelAngle]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -347,14 +347,14 @@ - (void)setECallInfo:(SDLVehicleDataResult *)eCallInfo { if (eCallInfo != nil) { - [parameters setObject:eCallInfo forKey:NAMES_eCallInfo]; + [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { - [parameters removeObjectForKey:NAMES_eCallInfo]; + [parameters removeObjectForKey:SDLNameECallInfo]; } } - (SDLVehicleDataResult *)eCallInfo { - NSObject *obj = [parameters objectForKey:NAMES_eCallInfo]; + NSObject *obj = [parameters objectForKey:SDLNameECallInfo]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -364,14 +364,14 @@ - (void)setAirbagStatus:(SDLVehicleDataResult *)airbagStatus { if (airbagStatus != nil) { - [parameters setObject:airbagStatus forKey:NAMES_airbagStatus]; + [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { - [parameters removeObjectForKey:NAMES_airbagStatus]; + [parameters removeObjectForKey:SDLNameAirbagStatus]; } } - (SDLVehicleDataResult *)airbagStatus { - NSObject *obj = [parameters objectForKey:NAMES_airbagStatus]; + NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -381,14 +381,14 @@ - (void)setEmergencyEvent:(SDLVehicleDataResult *)emergencyEvent { if (emergencyEvent != nil) { - [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent]; + [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { - [parameters removeObjectForKey:NAMES_emergencyEvent]; + [parameters removeObjectForKey:SDLNameEmergencyEvent]; } } - (SDLVehicleDataResult *)emergencyEvent { - NSObject *obj = [parameters objectForKey:NAMES_emergencyEvent]; + NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -398,14 +398,14 @@ - (void)setClusterModes:(SDLVehicleDataResult *)clusterModes { if (clusterModes != nil) { - [parameters setObject:clusterModes forKey:NAMES_clusterModes]; + [parameters setObject:clusterModes forKey:SDLNameClusterModes]; } else { - [parameters removeObjectForKey:NAMES_clusterModes]; + [parameters removeObjectForKey:SDLNameClusterModes]; } } - (SDLVehicleDataResult *)clusterModes { - NSObject *obj = [parameters objectForKey:NAMES_clusterModes]; + NSObject *obj = [parameters objectForKey:SDLNameClusterModes]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { @@ -415,14 +415,14 @@ - (void)setMyKey:(SDLVehicleDataResult *)myKey { if (myKey != nil) { - [parameters setObject:myKey forKey:NAMES_myKey]; + [parameters setObject:myKey forKey:SDLNameMyKey]; } else { - [parameters removeObjectForKey:NAMES_myKey]; + [parameters removeObjectForKey:SDLNameMyKey]; } } - (SDLVehicleDataResult *)myKey { - NSObject *obj = [parameters objectForKey:NAMES_myKey]; + NSObject *obj = [parameters objectForKey:SDLNameMyKey]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { diff --git a/SmartDeviceLink/SDLUpdateTurnList.m b/SmartDeviceLink/SDLUpdateTurnList.m index 7063c9c29..a8d62646d 100644 --- a/SmartDeviceLink/SDLUpdateTurnList.m +++ b/SmartDeviceLink/SDLUpdateTurnList.m @@ -4,14 +4,14 @@ #import "SDLUpdateTurnList.h" -#import "SDLNames.h" + #import "SDLSoftButton.h" #import "SDLTurn.h" @implementation SDLUpdateTurnList - (instancetype)init { - if (self = [super initWithName:NAMES_UpdateTurnList]) { + if (self = [super initWithName:SDLNameUpdateTurnList]) { } return self; } @@ -24,14 +24,14 @@ - (void)setTurnList:(NSMutableArray *)turnList { if (turnList != nil) { - [parameters setObject:turnList forKey:NAMES_turnList]; + [parameters setObject:turnList forKey:SDLNameTurnList]; } else { - [parameters removeObjectForKey:NAMES_turnList]; + [parameters removeObjectForKey:SDLNameTurnList]; } } - (NSMutableArray *)turnList { - NSMutableArray *array = [parameters objectForKey:NAMES_turnList]; + NSMutableArray *array = [parameters objectForKey:SDLNameTurnList]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTurn.class]) { return array; } else { @@ -45,14 +45,14 @@ - (void)setSoftButtons:(NSMutableArray *)softButtons { if (softButtons != nil) { - [parameters setObject:softButtons forKey:NAMES_softButtons]; + [parameters setObject:softButtons forKey:SDLNameSoftButtons]; } else { - [parameters removeObjectForKey:NAMES_softButtons]; + [parameters removeObjectForKey:SDLNameSoftButtons]; } } - (NSMutableArray *)softButtons { - NSMutableArray *array = [parameters objectForKey:NAMES_softButtons]; + NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtons]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) { return array; } else { diff --git a/SmartDeviceLink/SDLUpdateTurnListResponse.m b/SmartDeviceLink/SDLUpdateTurnListResponse.m index 18e04082b..09781ef3e 100644 --- a/SmartDeviceLink/SDLUpdateTurnListResponse.m +++ b/SmartDeviceLink/SDLUpdateTurnListResponse.m @@ -4,12 +4,12 @@ #import "SDLUpdateTurnListResponse.h" -#import "SDLNames.h" + @implementation SDLUpdateTurnListResponse - (instancetype)init { - if (self = [super initWithName:NAMES_UpdateTurnList]) { + if (self = [super initWithName:SDLNameUpdateTurnList]) { } return self; } diff --git a/SmartDeviceLink/SDLV2ProtocolMessage.m b/SmartDeviceLink/SDLV2ProtocolMessage.m index 5b033b7f3..5f1aa5492 100644 --- a/SmartDeviceLink/SDLV2ProtocolMessage.m +++ b/SmartDeviceLink/SDLV2ProtocolMessage.m @@ -4,7 +4,7 @@ #import "SDLV2ProtocolMessage.h" #import "SDLFunctionID.h" #import "SDLJsonDecoder.h" -#import "SDLNames.h" + #import "SDLProtocolHeader.h" #import "SDLRPCPayload.h" @@ -34,25 +34,25 @@ // Create the inner dictionary with the RPC properties NSMutableDictionary *innerDictionary = [[NSMutableDictionary alloc] init]; NSString *functionName = [[[SDLFunctionID alloc] init] getFunctionName:rpcPayload.functionID]; - [innerDictionary setObject:functionName forKey:NAMES_operation_name]; - [innerDictionary setObject:[NSNumber numberWithInt:rpcPayload.correlationID] forKey:NAMES_correlationID]; + [innerDictionary setObject:functionName forKey:SDLNameOperationName]; + [innerDictionary setObject:[NSNumber numberWithInt:rpcPayload.correlationID] forKey:SDLNameCorrelationId]; // Get the json data from the struct if (rpcPayload.jsonData) { NSDictionary *jsonDictionary = [[SDLJsonDecoder instance] decode:rpcPayload.jsonData]; if (jsonDictionary) { - [innerDictionary setObject:jsonDictionary forKey:NAMES_parameters]; + [innerDictionary setObject:jsonDictionary forKey:SDLNameParameters]; } } // Store it in the containing dictionary UInt8 rpcType = rpcPayload.rpcType; - NSArray *rpcTypeNames = @[NAMES_request, NAMES_response, NAMES_notification]; + NSArray *rpcTypeNames = @[SDLNameRequest, SDLNameResponse, SDLNameNotification]; [rpcMessageAsDictionary setObject:innerDictionary forKey:rpcTypeNames[rpcType]]; // The bulk data also goes in the dictionary if (rpcPayload.binaryData) { - [rpcMessageAsDictionary setObject:rpcPayload.binaryData forKey:NAMES_bulkData]; + [rpcMessageAsDictionary setObject:rpcPayload.binaryData forKey:SDLNameBulkData]; } return rpcMessageAsDictionary; diff --git a/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink/SDLVehicleDataResult.m index e395717eb..0100522e5 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.m +++ b/SmartDeviceLink/SDLVehicleDataResult.m @@ -3,7 +3,7 @@ #import "SDLVehicleDataResult.h" -#import "SDLNames.h" + #import "SDLVehicleDataResultCode.h" #import "SDLVehicleDataType.h" @@ -24,14 +24,14 @@ - (void)setDataType:(SDLVehicleDataType *)dataType { if (dataType != nil) { - [store setObject:dataType forKey:NAMES_dataType]; + [store setObject:dataType forKey:SDLNameDataType]; } else { - [store removeObjectForKey:NAMES_dataType]; + [store removeObjectForKey:SDLNameDataType]; } } - (SDLVehicleDataType *)dataType { - NSObject *obj = [store objectForKey:NAMES_dataType]; + NSObject *obj = [store objectForKey:SDLNameDataType]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataType.class]) { return (SDLVehicleDataType *)obj; } else { @@ -41,14 +41,14 @@ - (void)setResultCode:(SDLVehicleDataResultCode *)resultCode { if (resultCode != nil) { - [store setObject:resultCode forKey:NAMES_resultCode]; + [store setObject:resultCode forKey:SDLNameResultCode]; } else { - [store removeObjectForKey:NAMES_resultCode]; + [store removeObjectForKey:SDLNameResultCode]; } } - (SDLVehicleDataResultCode *)resultCode { - NSObject *obj = [store objectForKey:NAMES_resultCode]; + NSObject *obj = [store objectForKey:SDLNameResultCode]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResultCode.class]) { return (SDLVehicleDataResultCode *)obj; } else { diff --git a/SmartDeviceLink/SDLVehicleType.m b/SmartDeviceLink/SDLVehicleType.m index ebee2de7f..aea0aa461 100644 --- a/SmartDeviceLink/SDLVehicleType.m +++ b/SmartDeviceLink/SDLVehicleType.m @@ -4,7 +4,7 @@ #import "SDLVehicleType.h" -#import "SDLNames.h" + @implementation SDLVehicleType @@ -22,50 +22,50 @@ - (void)setMake:(NSString *)make { if (make != nil) { - [store setObject:make forKey:NAMES_make]; + [store setObject:make forKey:SDLNameMake]; } else { - [store removeObjectForKey:NAMES_make]; + [store removeObjectForKey:SDLNameMake]; } } - (NSString *)make { - return [store objectForKey:NAMES_make]; + return [store objectForKey:SDLNameMake]; } - (void)setModel:(NSString *)model { if (model != nil) { - [store setObject:model forKey:NAMES_model]; + [store setObject:model forKey:SDLNameModel]; } else { - [store removeObjectForKey:NAMES_model]; + [store removeObjectForKey:SDLNameModel]; } } - (NSString *)model { - return [store objectForKey:NAMES_model]; + return [store objectForKey:SDLNameModel]; } - (void)setModelYear:(NSString *)modelYear { if (modelYear != nil) { - [store setObject:modelYear forKey:NAMES_modelYear]; + [store setObject:modelYear forKey:SDLNameModelYear]; } else { - [store removeObjectForKey:NAMES_modelYear]; + [store removeObjectForKey:SDLNameModelYear]; } } - (NSString *)modelYear { - return [store objectForKey:NAMES_modelYear]; + return [store objectForKey:SDLNameModelYear]; } - (void)setTrim:(NSString *)trim { if (trim != nil) { - [store setObject:trim forKey:NAMES_trim]; + [store setObject:trim forKey:SDLNameTrim]; } else { - [store removeObjectForKey:NAMES_trim]; + [store removeObjectForKey:SDLNameTrim]; } } - (NSString *)trim { - return [store objectForKey:NAMES_trim]; + return [store objectForKey:SDLNameTrim]; } @end diff --git a/SmartDeviceLink/SDLVrHelpItem.m b/SmartDeviceLink/SDLVrHelpItem.m index 4ed2c1409..d28b7563b 100644 --- a/SmartDeviceLink/SDLVrHelpItem.m +++ b/SmartDeviceLink/SDLVrHelpItem.m @@ -5,7 +5,7 @@ #import "SDLVRHelpItem.h" #import "SDLImage.h" -#import "SDLNames.h" + @implementation SDLVRHelpItem @@ -23,26 +23,26 @@ - (void)setText:(NSString *)text { if (text != nil) { - [store setObject:text forKey:NAMES_text]; + [store setObject:text forKey:SDLNameText]; } else { - [store removeObjectForKey:NAMES_text]; + [store removeObjectForKey:SDLNameText]; } } - (NSString *)text { - return [store objectForKey:NAMES_text]; + return [store objectForKey:SDLNameText]; } - (void)setImage:(SDLImage *)image { if (image != nil) { - [store setObject:image forKey:NAMES_image]; + [store setObject:image forKey:SDLNameImage]; } else { - [store removeObjectForKey:NAMES_image]; + [store removeObjectForKey:SDLNameImage]; } } - (SDLImage *)image { - NSObject *obj = [store objectForKey:NAMES_image]; + NSObject *obj = [store objectForKey:SDLNameImage]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { @@ -52,14 +52,14 @@ - (void)setPosition:(NSNumber *)position { if (position != nil) { - [store setObject:position forKey:NAMES_position]; + [store setObject:position forKey:SDLNamePosition]; } else { - [store removeObjectForKey:NAMES_position]; + [store removeObjectForKey:SDLNamePosition]; } } - (NSNumber *)position { - return [store objectForKey:NAMES_position]; + return [store objectForKey:SDLNamePosition]; } @end diff --git a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m index 10efc2554..f95d26b78 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m @@ -25,12 +25,12 @@ QuickSpecBegin(SDLProtocolSpec) //Test dictionaries -NSDictionary* dictionaryV1 = @{NAMES_request: - @{NAMES_operation_name:@"DeleteCommand", - NAMES_correlationID:@0x98765, - NAMES_parameters: - @{NAMES_cmdID:@55}}}; -NSDictionary* dictionaryV2 = @{NAMES_cmdID:@55}; +NSDictionary* dictionaryV1 = @{SDLNameRequest: + @{SDLNameOperationName:@"DeleteCommand", + SDLNameCorrelationId:@0x98765, + SDLNameParameters: + @{SDLNameCommandId:@55}}}; +NSDictionary* dictionaryV2 = @{SDLNameCommandId:@55}; describe(@"Send StartService Tests", ^ { context(@"Unsecure", ^{ diff --git a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLV2ProtocolMessageSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLV2ProtocolMessageSpec.m index 84a053004..8722dea1e 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLV2ProtocolMessageSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLV2ProtocolMessageSpec.m @@ -46,12 +46,12 @@ describe(@"RPCDictionary Tests", ^ { SDLV2ProtocolMessage* testMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testHeader andPayload:[[NSMutableData alloc] initWithCapacity:0]]; - expect([testMessage rpcDictionary]).to(equal(@{NAMES_request: - @{NAMES_operation_name:NAMES_Slider, - NAMES_correlationID:@99, - NAMES_parameters:dictionary}, - NAMES_bulkData:[NSData dataWithBytes:"Database" length:strlen("Database")]})); + expect([testMessage rpcDictionary]).to(equal(@{SDLNameRequest: + @{SDLNameOperationName:SDLNameSlider, + SDLNameCorrelationId:@99, + SDLNameParameters:dictionary}, + SDLNameBulkData:[NSData dataWithBytes:"Database" length:strlen("Database")]})); }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m index eff1ae3b2..01c822ceb 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m @@ -17,135 +17,135 @@ SDLFunctionID* functionID = [[SDLFunctionID alloc] init]; describe(@"GetFunctionName Tests", ^ { it(@"Should return the correct function name", ^ { - expect([functionID getFunctionName:1]).to(equal(NAMES_RegisterAppInterface)); - expect([functionID getFunctionName:2]).to(equal(NAMES_UnregisterAppInterface)); - expect([functionID getFunctionName:3]).to(equal(NAMES_SetGlobalProperties)); - expect([functionID getFunctionName:4]).to(equal(NAMES_ResetGlobalProperties)); - expect([functionID getFunctionName:5]).to(equal(NAMES_AddCommand)); - expect([functionID getFunctionName:6]).to(equal(NAMES_DeleteCommand)); - expect([functionID getFunctionName:7]).to(equal(NAMES_AddSubMenu)); - expect([functionID getFunctionName:8]).to(equal(NAMES_DeleteSubMenu)); - expect([functionID getFunctionName:9]).to(equal(NAMES_CreateInteractionChoiceSet)); - expect([functionID getFunctionName:10]).to(equal(NAMES_PerformInteraction)); - expect([functionID getFunctionName:11]).to(equal(NAMES_DeleteInteractionChoiceSet)); - expect([functionID getFunctionName:12]).to(equal(NAMES_Alert)); - expect([functionID getFunctionName:13]).to(equal(NAMES_Show)); - expect([functionID getFunctionName:14]).to(equal(NAMES_Speak)); - expect([functionID getFunctionName:15]).to(equal(NAMES_SetMediaClockTimer)); - expect([functionID getFunctionName:16]).to(equal(NAMES_PerformAudioPassThru)); - expect([functionID getFunctionName:17]).to(equal(NAMES_EndAudioPassThru)); - expect([functionID getFunctionName:18]).to(equal(NAMES_SubscribeButton)); - expect([functionID getFunctionName:19]).to(equal(NAMES_UnsubscribeButton)); - expect([functionID getFunctionName:20]).to(equal(NAMES_SubscribeVehicleData)); - expect([functionID getFunctionName:21]).to(equal(NAMES_UnsubscribeVehicleData)); - expect([functionID getFunctionName:22]).to(equal(NAMES_GetVehicleData)); - expect([functionID getFunctionName:23]).to(equal(NAMES_ReadDID)); - expect([functionID getFunctionName:24]).to(equal(NAMES_GetDTCs)); - expect([functionID getFunctionName:25]).to(equal(NAMES_ScrollableMessage)); - expect([functionID getFunctionName:26]).to(equal(NAMES_Slider)); - expect([functionID getFunctionName:27]).to(equal(NAMES_ShowConstantTBT)); - expect([functionID getFunctionName:28]).to(equal(NAMES_AlertManeuver)); - expect([functionID getFunctionName:29]).to(equal(NAMES_UpdateTurnList)); - expect([functionID getFunctionName:30]).to(equal(NAMES_ChangeRegistration)); - expect([functionID getFunctionName:31]).to(equal(NAMES_GenericResponse)); - expect([functionID getFunctionName:32]).to(equal(NAMES_PutFile)); - expect([functionID getFunctionName:33]).to(equal(NAMES_DeleteFile)); - expect([functionID getFunctionName:34]).to(equal(NAMES_ListFiles)); - expect([functionID getFunctionName:35]).to(equal(NAMES_SetAppIcon)); - expect([functionID getFunctionName:36]).to(equal(NAMES_SetDisplayLayout)); - expect([functionID getFunctionName:37]).to(equal(NAMES_DiagnosticMessage)); - expect([functionID getFunctionName:38]).to(equal(NAMES_SystemRequest)); - expect([functionID getFunctionName:39]).to(equal(NAMES_SendLocation)); - expect([functionID getFunctionName:40]).to(equal(NAMES_DialNumber)); - expect([functionID getFunctionName:32768]).to(equal(NAMES_OnHMIStatus)); - expect([functionID getFunctionName:32769]).to(equal(NAMES_OnAppInterfaceUnregistered)); - expect([functionID getFunctionName:32770]).to(equal(NAMES_OnButtonEvent)); - expect([functionID getFunctionName:32771]).to(equal(NAMES_OnButtonPress)); - expect([functionID getFunctionName:32772]).to(equal(NAMES_OnVehicleData)); - expect([functionID getFunctionName:32773]).to(equal(NAMES_OnCommand)); - expect([functionID getFunctionName:32774]).to(equal(NAMES_OnTBTClientState)); - expect([functionID getFunctionName:32775]).to(equal(NAMES_OnDriverDistraction)); - expect([functionID getFunctionName:32776]).to(equal(NAMES_OnPermissionsChange)); - expect([functionID getFunctionName:32777]).to(equal(NAMES_OnAudioPassThru)); - expect([functionID getFunctionName:32778]).to(equal(NAMES_OnLanguageChange)); - expect([functionID getFunctionName:32779]).to(equal(NAMES_OnKeyboardInput)); - expect([functionID getFunctionName:32780]).to(equal(NAMES_OnTouchEvent)); - expect([functionID getFunctionName:32781]).to(equal(NAMES_OnSystemRequest)); - expect([functionID getFunctionName:32782]).to(equal(NAMES_OnHashChange)); + expect([functionID getFunctionName:1]).to(equal(SDLNameRegisterAppInterface)); + expect([functionID getFunctionName:2]).to(equal(SDLNameUnregisterAppInterface)); + expect([functionID getFunctionName:3]).to(equal(SDLNameSetGlobalProperties)); + expect([functionID getFunctionName:4]).to(equal(SDLNameResetGlobalProperties)); + expect([functionID getFunctionName:5]).to(equal(SDLNameAddCommand)); + expect([functionID getFunctionName:6]).to(equal(SDLNameDeleteCommand)); + expect([functionID getFunctionName:7]).to(equal(SDLNameAddSubMenu)); + expect([functionID getFunctionName:8]).to(equal(SDLNameDeleteSubMenu)); + expect([functionID getFunctionName:9]).to(equal(SDLNameCreateInteractionChoiceSet)); + expect([functionID getFunctionName:10]).to(equal(SDLNamePerformInteraction)); + expect([functionID getFunctionName:11]).to(equal(SDLNameDeleteInteractionChoiceSet)); + expect([functionID getFunctionName:12]).to(equal(SDLNameAlert)); + expect([functionID getFunctionName:13]).to(equal(SDLNameShow)); + expect([functionID getFunctionName:14]).to(equal(SDLNameSpeak)); + expect([functionID getFunctionName:15]).to(equal(SDLNameSetMediaClockTimer)); + expect([functionID getFunctionName:16]).to(equal(SDLNamePerformAudioPassThru)); + expect([functionID getFunctionName:17]).to(equal(SDLNameEndAudioPassThru)); + expect([functionID getFunctionName:18]).to(equal(SDLNameSubscribeButton)); + expect([functionID getFunctionName:19]).to(equal(SDLNameUnsubscribeButton)); + expect([functionID getFunctionName:20]).to(equal(SDLNameSubscribeVehicleData)); + expect([functionID getFunctionName:21]).to(equal(SDLNameUnsubscribeVehicleData)); + expect([functionID getFunctionName:22]).to(equal(SDLNameGetVehicleData)); + expect([functionID getFunctionName:23]).to(equal(SDLNameReadDid)); + expect([functionID getFunctionName:24]).to(equal(SDLNameGetDtcs)); + expect([functionID getFunctionName:25]).to(equal(SDLNameScrollableMessage)); + expect([functionID getFunctionName:26]).to(equal(SDLNameSlider)); + expect([functionID getFunctionName:27]).to(equal(SDLNameShowConstantTbt)); + expect([functionID getFunctionName:28]).to(equal(SDLNameAlertManeuver)); + expect([functionID getFunctionName:29]).to(equal(SDLNameUpdateTurnList)); + expect([functionID getFunctionName:30]).to(equal(SDLNameChangeRegistration)); + expect([functionID getFunctionName:31]).to(equal(SDLNameGenericResponse)); + expect([functionID getFunctionName:32]).to(equal(SDLNamePutFile)); + expect([functionID getFunctionName:33]).to(equal(SDLNameDeleteFile)); + expect([functionID getFunctionName:34]).to(equal(SDLNameListFiles)); + expect([functionID getFunctionName:35]).to(equal(SDLNameSetAppIcon)); + expect([functionID getFunctionName:36]).to(equal(SDLNameSetDisplayLayout)); + expect([functionID getFunctionName:37]).to(equal(SDLNameDiagnosticMessage)); + expect([functionID getFunctionName:38]).to(equal(SDLNameSystemRequest)); + expect([functionID getFunctionName:39]).to(equal(SDLNameSendLocation)); + expect([functionID getFunctionName:40]).to(equal(SDLNameDialNumber)); + expect([functionID getFunctionName:32768]).to(equal(SDLNameOnHmiStatus)); + expect([functionID getFunctionName:32769]).to(equal(SDLNameOnAppInterfaceUnregistered)); + expect([functionID getFunctionName:32770]).to(equal(SDLNameOnButtonEvent)); + expect([functionID getFunctionName:32771]).to(equal(SDLNameOnButtonPress)); + expect([functionID getFunctionName:32772]).to(equal(SDLNameOnVehicleData)); + expect([functionID getFunctionName:32773]).to(equal(SDLNameOnCommand)); + expect([functionID getFunctionName:32774]).to(equal(SDLNameOnTbtClientState)); + expect([functionID getFunctionName:32775]).to(equal(SDLNameOnDriverDistraction)); + expect([functionID getFunctionName:32776]).to(equal(SDLNameOnPermissionsChange)); + expect([functionID getFunctionName:32777]).to(equal(SDLNameOnAudioPassThru)); + expect([functionID getFunctionName:32778]).to(equal(SDLNameOnLanguageChange)); + expect([functionID getFunctionName:32779]).to(equal(SDLNameOnKeyboardInput)); + expect([functionID getFunctionName:32780]).to(equal(SDLNameOnTouchEvent)); + expect([functionID getFunctionName:32781]).to(equal(SDLNameOnSystemRequest)); + expect([functionID getFunctionName:32782]).to(equal(SDLNameOnHashChange)); //Not listed in Spec - expect([functionID getFunctionName:65536]).to(equal(NAMES_EncodedSyncPData)); - expect([functionID getFunctionName:65537]).to(equal(NAMES_SyncPData)); + expect([functionID getFunctionName:65536]).to(equal(SDLNameEncodedSyncPData)); + expect([functionID getFunctionName:65537]).to(equal(SDLNameSyncPData)); - expect([functionID getFunctionName:98304]).to(equal(NAMES_OnEncodedSyncPData)); - expect([functionID getFunctionName:98305]).to(equal(NAMES_OnSyncPData)); + expect([functionID getFunctionName:98304]).to(equal(SDLNameOnEncodedSyncPData)); + expect([functionID getFunctionName:98305]).to(equal(SDLNameOnSyncPData)); }); }); describe(@"GetFunctionID Tests", ^ { it(@"Should return the correct function ID", ^ { - expect([functionID getFunctionID:NAMES_RegisterAppInterface]).to(equal(@1)); - expect([functionID getFunctionID:NAMES_UnregisterAppInterface]).to(equal(@2)); - expect([functionID getFunctionID:NAMES_SetGlobalProperties]).to(equal(@3)); - expect([functionID getFunctionID:NAMES_ResetGlobalProperties]).to(equal(@4)); - expect([functionID getFunctionID:NAMES_AddCommand]).to(equal(@5)); - expect([functionID getFunctionID:NAMES_DeleteCommand]).to(equal(@6)); - expect([functionID getFunctionID:NAMES_AddSubMenu]).to(equal(@7)); - expect([functionID getFunctionID:NAMES_DeleteSubMenu]).to(equal(@8)); - expect([functionID getFunctionID:NAMES_CreateInteractionChoiceSet]).to(equal(@9)); - expect([functionID getFunctionID:NAMES_PerformInteraction]).to(equal(@10)); - expect([functionID getFunctionID:NAMES_DeleteInteractionChoiceSet]).to(equal(@11)); - expect([functionID getFunctionID:NAMES_Alert]).to(equal(@12)); - expect([functionID getFunctionID:NAMES_Show]).to(equal(@13)); - expect([functionID getFunctionID:NAMES_Speak]).to(equal(@14)); - expect([functionID getFunctionID:NAMES_SetMediaClockTimer]).to(equal(@15)); - expect([functionID getFunctionID:NAMES_PerformAudioPassThru]).to(equal(@16)); - expect([functionID getFunctionID:NAMES_EndAudioPassThru]).to(equal(@17)); - expect([functionID getFunctionID:NAMES_SubscribeButton]).to(equal(@18)); - expect([functionID getFunctionID:NAMES_UnsubscribeButton]).to(equal(@19)); - expect([functionID getFunctionID:NAMES_SubscribeVehicleData]).to(equal(@20)); - expect([functionID getFunctionID:NAMES_UnsubscribeVehicleData]).to(equal(@21)); - expect([functionID getFunctionID:NAMES_GetVehicleData]).to(equal(@22)); - expect([functionID getFunctionID:NAMES_ReadDID]).to(equal(@23)); - expect([functionID getFunctionID:NAMES_GetDTCs]).to(equal(@24)); - expect([functionID getFunctionID:NAMES_ScrollableMessage]).to(equal(@25)); - expect([functionID getFunctionID:NAMES_Slider]).to(equal(@26)); - expect([functionID getFunctionID:NAMES_ShowConstantTBT]).to(equal(@27)); - expect([functionID getFunctionID:NAMES_AlertManeuver]).to(equal(@28)); - expect([functionID getFunctionID:NAMES_UpdateTurnList]).to(equal(@29)); - expect([functionID getFunctionID:NAMES_ChangeRegistration]).to(equal(@30)); - expect([functionID getFunctionID:NAMES_GenericResponse]).to(equal(@31)); - expect([functionID getFunctionID:NAMES_PutFile]).to(equal(@32)); - expect([functionID getFunctionID:NAMES_DeleteFile]).to(equal(@33)); - expect([functionID getFunctionID:NAMES_ListFiles]).to(equal(@34)); - expect([functionID getFunctionID:NAMES_SetAppIcon]).to(equal(@35)); - expect([functionID getFunctionID:NAMES_SetDisplayLayout]).to(equal(@36)); - expect([functionID getFunctionID:NAMES_DiagnosticMessage]).to(equal(@37)); - expect([functionID getFunctionID:NAMES_SystemRequest]).to(equal(@38)); - expect([functionID getFunctionID:NAMES_SendLocation]).to(equal(@39)); - expect([functionID getFunctionID:NAMES_DialNumber]).to(equal(@40)); - expect([functionID getFunctionID:NAMES_OnHMIStatus]).to(equal(@32768)); - expect([functionID getFunctionID:NAMES_OnAppInterfaceUnregistered]).to(equal(@32769)); - expect([functionID getFunctionID:NAMES_OnButtonEvent]).to(equal(@32770)); - expect([functionID getFunctionID:NAMES_OnButtonPress]).to(equal(@32771)); - expect([functionID getFunctionID:NAMES_OnVehicleData]).to(equal(@32772)); - expect([functionID getFunctionID:NAMES_OnCommand]).to(equal(@32773)); - expect([functionID getFunctionID:NAMES_OnTBTClientState]).to(equal(@32774)); - expect([functionID getFunctionID:NAMES_OnDriverDistraction]).to(equal(@32775)); - expect([functionID getFunctionID:NAMES_OnPermissionsChange]).to(equal(@32776)); - expect([functionID getFunctionID:NAMES_OnAudioPassThru]).to(equal(@32777)); - expect([functionID getFunctionID:NAMES_OnLanguageChange]).to(equal(@32778)); - expect([functionID getFunctionID:NAMES_OnKeyboardInput]).to(equal(@32779)); - expect([functionID getFunctionID:NAMES_OnTouchEvent]).to(equal(@32780)); - expect([functionID getFunctionID:NAMES_OnSystemRequest]).to(equal(@32781)); - expect([functionID getFunctionID:NAMES_OnHashChange]).to(equal(@32782)); + expect([functionID getFunctionID:SDLNameRegisterAppInterface]).to(equal(@1)); + expect([functionID getFunctionID:SDLNameUnregisterAppInterface]).to(equal(@2)); + expect([functionID getFunctionID:SDLNameSetGlobalProperties]).to(equal(@3)); + expect([functionID getFunctionID:SDLNameResetGlobalProperties]).to(equal(@4)); + expect([functionID getFunctionID:SDLNameAddCommand]).to(equal(@5)); + expect([functionID getFunctionID:SDLNameDeleteCommand]).to(equal(@6)); + expect([functionID getFunctionID:SDLNameAddSubMenu]).to(equal(@7)); + expect([functionID getFunctionID:SDLNameDeleteSubMenu]).to(equal(@8)); + expect([functionID getFunctionID:SDLNameCreateInteractionChoiceSet]).to(equal(@9)); + expect([functionID getFunctionID:SDLNamePerformInteraction]).to(equal(@10)); + expect([functionID getFunctionID:SDLNameDeleteInteractionChoiceSet]).to(equal(@11)); + expect([functionID getFunctionID:SDLNameAlert]).to(equal(@12)); + expect([functionID getFunctionID:SDLNameShow]).to(equal(@13)); + expect([functionID getFunctionID:SDLNameSpeak]).to(equal(@14)); + expect([functionID getFunctionID:SDLNameSetMediaClockTimer]).to(equal(@15)); + expect([functionID getFunctionID:SDLNamePerformAudioPassThru]).to(equal(@16)); + expect([functionID getFunctionID:SDLNameEndAudioPassThru]).to(equal(@17)); + expect([functionID getFunctionID:SDLNameSubscribeButton]).to(equal(@18)); + expect([functionID getFunctionID:SDLNameUnsubscribeButton]).to(equal(@19)); + expect([functionID getFunctionID:SDLNameSubscribeVehicleData]).to(equal(@20)); + expect([functionID getFunctionID:SDLNameUnsubscribeVehicleData]).to(equal(@21)); + expect([functionID getFunctionID:SDLNameGetVehicleData]).to(equal(@22)); + expect([functionID getFunctionID:SDLNameReadDid]).to(equal(@23)); + expect([functionID getFunctionID:SDLNameGetDtcs]).to(equal(@24)); + expect([functionID getFunctionID:SDLNameScrollableMessage]).to(equal(@25)); + expect([functionID getFunctionID:SDLNameSlider]).to(equal(@26)); + expect([functionID getFunctionID:SDLNameShowConstantTbt]).to(equal(@27)); + expect([functionID getFunctionID:SDLNameAlertManeuver]).to(equal(@28)); + expect([functionID getFunctionID:SDLNameUpdateTurnList]).to(equal(@29)); + expect([functionID getFunctionID:SDLNameChangeRegistration]).to(equal(@30)); + expect([functionID getFunctionID:SDLNameGenericResponse]).to(equal(@31)); + expect([functionID getFunctionID:SDLNamePutFile]).to(equal(@32)); + expect([functionID getFunctionID:SDLNameDeleteFile]).to(equal(@33)); + expect([functionID getFunctionID:SDLNameListFiles]).to(equal(@34)); + expect([functionID getFunctionID:SDLNameSetAppIcon]).to(equal(@35)); + expect([functionID getFunctionID:SDLNameSetDisplayLayout]).to(equal(@36)); + expect([functionID getFunctionID:SDLNameDiagnosticMessage]).to(equal(@37)); + expect([functionID getFunctionID:SDLNameSystemRequest]).to(equal(@38)); + expect([functionID getFunctionID:SDLNameSendLocation]).to(equal(@39)); + expect([functionID getFunctionID:SDLNameDialNumber]).to(equal(@40)); + expect([functionID getFunctionID:SDLNameOnHmiStatus]).to(equal(@32768)); + expect([functionID getFunctionID:SDLNameOnAppInterfaceUnregistered]).to(equal(@32769)); + expect([functionID getFunctionID:SDLNameOnButtonEvent]).to(equal(@32770)); + expect([functionID getFunctionID:SDLNameOnButtonPress]).to(equal(@32771)); + expect([functionID getFunctionID:SDLNameOnVehicleData]).to(equal(@32772)); + expect([functionID getFunctionID:SDLNameOnCommand]).to(equal(@32773)); + expect([functionID getFunctionID:SDLNameOnTbtClientState]).to(equal(@32774)); + expect([functionID getFunctionID:SDLNameOnDriverDistraction]).to(equal(@32775)); + expect([functionID getFunctionID:SDLNameOnPermissionsChange]).to(equal(@32776)); + expect([functionID getFunctionID:SDLNameOnAudioPassThru]).to(equal(@32777)); + expect([functionID getFunctionID:SDLNameOnLanguageChange]).to(equal(@32778)); + expect([functionID getFunctionID:SDLNameOnKeyboardInput]).to(equal(@32779)); + expect([functionID getFunctionID:SDLNameOnTouchEvent]).to(equal(@32780)); + expect([functionID getFunctionID:SDLNameOnSystemRequest]).to(equal(@32781)); + expect([functionID getFunctionID:SDLNameOnHashChange]).to(equal(@32782)); //Not listed in Spec - expect([functionID getFunctionID:NAMES_EncodedSyncPData]).to(equal(@65536)); - expect([functionID getFunctionID:NAMES_SyncPData]).to(equal(@65537)); + expect([functionID getFunctionID:SDLNameEncodedSyncPData]).to(equal(@65536)); + expect([functionID getFunctionID:SDLNameSyncPData]).to(equal(@65537)); - expect([functionID getFunctionID:NAMES_OnEncodedSyncPData]).to(equal(@98304)); - expect([functionID getFunctionID:NAMES_OnSyncPData]).to(equal(@98305)); + expect([functionID getFunctionID:SDLNameOnEncodedSyncPData]).to(equal(@98304)); + expect([functionID getFunctionID:SDLNameOnSyncPData]).to(equal(@98305)); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m index 2ec566031..4bb54276a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m @@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_reason:[SDLAppInterfaceUnregisteredReason APP_UNAUTHORIZED]}, - NAMES_operation_name:NAMES_OnAppInterfaceUnregistered}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameReason:[SDLAppInterfaceUnregisteredReason APP_UNAUTHORIZED]}, + SDLNameOperationName:SDLNameOnAppInterfaceUnregistered}} mutableCopy]; SDLOnAppInterfaceUnregistered* testNotification = [[SDLOnAppInterfaceUnregistered alloc] initWithDictionary:dict]; expect(testNotification.reason).to(equal([SDLAppInterfaceUnregisteredReason APP_UNAUTHORIZED])); @@ -40,4 +40,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m index becc5c251..fe1b168aa 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m @@ -30,12 +30,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_buttonName:[SDLButtonName CUSTOM_BUTTON], - NAMES_buttonEventMode:[SDLButtonEventMode BUTTONDOWN], - NAMES_customButtonID:@4252}, - NAMES_operation_name:NAMES_OnButtonEvent}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameButtonName:[SDLButtonName CUSTOM_BUTTON], + SDLNameButtonEventMode:[SDLButtonEventMode BUTTONDOWN], + SDLNameCustomButtonId:@4252}, + SDLNameOperationName:SDLNameOnButtonEvent}} mutableCopy]; SDLOnButtonEvent* testNotification = [[SDLOnButtonEvent alloc] initWithDictionary:dict]; expect(testNotification.buttonName).to(equal([SDLButtonName CUSTOM_BUTTON])); @@ -52,4 +52,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m index 4467f72a5..6d369a4bb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m @@ -30,12 +30,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_buttonName:[SDLButtonName CUSTOM_BUTTON], - NAMES_buttonPressMode:[SDLButtonPressMode LONG], - NAMES_customButtonID:@5642}, - NAMES_operation_name:NAMES_OnButtonPress}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameButtonName:[SDLButtonName CUSTOM_BUTTON], + SDLNameButtonPressMode:[SDLButtonPressMode LONG], + SDLNameCustomButtonId:@5642}, + SDLNameOperationName:SDLNameOnButtonPress}} mutableCopy]; SDLOnButtonPress* testNotification = [[SDLOnButtonPress alloc] initWithDictionary:dict]; expect(testNotification.buttonName).to(equal([SDLButtonName CUSTOM_BUTTON])); @@ -52,4 +52,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m index 6b8afd10b..424405876 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m @@ -26,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_cmdID:@5676544, - NAMES_triggerSource:[SDLTriggerSource KEYBOARD]}, - NAMES_operation_name:NAMES_OnCommand}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameCommandId:@5676544, + SDLNameTriggerSource:[SDLTriggerSource KEYBOARD]}, + SDLNameOperationName:SDLNameOnCommand}} mutableCopy]; SDLOnCommand* testNotification = [[SDLOnCommand alloc] initWithDictionary:dict]; expect(testNotification.cmdID).to(equal(@5676544)); @@ -45,4 +45,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m index 79c90bdd7..b97df7e8d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m @@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_state:[SDLDriverDistractionState DD_ON]}, - NAMES_operation_name:NAMES_OnDriverDistraction}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameState:[SDLDriverDistractionState DD_ON]}, + SDLNameOperationName:SDLNameOnDriverDistraction}} mutableCopy]; SDLOnDriverDistraction* testNotification = [[SDLOnDriverDistraction alloc] initWithDictionary:dict]; expect(testNotification.state).to(equal([SDLDriverDistractionState DD_ON])); @@ -40,4 +40,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m index a8844e22a..31fad837b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m @@ -27,12 +27,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_data:[@[@0] mutableCopy], - NAMES_URL:@"www.zombo.com", - NAMES_Timeout:@564}, - NAMES_operation_name:NAMES_OnEncodedSyncPData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameData:[@[@0] mutableCopy], + SDLNameUrlUppercase:@"www.zombo.com", + SDLNameTimeoutCapitalized:@564}, + SDLNameOperationName:SDLNameOnEncodedSyncPData}} mutableCopy]; SDLOnEncodedSyncPData* testNotification = [[SDLOnEncodedSyncPData alloc] initWithDictionary:dict]; expect(testNotification.data).to(equal([@[@0] mutableCopy])); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m index c2d58a484..b0c95cf67 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m @@ -31,12 +31,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_hmiLevel:[SDLHMILevel LIMITED], - NAMES_audioStreamingState:[SDLAudioStreamingState ATTENUATED], - NAMES_systemContext:[SDLSystemContext HMI_OBSCURED]}, - NAMES_operation_name:NAMES_OnHMIStatus}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameHmiLevel:[SDLHMILevel LIMITED], + SDLNameAudioStreamingState:[SDLAudioStreamingState ATTENUATED], + SDLNameSystemContext:[SDLSystemContext HMI_OBSCURED]}, + SDLNameOperationName:SDLNameOnHmiStatus}} mutableCopy]; SDLOnHMIStatus* testNotification = [[SDLOnHMIStatus alloc] initWithDictionary:dict]; expect(testNotification.hmiLevel).to(equal([SDLHMILevel LIMITED])); @@ -53,4 +53,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m index 308347c61..ea87449c6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_hashID:@"hash"}, - NAMES_operation_name:NAMES_OnHashChange}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameHashId:@"hash"}, + SDLNameOperationName:SDLNameOnHashChange}} mutableCopy]; SDLOnHashChange* testNotification = [[SDLOnHashChange alloc] initWithDictionary:dict]; expect(testNotification.hashID).to(equal(@"hash")); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m index cf87e853d..96b867dad 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m @@ -26,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_event:[SDLKeyboardEvent ENTRY_SUBMITTED], - NAMES_data:@"qwertyg"}, - NAMES_operation_name:NAMES_OnKeyboardInput}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameEvent:[SDLKeyboardEvent ENTRY_SUBMITTED], + SDLNameData:@"qwertyg"}, + SDLNameOperationName:SDLNameOnKeyboardInput}} mutableCopy]; SDLOnKeyboardInput* testNotification = [[SDLOnKeyboardInput alloc] initWithDictionary:dict]; expect(testNotification.event).to(equal([SDLKeyboardEvent ENTRY_SUBMITTED])); @@ -45,4 +45,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m index f9009f69c..ecb882b8a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m @@ -27,11 +27,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_language:[SDLLanguage ES_ES], - NAMES_hmiDisplayLanguage:[SDLLanguage DE_DE]}, - NAMES_operation_name:NAMES_OnLanguageChange}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameLanguage:[SDLLanguage ES_ES], + SDLNameHmiDisplayLanguage:[SDLLanguage DE_DE]}, + SDLNameOperationName:SDLNameOnLanguageChange}} mutableCopy]; SDLOnLanguageChange* testNotification = [[SDLOnLanguageChange alloc] initWithDictionary:dict]; expect(testNotification.language).to(equal([SDLLanguage ES_ES])); @@ -46,4 +46,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m index d438ec621..e8da95d84 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m @@ -31,13 +31,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: @{@"driverdistractionstatus":@NO, @"userselected":@3, @"OnLockScreenStatus":[SDLLockScreenStatus REQUIRED], @"hmilevel":[SDLHMILevel NONE]}, - NAMES_operation_name:@"OnLockScreenStatus"}} mutableCopy]; + SDLNameOperationName:@"OnLockScreenStatus"}} mutableCopy]; SDLOnLockScreenStatus* testNotification = [[SDLOnLockScreenStatus alloc] initWithDictionary:dict]; expect(testNotification.driverDistractionStatus).to(equal(@NO)); @@ -56,4 +56,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m index 5a5d349cc..9ad2026de 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m @@ -26,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_permissionItem:[@[item] mutableCopy]}, - NAMES_operation_name:NAMES_OnPermissionsChange}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNamePermissionItem:[@[item] mutableCopy]}, + SDLNameOperationName:SDLNameOnPermissionsChange}} mutableCopy]; SDLOnPermissionsChange* testNotification = [[SDLOnPermissionsChange alloc] initWithDictionary:dict]; expect(testNotification.permissionItem).to(equal([@[item] mutableCopy])); @@ -42,4 +42,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m index 34ac9af9e..ea916c9f8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_URL:@"https://www.youtube.com/watch?v=ygr5AHufBN4", - NAMES_Timeout:@8357}, - NAMES_operation_name:NAMES_OnSyncPData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameUrlUppercase:@"https://www.youtube.com/watch?v=ygr5AHufBN4", + SDLNameTimeoutCapitalized:@8357}, + SDLNameOperationName:SDLNameOnSyncPData}} mutableCopy]; SDLOnSyncPData* testNotification = [[SDLOnSyncPData alloc] initWithDictionary:dict]; expect(testNotification.URL).to(equal(@"https://www.youtube.com/watch?v=ygr5AHufBN4")); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m index ed235871e..4b65f9a83 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m @@ -36,15 +36,15 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_requestType:[SDLRequestType FILE_RESUME], - NAMES_url:[@[@"www.google.com"] mutableCopy], - NAMES_timeout:@52345, - NAMES_fileType:[SDLFileType GRAPHIC_PNG], - NAMES_offset:@2532678684, - NAMES_length:@50000000000}, - NAMES_operation_name:NAMES_OnSystemRequest}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameRequestType:[SDLRequestType FILE_RESUME], + SDLNameUrl:[@[@"www.google.com"] mutableCopy], + SDLNameTimeout:@52345, + SDLNameFileType:[SDLFileType GRAPHIC_PNG], + SDLNameOffset:@2532678684, + SDLNameLength:@50000000000}, + SDLNameOperationName:SDLNameOnSystemRequest}} mutableCopy]; SDLOnSystemRequest* testNotification = [[SDLOnSystemRequest alloc] initWithDictionary:dict]; expect(testNotification.requestType).to(equal([SDLRequestType FILE_RESUME])); @@ -67,4 +67,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m index b1391d033..db3396445 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m @@ -25,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_state:[SDLTBTState ETA_REQUEST]}, - NAMES_operation_name:NAMES_OnTBTClientState}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameState:[SDLTBTState ETA_REQUEST]}, + SDLNameOperationName:SDLNameOnTbtClientState}} mutableCopy]; SDLOnTBTClientState* testNotification = [[SDLOnTBTClientState alloc] initWithDictionary:dict]; expect(testNotification.state).to(equal([SDLTBTState ETA_REQUEST])); @@ -41,4 +41,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m index 298ffef9f..c32f40d5f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m @@ -30,11 +30,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_type:[SDLTouchType BEGIN], - NAMES_event:[@[event] mutableCopy]}, - NAMES_operation_name:NAMES_OnTouchEvent}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameType:[SDLTouchType BEGIN], + SDLNameEvent:[@[event] mutableCopy]}, + SDLNameOperationName:SDLNameOnTouchEvent}} mutableCopy]; SDLOnTouchEvent* testNotification = [[SDLOnTouchEvent alloc] initWithDictionary:dict]; expect(testNotification.type).to(equal([SDLTouchType BEGIN])); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m index 17704a304..68161263e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m @@ -84,34 +84,34 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_gps:gps, - NAMES_speed:@70.1, - NAMES_rpm:@4242, - NAMES_fuelLevel:@10.3, - NAMES_fuelLevel_State:[SDLComponentVolumeStatus ALERT], - NAMES_instantFuelConsumption:@4000.63, - NAMES_externalTemperature:@-10, - NAMES_vin:@"222222222722", - NAMES_prndl:[SDLPRNDL DRIVE], - NAMES_tirePressure:tires, - NAMES_odometer:@100050, - NAMES_beltStatus:belt, - NAMES_bodyInformation:body, - NAMES_deviceStatus:device, - NAMES_driverBraking:[SDLVehicleDataEventStatus _YES], - NAMES_wiperStatus:[SDLWiperStatus STALLED], - NAMES_headLampStatus:headLamp, - NAMES_engineTorque:@-200.124, - NAMES_accPedalPosition:@99.99999999, - NAMES_steeringWheelAngle:@0.000000001, - NAMES_eCallInfo:eCall, - NAMES_airbagStatus:airbag, - NAMES_emergencyEvent:event, - NAMES_clusterModeStatus:clusterMode, - NAMES_myKey:myKey}, - NAMES_operation_name:NAMES_OnVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameGps:gps, + SDLNameSpeed:@70.1, + SDLNameRpm:@4242, + SDLNameFuelLevel:@10.3, + SDLNameFuelLevelState:[SDLComponentVolumeStatus ALERT], + SDLNameInstantFuelConsumption:@4000.63, + SDLNameExternalTemperature:@-10, + SDLNameVin:@"222222222722", + SDLNamePrndl:[SDLPRNDL DRIVE], + SDLNameTirePressure:tires, + SDLNameOdometer:@100050, + SDLNameBeltStatus:belt, + SDLNameBodyInformation:body, + SDLNameDeviceStatus:device, + SDLNameDriverBraking:[SDLVehicleDataEventStatus _YES], + SDLNameWiperStatus:[SDLWiperStatus STALLED], + SDLNameHeadLampStatus:headLamp, + SDLNameEngineTorque:@-200.124, + SDLNameAccPedalPosition:@99.99999999, + SDLNameSteeringWheelAngle:@0.000000001, + SDLNameECallInfo:eCall, + SDLNameAirbagStatus:airbag, + SDLNameEmergencyEvent:event, + SDLNameClusterModeStatus:clusterMode, + SDLNameMyKey:myKey}, + SDLNameOperationName:SDLNameOnVehicleData}} mutableCopy]; SDLOnVehicleData* testNotification = [[SDLOnVehicleData alloc] initWithDictionary:dict]; expect(testNotification.gps).to(equal(gps)); @@ -172,4 +172,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m b/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m index 441eca732..f0632eb87 100644 --- a/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m @@ -15,9 +15,9 @@ QuickSpecBegin(SDLRPCPayloadSpec) __block SDLRPCPayload* testPayload; -__block NSDictionary* dict = @{NAMES_response: - @{NAMES_parameters:@{}, - NAMES_operation_name:NAMES_DeleteCommand}}; +__block NSDictionary* dict = @{SDLNameResponse: + @{SDLNameParameters:@{}, + SDLNameOperationName:SDLNameDeleteCommand}}; NSData* (^testData)() = ^NSData* { NSData* jsonData = [NSJSONSerialization dataWithJSONObject:dict options:0 error:0]; @@ -72,4 +72,4 @@ describe(@"RPCPayloadWithData Test", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m index 455552bad..6dfa5423c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m @@ -34,13 +34,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_cmdID:@434577, - NAMES_menuParams:menu, - NAMES_vrCommands:[@[@"name", @"anotherName"] mutableCopy], - NAMES_cmdIcon:image}, - NAMES_operation_name:NAMES_AddCommand}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameCommandId:@434577, + SDLNameMenuParams:menu, + SDLNameVrCommands:[@[@"name", @"anotherName"] mutableCopy], + SDLNameCommandIcon:image}, + SDLNameOperationName:SDLNameAddCommand}} mutableCopy]; SDLAddCommand* testRequest = [[SDLAddCommand alloc] initWithDictionary:dict]; expect(testRequest.cmdID).to(equal(@434577)); @@ -59,4 +59,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m index 04a6526a8..890049e5f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m @@ -27,12 +27,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_menuID:@4345645, - NAMES_position:@27, - NAMES_menuName:@"Welcome to the menu"}, - NAMES_operation_name:NAMES_AddSubMenu}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameMenuId:@4345645, + SDLNamePosition:@27, + SDLNameMenuName:@"Welcome to the menu"}, + SDLNameOperationName:SDLNameAddSubMenu}} mutableCopy]; SDLAddSubMenu* testRequest = [[SDLAddSubMenu alloc] initWithDictionary:dict]; expect(testRequest.menuID).to(equal(@4345645)); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m index 16d5aa0e6..c64019d1b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m @@ -30,11 +30,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_ttsChunks:[@[tts] mutableCopy], - NAMES_softButtons:[@[button] mutableCopy]}, - NAMES_operation_name:NAMES_AlertManeuver}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameTtsChunks:[@[tts] mutableCopy], + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameAlertManeuver}} mutableCopy]; SDLAlertManeuver* testRequest = [[SDLAlertManeuver alloc] initWithDictionary:dict]; expect(testRequest.ttsChunks).to(equal([@[tts] mutableCopy])); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m index b5725e168..1e6bd589c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m @@ -42,17 +42,17 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_alertText1:@"alert#1", - NAMES_alertText2:@"alert#2", - NAMES_alertText3:@"alert#3", - NAMES_ttsChunks:[@[tts] mutableCopy], - NAMES_duration:@4357, - NAMES_playTone:@YES, - NAMES_progressIndicator:@NO, - NAMES_softButtons:[@[button] mutableCopy]}, - NAMES_operation_name:NAMES_Alert}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameAlertText1:@"alert#1", + SDLNameAlertText2:@"alert#2", + SDLNameAlertText3:@"alert#3", + SDLNameTtsChunks:[@[tts] mutableCopy], + SDLNameDuration:@4357, + SDLNamePlayTone:@YES, + SDLNameProgressIndicator:@NO, + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameAlert}} mutableCopy]; SDLAlert* testRequest = [[SDLAlert alloc] initWithDictionary:dict]; expect(testRequest.alertText1).to(equal(@"alert#1")); @@ -79,4 +79,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m index 9bf496042..1fd8e21e5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m @@ -112,15 +112,15 @@ describe(@"change registration", ^ { someNGNMediaAppName = @"some media app name"; someVRSynonyms = @[@"some1", @"some2"]; - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_language:someLanguage, - NAMES_hmiDisplayLanguage:someOtherLanguage, - NAMES_appName:someAppName, - NAMES_ttsName:someTTSChunks, - NAMES_ngnMediaScreenAppName:someNGNMediaAppName, - NAMES_vrSynonyms:someVRSynonyms}, - NAMES_operation_name:NAMES_ChangeRegistration}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameLanguage:someLanguage, + SDLNameHmiDisplayLanguage:someOtherLanguage, + SDLNameAppName:someAppName, + SDLNameTtsName:someTTSChunks, + SDLNameNgnMediaScreenAppName:someNGNMediaAppName, + SDLNameVrSynonyms:someVRSynonyms}, + SDLNameOperationName:SDLNameChangeRegistration}} mutableCopy]; testRequest = [[SDLChangeRegistration alloc] initWithDictionary:dict]; }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m index 39cadb2d6..017b123f5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m @@ -28,11 +28,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_interactionChoiceSetID:@141414, - NAMES_choiceSet:[@[choice] mutableCopy]}, - NAMES_operation_name:NAMES_CreateInteractionChoiceSet}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameInteractionChoiceSetId:@141414, + SDLNameChoiceSet:[@[choice] mutableCopy]}, + SDLNameOperationName:SDLNameCreateInteractionChoiceSet}} mutableCopy]; SDLCreateInteractionChoiceSet* testRequest = [[SDLCreateInteractionChoiceSet alloc] initWithDictionary:dict]; expect(testRequest.interactionChoiceSetID).to(equal(@141414)); @@ -47,4 +47,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m index 2d0be62d8..89ed13257 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_cmdID:@11223344}, - NAMES_operation_name:NAMES_DeleteCommand}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameCommandId:@11223344}, + SDLNameOperationName:SDLNameDeleteCommand}} mutableCopy]; SDLDeleteCommand* testRequest = [[SDLDeleteCommand alloc] initWithDictionary:dict]; expect(testRequest.cmdID).to(equal(@11223344)); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m index c6e471fc4..5946c7ec0 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_syncFileName:@"synchro"}, - NAMES_operation_name:NAMES_DeleteFile}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncFileName:@"synchro"}, + SDLNameOperationName:SDLNameDeleteFile}} mutableCopy]; SDLDeleteFile* testRequest = [[SDLDeleteFile alloc] initWithDictionary:dict]; expect(testRequest.syncFileName).to(equal(@"synchro")); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m index 6d42d114f..540c08cb4 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_interactionChoiceSetID:@20314}, - NAMES_operation_name:NAMES_DeleteInteractionChoiceSet}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameInteractionChoiceSetId:@20314}, + SDLNameOperationName:SDLNameDeleteInteractionChoiceSet}} mutableCopy]; SDLDeleteInteractionChoiceSet* testRequest = [[SDLDeleteInteractionChoiceSet alloc] initWithDictionary:dict]; expect(testRequest.interactionChoiceSetID).to(equal(@20314)); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m index 9b2d6588d..3185391ec 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_menuID:@25614}, - NAMES_operation_name:NAMES_DeleteSubMenu}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameMenuId:@25614}, + SDLNameOperationName:SDLNameDeleteSubMenu}} mutableCopy]; SDLDeleteSubMenu* testRequest = [[SDLDeleteSubMenu alloc] initWithDictionary:dict]; expect(testRequest.menuID).to(equal(@25614)); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m index 965920f39..fd25fd099 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m @@ -27,12 +27,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_targetID:@3562, - NAMES_messageLength:@55555, - NAMES_messageData:[@[@1, @4, @16, @64] mutableCopy]}, - NAMES_operation_name:NAMES_DiagnosticMessage}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameTargetId:@3562, + SDLNameMessageLength:@55555, + SDLNameMessageData:[@[@1, @4, @16, @64] mutableCopy]}, + SDLNameOperationName:SDLNameDiagnosticMessage}} mutableCopy]; SDLDiagnosticMessage* testRequest = [[SDLDiagnosticMessage alloc] initWithDictionary:dict]; expect(testRequest.targetID).to(equal(@3562)); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m index 7371fedf3..a150144c1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m @@ -43,9 +43,9 @@ describe(@"Dial Number RPC", ^{ beforeEach(^{ somePhoneNumber = @"1234567890"; NSDictionary *initDict = @{ - NAMES_request: @{ - NAMES_parameters: @{ - NAMES_number: [somePhoneNumber copy] + SDLNameRequest: @{ + SDLNameParameters: @{ + SDLNameNumber: [somePhoneNumber copy] } } }; @@ -62,8 +62,8 @@ describe(@"Dial Number RPC", ^{ __block SDLDialNumber *testRequest = nil; beforeEach(^{ NSDictionary *initDict = @{ - NAMES_request: @{ - NAMES_parameters: @{ + SDLNameRequest: @{ + SDLNameParameters: @{ } } }; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m index 753608940..accdd94a6 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_data:[@[@2, @2, @2] mutableCopy]}, - NAMES_operation_name:NAMES_EncodedSyncPData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameData:[@[@2, @2, @2] mutableCopy]}, + SDLNameOperationName:SDLNameEncodedSyncPData}} mutableCopy]; SDLEncodedSyncPData* testRequest = [[SDLEncodedSyncPData alloc] initWithDictionary:dict]; expect(testRequest.data).to(equal([@[@2, @2, @2] mutableCopy])); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m index 87f84fd4d..d3373093c 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_ecuName:@4321, - NAMES_dtcMask:@22}, - NAMES_operation_name:NAMES_EndAudioPassThru}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameEcuName:@4321, + SDLNameDtcMask:@22}, + SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy]; SDLGetDTCs* testRequest = [[SDLGetDTCs alloc] initWithDictionary:dict]; expect(testRequest.ecuName).to(equal(@4321)); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m index 936550ce7..b83a1ee5e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m @@ -71,34 +71,34 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_gps:@NO, - NAMES_speed:@YES, - NAMES_rpm:@NO, - NAMES_fuelLevel:@YES, - NAMES_fuelLevel_State:@NO, - NAMES_instantFuelConsumption:@YES, - NAMES_externalTemperature:@NO, - NAMES_vin:@YES, - NAMES_prndl:@NO, - NAMES_tirePressure:@YES, - NAMES_odometer:@NO, - NAMES_beltStatus:@YES, - NAMES_bodyInformation:@NO, - NAMES_deviceStatus:@YES, - NAMES_driverBraking:@NO, - NAMES_wiperStatus:@YES, - NAMES_headLampStatus:@NO, - NAMES_engineTorque:@YES, - NAMES_accPedalPosition:@NO, - NAMES_steeringWheelAngle:@YES, - NAMES_eCallInfo:@NO, - NAMES_airbagStatus:@YES, - NAMES_emergencyEvent:@NO, - NAMES_clusterModeStatus:@YES, - NAMES_myKey:@NO}, - NAMES_operation_name:NAMES_GetVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameGps:@NO, + SDLNameSpeed:@YES, + SDLNameRpm:@NO, + SDLNameFuelLevel:@YES, + SDLNameFuelLevelState:@NO, + SDLNameInstantFuelConsumption:@YES, + SDLNameExternalTemperature:@NO, + SDLNameVin:@YES, + SDLNamePrndl:@NO, + SDLNameTirePressure:@YES, + SDLNameOdometer:@NO, + SDLNameBeltStatus:@YES, + SDLNameBodyInformation:@NO, + SDLNameDeviceStatus:@YES, + SDLNameDriverBraking:@NO, + SDLNameWiperStatus:@YES, + SDLNameHeadLampStatus:@NO, + SDLNameEngineTorque:@YES, + SDLNameAccPedalPosition:@NO, + SDLNameSteeringWheelAngle:@YES, + SDLNameECallInfo:@NO, + SDLNameAirbagStatus:@YES, + SDLNameEmergencyEvent:@NO, + SDLNameClusterModeStatus:@YES, + SDLNameMyKey:@NO}, + SDLNameOperationName:SDLNameGetVehicleData}} mutableCopy]; SDLGetVehicleData* testRequest = [[SDLGetVehicleData alloc] initWithDictionary:dict]; expect(testRequest.gps).to(equal(@NO)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m index 011a7adf5..f843ede18 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m @@ -39,16 +39,16 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_audioPassThruDisplayText1:@"passthru#1", - NAMES_audioPassThruDisplayText2:@"passthru#2", - NAMES_samplingRate:[SDLSamplingRate _22KHZ], - NAMES_maxDuration:@34563, - NAMES_bitsPerSample:[SDLBitsPerSample _16_BIT], - NAMES_audioType:[SDLAudioType PCM], - NAMES_muteAudio:@NO}, - NAMES_operation_name:NAMES_PerformAudioPassThru}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameAudioPassThruDisplayText1:@"passthru#1", + SDLNameAudioPassThruDisplayText2:@"passthru#2", + SDLNameSamplingRate:[SDLSamplingRate _22KHZ], + SDLNameMaxDuration:@34563, + SDLNameBitsPerSample:[SDLBitsPerSample _16_BIT], + SDLNameAudioType:[SDLAudioType PCM], + SDLNameMuteAudio:@NO}, + SDLNameOperationName:SDLNamePerformAudioPassThru}} mutableCopy]; SDLPerformAudioPassThru* testRequest = [[SDLPerformAudioPassThru alloc] initWithDictionary:dict]; expect(testRequest.audioPassThruDisplayText1).to(equal(@"passthru#1")); @@ -73,4 +73,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m index c89c3d5bd..232a2188d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m @@ -48,18 +48,18 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_initialText:@"a", - NAMES_initialPrompt:[@[chunk1] mutableCopy], - NAMES_interactionMode:[SDLInteractionMode VR_ONLY], - NAMES_interactionChoiceSetIDList:[@[@1, @2, @3] mutableCopy], - NAMES_helpPrompt:[@[chunk2] mutableCopy], - NAMES_timeoutPrompt:[@[chunk3] mutableCopy], - NAMES_timeout:@42000, - NAMES_vrHelp:[@[helpItem] mutableCopy], - NAMES_interactionLayout:[SDLLayoutMode ICON_WITH_SEARCH]}, - NAMES_operation_name:NAMES_PerformInteraction}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameInitialText:@"a", + SDLNameInitialPrompt:[@[chunk1] mutableCopy], + SDLNameInteractionMode:[SDLInteractionMode VR_ONLY], + SDLNameInteractionChoiceSetIdList:[@[@1, @2, @3] mutableCopy], + SDLNameHelpPrompt:[@[chunk2] mutableCopy], + SDLNameTimeoutPrompt:[@[chunk3] mutableCopy], + SDLNameTimeout:@42000, + SDLNameVrHelp:[@[helpItem] mutableCopy], + SDLNameInteractionLayout:[SDLLayoutMode ICON_WITH_SEARCH]}, + SDLNameOperationName:SDLNamePerformInteraction}} mutableCopy]; SDLPerformInteraction* testRequest = [[SDLPerformInteraction alloc] initWithDictionary:dict]; expect(testRequest.initialText).to(equal(@"a")); @@ -88,4 +88,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m index bfa24dc13..c58e5a9f8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m @@ -35,15 +35,15 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_syncFileName:@"fileName", - NAMES_fileType:[SDLFileType GRAPHIC_JPEG], - NAMES_persistentFile:@YES, - NAMES_systemFile:@NO, - NAMES_offset:@987654321, - NAMES_length:@123456789}, - NAMES_operation_name:NAMES_PutFile}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncFileName:@"fileName", + SDLNameFileType:[SDLFileType GRAPHIC_JPEG], + SDLNamePersistentFile:@YES, + SDLNameSystemFile:@NO, + SDLNameOffset:@987654321, + SDLNameLength:@123456789}, + SDLNameOperationName:SDLNamePutFile}} mutableCopy]; SDLPutFile* testRequest = [[SDLPutFile alloc] initWithDictionary:dict]; expect(testRequest.syncFileName).to(equal(@"fileName")); @@ -66,4 +66,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m index 7c5598bbb..8c544159d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_ecuName:@33112, - NAMES_didLocation:[@[@200, @201, @205] mutableCopy]}, - NAMES_operation_name:NAMES_EndAudioPassThru}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameEcuName:@33112, + SDLNameDidLocation:[@[@200, @201, @205] mutableCopy]}, + SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy]; SDLReadDID* testRequest = [[SDLReadDID alloc] initWithDictionary:dict]; expect(testRequest.ecuName).to(equal(@33112)); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m index 9aecc3127..f23c48dd4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m @@ -59,22 +59,22 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_syncMsgVersion:version, - NAMES_appName:@"app56", - NAMES_ttsName:[@[chunk] mutableCopy], - NAMES_ngnMediaScreenAppName:@"whatisanngn", - NAMES_vrSynonyms:[@[@"paraphrase of the original name"] mutableCopy], - NAMES_isMediaApplication:@NO, - NAMES_languageDesired:[SDLLanguage NO_NO], - NAMES_hmiDisplayLanguageDesired:[SDLLanguage PT_PT], - NAMES_appHMIType:[@[[SDLAppHMIType MESSAGING], [SDLAppHMIType INFORMATION]] copy], - NAMES_hashID:@"gercd35grw2", - NAMES_deviceInfo:info, - NAMES_appID:@"123456789", - NAMES_appInfo:appInfo}, - NAMES_operation_name:NAMES_RegisterAppInterface}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncMsgVersion:version, + SDLNameAppName:@"app56", + SDLNameTtsName:[@[chunk] mutableCopy], + SDLNameNgnMediaScreenAppName:@"whatisanngn", + SDLNameVrSynonyms:[@[@"paraphrase of the original name"] mutableCopy], + SDLNameIsMediaApplication:@NO, + SDLNameLanguageDesired:[SDLLanguage NO_NO], + SDLNameHmiDisplayLanguageDesired:[SDLLanguage PT_PT], + SDLNameAppHmiType:[@[[SDLAppHMIType MESSAGING], [SDLAppHMIType INFORMATION]] copy], + SDLNameHashId:@"gercd35grw2", + SDLNameDeviceInfo:info, + SDLNameAppId:@"123456789", + SDLNameAppInfo:appInfo}, + SDLNameOperationName:SDLNameRegisterAppInterface}} mutableCopy]; SDLRegisterAppInterface* testRequest = [[SDLRegisterAppInterface alloc] initWithDictionary:dict]; expect(testRequest.syncMsgVersion).to(equal(version)); @@ -111,4 +111,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m index e99320f18..064f6faaf 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m @@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_properties:[@[[SDLGlobalProperty MENUNAME], [SDLGlobalProperty VRHELPTITLE]] copy]}, - NAMES_operation_name:NAMES_ResetGlobalProperties}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameProperties:[@[[SDLGlobalProperty MENUNAME], [SDLGlobalProperty VRHELPTITLE]] copy]}, + SDLNameOperationName:SDLNameResetGlobalProperties}} mutableCopy]; SDLResetGlobalProperties* testRequest = [[SDLResetGlobalProperties alloc] initWithDictionary:dict]; expect(testRequest.properties).to(equal([@[[SDLGlobalProperty MENUNAME], [SDLGlobalProperty VRHELPTITLE]] copy])); @@ -40,4 +40,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m index 6b1142d6b..0787d4e34 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m @@ -30,12 +30,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_scrollableMessageBody:@"thatmessagebody", - NAMES_timeout:@9182, - NAMES_softButtons:[@[button] mutableCopy]}, - NAMES_operation_name:NAMES_ScrollableMessage}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameScrollableMessageBody:@"thatmessagebody", + SDLNameTimeout:@9182, + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameScrollableMessage}} mutableCopy]; SDLScrollableMessage* testRequest = [[SDLScrollableMessage alloc] initWithDictionary:dict]; expect(testRequest.scrollableMessageBody).to(equal(@"thatmessagebody")); @@ -52,4 +52,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m index ccd4bafdb..c1532a4ec 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m @@ -124,15 +124,15 @@ describe(@"Send Location RPC", ^{ somePhoneNumber = @"248-591-0333"; someImage = [[SDLImage alloc] init]; NSDictionary *initDict = @{ - NAMES_request: @{ - NAMES_parameters: @{ - NAMES_longitudeDegrees: someLongitude, - NAMES_latitudeDegrees: someLatitude, - NAMES_locationName: someLocation, - NAMES_locationDescription: someLocationDescription, - NAMES_addressLines: someAddressLines, - NAMES_phoneNumber: somePhoneNumber, - NAMES_locationImage: someImage + SDLNameRequest: @{ + SDLNameParameters: @{ + SDLNameLongitudeDegrees: someLongitude, + SDLNameLatitudeDegrees: someLatitude, + SDLNameLocationName: someLocation, + SDLNameLocationDescription: someLocationDescription, + SDLNameAddressLines: someAddressLines, + SDLNamePhoneNumber: somePhoneNumber, + SDLNameLocationImage: someImage } } }; @@ -180,8 +180,8 @@ describe(@"Send Location RPC", ^{ context(@"when parameters are not set", ^{ beforeEach(^{ NSDictionary *initDict = @{ - NAMES_request: @{ - NAMES_parameters: @{} + SDLNameRequest: @{ + SDLNameParameters: @{} } }; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m index 9c24c9e91..af6e55771 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_syncFileName:@"A/File/Name"}, - NAMES_operation_name:NAMES_SetAppIcon}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncFileName:@"A/File/Name"}, + SDLNameOperationName:SDLNameSetAppIcon}} mutableCopy]; SDLSetAppIcon* testRequest = [[SDLSetAppIcon alloc] initWithDictionary:dict]; expect(testRequest.syncFileName).to(equal(@"A/File/Name")); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m index 41e63323a..74684e7a7 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_displayLayout:@"wat"}, - NAMES_operation_name:NAMES_SetDisplayLayout}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameDisplayLayout:@"wat"}, + SDLNameOperationName:SDLNameSetDisplayLayout}} mutableCopy]; SDLSetDisplayLayout* testRequest = [[SDLSetDisplayLayout alloc] initWithDictionary:dict]; expect(testRequest.displayLayout).to(equal(@"wat")); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m index 437218896..920363093 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m @@ -46,16 +46,16 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_helpPrompt:[@[chunk1] mutableCopy], - NAMES_timeoutPrompt:[@[chunk2] mutableCopy], - NAMES_vrHelpTitle:@"vr", - NAMES_vrHelp:[@[help] mutableCopy], - NAMES_menuTitle:@"TheNewMenu", - NAMES_menuIcon:image, - NAMES_keyboardProperties:keyboard}, - NAMES_operation_name:NAMES_SetGlobalProperties}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameHelpPrompt:[@[chunk1] mutableCopy], + SDLNameTimeoutPrompt:[@[chunk2] mutableCopy], + SDLNameVrHelpTitle:@"vr", + SDLNameVrHelp:[@[help] mutableCopy], + SDLNameMenuTitle:@"TheNewMenu", + SDLNameMenuIcon:image, + SDLNameKeyboardProperties:keyboard}, + SDLNameOperationName:SDLNameSetGlobalProperties}} mutableCopy]; SDLSetGlobalProperties* testRequest = [[SDLSetGlobalProperties alloc] initWithDictionary:dict]; expect(testRequest.helpPrompt).to(equal([@[chunk1] mutableCopy])); @@ -80,4 +80,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m index 8d2a9a36e..968c64402 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m @@ -33,12 +33,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_startTime:time1, - NAMES_endTime:time2, - NAMES_updateMode:[SDLUpdateMode COUNTUP]}, - NAMES_operation_name:NAMES_SetMediaClockTimer}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameStartTime:time1, + SDLNameEndTime:time2, + SDLNameUpdateMode:[SDLUpdateMode COUNTUP]}, + SDLNameOperationName:SDLNameSetMediaClockTimer}} mutableCopy]; SDLSetMediaClockTimer* testRequest = [[SDLSetMediaClockTimer alloc] initWithDictionary:dict]; expect(testRequest.startTime).to(equal(time1)); @@ -55,4 +55,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m index 3af100462..7e4f1bb64 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m @@ -50,20 +50,20 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_navigationText1:@"nav1", - NAMES_navigationText2:@"nav2", - NAMES_eta:@"4/1/7015", - NAMES_timeToDestination:@"5000 Years", - NAMES_totalDistance:@"1 parsec", - NAMES_turnIcon:image1, - NAMES_nextTurnIcon:image2, - NAMES_distanceToManeuver:@2, - NAMES_distanceToManeuverScale:@4, - NAMES_maneuverComplete:@NO, - NAMES_softButtons:[@[button] mutableCopy]}, - NAMES_operation_name:NAMES_ShowConstantTBT}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameNavigationText1:@"nav1", + SDLNameNavigationText2:@"nav2", + SDLNameEta:@"4/1/7015", + SDLNameTimeToDestination:@"5000 Years", + SDLNameTotalDistance:@"1 parsec", + SDLNameTurnIcon:image1, + SDLNameNextTurnIcon:image2, + SDLNameDistanceToManeuver:@2, + SDLNameDistanceToManeuverScale:@4, + SDLNameManeuverComplete:@NO, + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameShowConstantTbt}} mutableCopy]; SDLShowConstantTBT* testRequest = [[SDLShowConstantTBT alloc] initWithDictionary:dict]; expect(testRequest.navigationText1).to(equal(@"nav1")); @@ -96,4 +96,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m index 3058872e6..71e1300fe 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m @@ -53,21 +53,21 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_mainField1:@"field1", - NAMES_mainField2:@"field2", - NAMES_mainField3:@"field3", - NAMES_mainField4:@"field4", - NAMES_alignment:[SDLTextAlignment LEFT_ALIGNED], - NAMES_statusBar:@"status", - NAMES_mediaClock:@"TheTime", - NAMES_mediaTrack:@"In The Clear", - NAMES_graphic:image1, - NAMES_secondaryGraphic:image2, - NAMES_softButtons:[@[button] mutableCopy], - NAMES_customPresets:[@[@"preset1", @"preset2"] mutableCopy]}, - NAMES_operation_name:NAMES_Show}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameMainField1:@"field1", + SDLNameMainField2:@"field2", + SDLNameMainField3:@"field3", + SDLNameMainField4:@"field4", + SDLNameAlignment:[SDLTextAlignment LEFT_ALIGNED], + SDLNameStatusBar:@"status", + SDLNameMediaClock:@"TheTime", + SDLNameMediaTrack:@"In The Clear", + SDLNameGraphic:image1, + SDLNameSecondaryGraphic:image2, + SDLNameSoftButtons:[@[button] mutableCopy], + SDLNameCustomPresets:[@[@"preset1", @"preset2"] mutableCopy]}, + SDLNameOperationName:SDLNameShow}} mutableCopy]; SDLShow* testRequest = [[SDLShow alloc] initWithDictionary:dict]; expect(testRequest.mainField1).to(equal(@"field1")); @@ -102,4 +102,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m index 7455bcf51..3092d0024 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m @@ -31,14 +31,14 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_numTicks:@2, - NAMES_position:@1, - NAMES_sliderHeader:@"Head", - NAMES_sliderFooter:[@[@"LeftFoot", @"RightFoot"] mutableCopy], - NAMES_timeout:@2000}, - NAMES_operation_name:NAMES_Slider}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameNumTicks:@2, + SDLNamePosition:@1, + SDLNameSliderHeader:@"Head", + SDLNameSliderFooter:[@[@"LeftFoot", @"RightFoot"] mutableCopy], + SDLNameTimeout:@2000}, + SDLNameOperationName:SDLNameSlider}} mutableCopy]; SDLSlider* testRequest = [[SDLSlider alloc] initWithDictionary:dict]; expect(testRequest.numTicks).to(equal(@2)); @@ -59,4 +59,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m index dd6b6a400..999eb9a08 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m @@ -26,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_ttsChunks:[@[chunk] mutableCopy]}, - NAMES_operation_name:NAMES_Speak}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameTtsChunks:[@[chunk] mutableCopy]}, + SDLNameOperationName:SDLNameSpeak}} mutableCopy]; SDLSpeak* testRequest = [[SDLSpeak alloc] initWithDictionary:dict]; expect(testRequest.ttsChunks).to(equal([@[chunk] mutableCopy])); @@ -42,4 +42,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m index d51ae33a6..6759f5fbf 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m @@ -25,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_buttonName:[SDLButtonName PRESET_5]}, - NAMES_operation_name:NAMES_SubscribeButton}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameButtonName:[SDLButtonName PRESET_5]}, + SDLNameOperationName:SDLNameSubscribeButton}} mutableCopy]; SDLSubscribeButton* testRequest = [[SDLSubscribeButton alloc] initWithDictionary:dict]; expect(testRequest.buttonName).to(equal([SDLButtonName PRESET_5])); @@ -41,4 +41,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m index c35d45db3..289d1b344 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m @@ -69,33 +69,33 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_gps:@YES, - NAMES_speed:@NO, - NAMES_rpm:@YES, - NAMES_fuelLevel:@NO, - NAMES_fuelLevel_State:@YES, - NAMES_instantFuelConsumption:@NO, - NAMES_externalTemperature:@YES, - NAMES_prndl:@YES, - NAMES_tirePressure:@NO, - NAMES_odometer:@YES, - NAMES_beltStatus:@NO, - NAMES_bodyInformation:@YES, - NAMES_deviceStatus:@NO, - NAMES_driverBraking:@YES, - NAMES_wiperStatus:@NO, - NAMES_headLampStatus:@YES, - NAMES_engineTorque:@NO, - NAMES_accPedalPosition:@YES, - NAMES_steeringWheelAngle:@NO, - NAMES_eCallInfo:@YES, - NAMES_airbagStatus:@NO, - NAMES_emergencyEvent:@YES, - NAMES_clusterModeStatus:@NO, - NAMES_myKey:@YES}, - NAMES_operation_name:NAMES_SubscribeVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameGps:@YES, + SDLNameSpeed:@NO, + SDLNameRpm:@YES, + SDLNameFuelLevel:@NO, + SDLNameFuelLevelState:@YES, + SDLNameInstantFuelConsumption:@NO, + SDLNameExternalTemperature:@YES, + SDLNamePrndl:@YES, + SDLNameTirePressure:@NO, + SDLNameOdometer:@YES, + SDLNameBeltStatus:@NO, + SDLNameBodyInformation:@YES, + SDLNameDeviceStatus:@NO, + SDLNameDriverBraking:@YES, + SDLNameWiperStatus:@NO, + SDLNameHeadLampStatus:@YES, + SDLNameEngineTorque:@NO, + SDLNameAccPedalPosition:@YES, + SDLNameSteeringWheelAngle:@NO, + SDLNameECallInfo:@YES, + SDLNameAirbagStatus:@NO, + SDLNameEmergencyEvent:@YES, + SDLNameClusterModeStatus:@NO, + SDLNameMyKey:@YES}, + SDLNameOperationName:SDLNameSubscribeVehicleData}} mutableCopy]; SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithDictionary:dict]; expect(testRequest.gps).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m index ade3fb762..a200fb147 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m @@ -26,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_requestType:[SDLRequestType AUTH_REQUEST], - NAMES_fileName:@"AnotherFile"}, - NAMES_operation_name:NAMES_SystemRequest}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameRequestType:[SDLRequestType AUTH_REQUEST], + SDLNameFileName:@"AnotherFile"}, + SDLNameOperationName:SDLNameSystemRequest}} mutableCopy]; SDLSystemRequest* testRequest = [[SDLSystemRequest alloc] initWithDictionary:dict]; expect(testRequest.requestType).to(equal([SDLRequestType AUTH_REQUEST])); @@ -45,4 +45,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m index 4c0bfc3f1..481243a73 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m @@ -25,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_buttonName:[SDLButtonName PRESET_0]}, - NAMES_operation_name:NAMES_UnsubscribeButton}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameButtonName:[SDLButtonName PRESET_0]}, + SDLNameOperationName:SDLNameUnsubscribeButton}} mutableCopy]; SDLUnsubscribeButton* testRequest = [[SDLUnsubscribeButton alloc] initWithDictionary:dict]; expect(testRequest.buttonName).to(equal([SDLButtonName PRESET_0])); @@ -41,4 +41,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m index 1bb2cb125..529862cf4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m @@ -69,33 +69,33 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_gps:@YES, - NAMES_speed:@YES, - NAMES_rpm:@YES, - NAMES_fuelLevel:@YES, - NAMES_fuelLevel_State:@YES, - NAMES_instantFuelConsumption:@YES, - NAMES_externalTemperature:@YES, - NAMES_prndl:@YES, - NAMES_tirePressure:@YES, - NAMES_odometer:@YES, - NAMES_beltStatus:@YES, - NAMES_bodyInformation:@YES, - NAMES_deviceStatus:@YES, - NAMES_driverBraking:@YES, - NAMES_wiperStatus:@YES, - NAMES_headLampStatus:@YES, - NAMES_engineTorque:@YES, - NAMES_accPedalPosition:@YES, - NAMES_steeringWheelAngle:@YES, - NAMES_eCallInfo:@YES, - NAMES_airbagStatus:@YES, - NAMES_emergencyEvent:@YES, - NAMES_clusterModeStatus:@YES, - NAMES_myKey:@YES}, - NAMES_operation_name:NAMES_UnsubscribeVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameGps:@YES, + SDLNameSpeed:@YES, + SDLNameRpm:@YES, + SDLNameFuelLevel:@YES, + SDLNameFuelLevelState:@YES, + SDLNameInstantFuelConsumption:@YES, + SDLNameExternalTemperature:@YES, + SDLNamePrndl:@YES, + SDLNameTirePressure:@YES, + SDLNameOdometer:@YES, + SDLNameBeltStatus:@YES, + SDLNameBodyInformation:@YES, + SDLNameDeviceStatus:@YES, + SDLNameDriverBraking:@YES, + SDLNameWiperStatus:@YES, + SDLNameHeadLampStatus:@YES, + SDLNameEngineTorque:@YES, + SDLNameAccPedalPosition:@YES, + SDLNameSteeringWheelAngle:@YES, + SDLNameECallInfo:@YES, + SDLNameAirbagStatus:@YES, + SDLNameEmergencyEvent:@YES, + SDLNameClusterModeStatus:@YES, + SDLNameMyKey:@YES}, + SDLNameOperationName:SDLNameUnsubscribeVehicleData}} mutableCopy]; SDLUnsubscribeVehicleData* testRequest = [[SDLUnsubscribeVehicleData alloc] initWithDictionary:dict]; expect(testRequest.gps).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m index ae1d55823..4806ef21f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m @@ -30,11 +30,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_turnList:[@[turn] mutableCopy], - NAMES_softButtons:[@[button] mutableCopy]}, - NAMES_operation_name:NAMES_UpdateTurnList}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameTurnList:[@[turn] mutableCopy], + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameUpdateTurnList}} mutableCopy]; SDLUpdateTurnList* testRequest = [[SDLUpdateTurnList alloc] initWithDictionary:dict]; expect(testRequest.turnList).to(equal([@[turn] mutableCopy])); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m index 64e8522c9..a78d757c8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_spaceAvailable:@0}, - NAMES_operation_name:NAMES_DeleteFile}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameSpaceAvailable:@0}, + SDLNameOperationName:SDLNameDeleteFile}} mutableCopy]; SDLDeleteFileResponse* testResponse = [[SDLDeleteFileResponse alloc] initWithDictionary:dict]; expect(testResponse.spaceAvailable).to(equal(@0)); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m index 7507bbe5a..b322f961d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_messageDataResult:[@[@3, @9, @27, @81] mutableCopy]}, - NAMES_operation_name:NAMES_DiagnosticMessage}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameMessageDataResult:[@[@3, @9, @27, @81] mutableCopy]}, + SDLNameOperationName:SDLNameDiagnosticMessage}} mutableCopy]; SDLDiagnosticMessageResponse* testResponse = [[SDLDiagnosticMessageResponse alloc] initWithDictionary:dict]; expect(testResponse.messageDataResult).to(equal([@[@3, @9, @27, @81] mutableCopy])); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m index 150f9bd73..c40eb2cfb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_ecuHeader:@404, - NAMES_dtc:[@[@"FFFF", @"FFFE", @"FFFD"] mutableCopy]}, - NAMES_operation_name:NAMES_GetDTCs}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameEcuHeader:@404, + SDLNameDtc:[@[@"FFFF", @"FFFE", @"FFFD"] mutableCopy]}, + SDLNameOperationName:SDLNameGetDtcs}} mutableCopy]; SDLGetDTCsResponse* testResponse = [[SDLGetDTCsResponse alloc] initWithDictionary:dict]; expect(testResponse.ecuHeader).to(equal(@404)); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m index d70e8f12b..974249c52 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m @@ -84,34 +84,34 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_gps:gps, - NAMES_speed:@100, - NAMES_rpm:@3, - NAMES_fuelLevel:@99.9999, - NAMES_fuelLevel_State:[SDLComponentVolumeStatus FAULT], - NAMES_instantFuelConsumption:@40.7, - NAMES_externalTemperature:@0, - NAMES_vin:@"6574839201", - NAMES_prndl:[SDLPRNDL PARK], - NAMES_tirePressure:tires, - NAMES_odometer:@70000, - NAMES_beltStatus:belt, - NAMES_bodyInformation:body, - NAMES_deviceStatus:device, - NAMES_driverBraking:[SDLVehicleDataEventStatus NO_EVENT], - NAMES_wiperStatus:[SDLWiperStatus AUTO_HIGH], - NAMES_headLampStatus:headLamp, - NAMES_engineTorque:@630.4, - NAMES_accPedalPosition:@0, - NAMES_steeringWheelAngle:@-1500, - NAMES_eCallInfo:eCall, - NAMES_airbagStatus:airbag, - NAMES_emergencyEvent:event, - NAMES_clusterModeStatus:clusterMode, - NAMES_myKey:myKey}, - NAMES_operation_name:NAMES_GetVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameGps:gps, + SDLNameSpeed:@100, + SDLNameRpm:@3, + SDLNameFuelLevel:@99.9999, + SDLNameFuelLevelState:[SDLComponentVolumeStatus FAULT], + SDLNameInstantFuelConsumption:@40.7, + SDLNameExternalTemperature:@0, + SDLNameVin:@"6574839201", + SDLNamePrndl:[SDLPRNDL PARK], + SDLNameTirePressure:tires, + SDLNameOdometer:@70000, + SDLNameBeltStatus:belt, + SDLNameBodyInformation:body, + SDLNameDeviceStatus:device, + SDLNameDriverBraking:[SDLVehicleDataEventStatus NO_EVENT], + SDLNameWiperStatus:[SDLWiperStatus AUTO_HIGH], + SDLNameHeadLampStatus:headLamp, + SDLNameEngineTorque:@630.4, + SDLNameAccPedalPosition:@0, + SDLNameSteeringWheelAngle:@-1500, + SDLNameECallInfo:eCall, + SDLNameAirbagStatus:airbag, + SDLNameEmergencyEvent:event, + SDLNameClusterModeStatus:clusterMode, + SDLNameMyKey:myKey}, + SDLNameOperationName:SDLNameGetVehicleData}} mutableCopy]; SDLGetVehicleDataResponse* testResponse = [[SDLGetVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.gps).to(equal(gps)); @@ -172,4 +172,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m index 824bc7517..8934562eb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_filenames:[@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy], - NAMES_spaceAvailable:@500000000}, - NAMES_operation_name:NAMES_ListFiles}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameFilenames:[@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy], + SDLNameSpaceAvailable:@500000000}, + SDLNameOperationName:SDLNameListFiles}} mutableCopy]; SDLListFilesResponse* testResponse = [[SDLListFilesResponse alloc] initWithDictionary:dict]; expect(testResponse.filenames).to(equal([@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy])); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m index b32b44cd6..15e75cd48 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m @@ -29,12 +29,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_choiceID:@25, - NAMES_manualTextEntry:@"entry", - NAMES_triggerSource:[SDLTriggerSource KEYBOARD]}, - NAMES_operation_name:NAMES_PerformInteraction}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameChoiceId:@25, + SDLNameManualTextEntry:@"entry", + SDLNameTriggerSource:[SDLTriggerSource KEYBOARD]}, + SDLNameOperationName:SDLNamePerformInteraction}} mutableCopy]; SDLPerformInteractionResponse* testResponse = [[SDLPerformInteractionResponse alloc] initWithDictionary:dict]; expect(testResponse.choiceID).to(equal(@25)); @@ -51,4 +51,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m index 565f97a79..52ed9bf7b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_spaceAvailable:@1248}, - NAMES_operation_name:NAMES_PutFile}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameSpaceAvailable:@1248}, + SDLNameOperationName:SDLNamePutFile}} mutableCopy]; SDLPutFileResponse* testResponse = [[SDLPutFileResponse alloc] initWithDictionary:dict]; expect(testResponse.spaceAvailable).to(equal(@1248)); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m index 0ae2c5b9d..4dc152c48 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m @@ -26,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_didResult:[@[result] mutableCopy]}, - NAMES_operation_name:NAMES_ReadDID}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameDidResult:[@[result] mutableCopy]}, + SDLNameOperationName:SDLNameReadDid}} mutableCopy]; SDLReadDIDResponse* testResponse = [[SDLReadDIDResponse alloc] initWithDictionary:dict]; expect(testResponse.didResult).to(equal([@[result] mutableCopy])); @@ -42,4 +42,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m index 62eb9b152..c3f40d585 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m @@ -65,27 +65,27 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_syncMsgVersion:version, - NAMES_language:[SDLLanguage ES_MX], - NAMES_hmiDisplayLanguage:[SDLLanguage RU_RU], - NAMES_displayCapabilities:info, - NAMES_buttonCapabilities:[@[button] mutableCopy], - NAMES_softButtonCapabilities:[@[softButton] mutableCopy], - NAMES_presetBankCapabilities:presetBank, - NAMES_hmiZoneCapabilities:[@[[SDLHMIZoneCapabilities BACK], [SDLHMIZoneCapabilities FRONT]] copy], - NAMES_speechCapabilities:[@[[SDLSpeechCapabilities SAPI_PHONEMES], [SDLSpeechCapabilities SILENCE]] copy], - NAMES_vrCapabilities:[@[[SDLVRCapabilities TEXT]] copy], - NAMES_audioPassThruCapabilities:[@[audioPassThru] mutableCopy], - NAMES_vehicleType:vehicle, - NAMES_prerecordedSpeech:[@[[SDLPrerecordedSpeech LISTEN_JINGLE], [SDLPrerecordedSpeech HELP_JINGLE]] mutableCopy], - NAMES_supportedDiagModes:[@[@67, @99, @111] mutableCopy], - NAMES_hmiCapabilities: hmiCapabilities, - NAMES_sdlVersion: @"sdlVersion", - NAMES_systemSoftwareVersion: @"systemSoftwareVersion" + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncMsgVersion:version, + SDLNameLanguage:[SDLLanguage ES_MX], + SDLNameHmiDisplayLanguage:[SDLLanguage RU_RU], + SDLNameDisplayCapabilities:info, + SDLNameButtonCapabilities:[@[button] mutableCopy], + SDLNameSoftButtonCapabilities:[@[softButton] mutableCopy], + SDLNamePresetBankCapabilities:presetBank, + SDLNameHmiZoneCapabilities:[@[[SDLHMIZoneCapabilities BACK], [SDLHMIZoneCapabilities FRONT]] copy], + SDLNameSpeechCapabilities:[@[[SDLSpeechCapabilities SAPI_PHONEMES], [SDLSpeechCapabilities SILENCE]] copy], + SDLNameVrCapabilities:[@[[SDLVRCapabilities TEXT]] copy], + SDLNameAudioPassThruCapabilities:[@[audioPassThru] mutableCopy], + SDLNameVehicleType:vehicle, + SDLNamePrerecordedSpeech:[@[[SDLPrerecordedSpeech LISTEN_JINGLE], [SDLPrerecordedSpeech HELP_JINGLE]] mutableCopy], + SDLNameSupportedDiagModes:[@[@67, @99, @111] mutableCopy], + SDLNameHmiCapabilities: hmiCapabilities, + SDLNameSdlVersion: @"sdlVersion", + SDLNameSystemSoftwareVersion: @"systemSoftwareVersion" }, - NAMES_operation_name:NAMES_RegisterAppInterface}} mutableCopy]; + SDLNameOperationName:SDLNameRegisterAppInterface}} mutableCopy]; SDLRegisterAppInterfaceResponse* testResponse = [[SDLRegisterAppInterfaceResponse alloc] initWithDictionary:dict]; expect(testResponse.syncMsgVersion).to(equal(version)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m index 3eeab76a1..a589bfeea 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m @@ -39,13 +39,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_displayCapabilities:info, - NAMES_buttonCapabilities:[@[button] mutableCopy], - NAMES_softButtonCapabilities:[@[softButton] mutableCopy], - NAMES_presetBankCapabilities:presetBank}, - NAMES_operation_name:NAMES_SetDisplayLayout}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameDisplayCapabilities:info, + SDLNameButtonCapabilities:[@[button] mutableCopy], + SDLNameSoftButtonCapabilities:[@[softButton] mutableCopy], + SDLNamePresetBankCapabilities:presetBank}, + SDLNameOperationName:SDLNameSetDisplayLayout}} mutableCopy]; SDLSetDisplayLayoutResponse* testResponse = [[SDLSetDisplayLayoutResponse alloc] initWithDictionary:dict]; expect(testResponse.displayCapabilities).to(equal(info)); @@ -64,4 +64,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m index 6f92c1e48..61666d57b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m @@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_sliderPosition:@13}, - NAMES_operation_name:NAMES_Slider}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameSliderPosition:@13}, + SDLNameOperationName:SDLNameSlider}} mutableCopy]; SDLSliderResponse* testResponse = [[SDLSliderResponse alloc] initWithDictionary:dict]; expect(testResponse.sliderPosition).to(equal(@13)); @@ -40,4 +40,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m index d6c0dc6ac..bc7db3765 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m @@ -73,33 +73,33 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_gps:vehicleDataResult, - NAMES_speed:vehicleDataResult, - NAMES_rpm:vehicleDataResult, - NAMES_fuelLevel:vehicleDataResult, - NAMES_fuelLevel_State:vehicleDataResult, - NAMES_instantFuelConsumption:vehicleDataResult, - NAMES_externalTemperature:vehicleDataResult, - NAMES_prndl:vehicleDataResult, - NAMES_tirePressure:vehicleDataResult, - NAMES_odometer:vehicleDataResult, - NAMES_beltStatus:vehicleDataResult, - NAMES_bodyInformation:vehicleDataResult, - NAMES_deviceStatus:vehicleDataResult, - NAMES_driverBraking:vehicleDataResult, - NAMES_wiperStatus:vehicleDataResult, - NAMES_headLampStatus:vehicleDataResult, - NAMES_engineTorque:vehicleDataResult, - NAMES_accPedalPosition:vehicleDataResult, - NAMES_steeringWheelAngle:vehicleDataResult, - NAMES_eCallInfo:vehicleDataResult, - NAMES_airbagStatus:vehicleDataResult, - NAMES_emergencyEvent:vehicleDataResult, - NAMES_clusterModes:vehicleDataResult, - NAMES_myKey:vehicleDataResult}, - NAMES_operation_name:NAMES_SubscribeVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameGps:vehicleDataResult, + SDLNameSpeed:vehicleDataResult, + SDLNameRpm:vehicleDataResult, + SDLNameFuelLevel:vehicleDataResult, + SDLNameFuelLevelState:vehicleDataResult, + SDLNameInstantFuelConsumption:vehicleDataResult, + SDLNameExternalTemperature:vehicleDataResult, + SDLNamePrndl:vehicleDataResult, + SDLNameTirePressure:vehicleDataResult, + SDLNameOdometer:vehicleDataResult, + SDLNameBeltStatus:vehicleDataResult, + SDLNameBodyInformation:vehicleDataResult, + SDLNameDeviceStatus:vehicleDataResult, + SDLNameDriverBraking:vehicleDataResult, + SDLNameWiperStatus:vehicleDataResult, + SDLNameHeadLampStatus:vehicleDataResult, + SDLNameEngineTorque:vehicleDataResult, + SDLNameAccPedalPosition:vehicleDataResult, + SDLNameSteeringWheelAngle:vehicleDataResult, + SDLNameECallInfo:vehicleDataResult, + SDLNameAirbagStatus:vehicleDataResult, + SDLNameEmergencyEvent:vehicleDataResult, + SDLNameClusterModes:vehicleDataResult, + SDLNameMyKey:vehicleDataResult}, + SDLNameOperationName:SDLNameSubscribeVehicleData}} mutableCopy]; SDLSubscribeVehicleDataResponse* testResponse = [[SDLSubscribeVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.gps).to(equal(vehicleDataResult)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m index 29cb4e08c..0089e1ccf 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m @@ -73,33 +73,33 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_gps:vehicleDataResult, - NAMES_speed:vehicleDataResult, - NAMES_rpm:vehicleDataResult, - NAMES_fuelLevel:vehicleDataResult, - NAMES_fuelLevel_State:vehicleDataResult, - NAMES_instantFuelConsumption:vehicleDataResult, - NAMES_externalTemperature:vehicleDataResult, - NAMES_prndl:vehicleDataResult, - NAMES_tirePressure:vehicleDataResult, - NAMES_odometer:vehicleDataResult, - NAMES_beltStatus:vehicleDataResult, - NAMES_bodyInformation:vehicleDataResult, - NAMES_deviceStatus:vehicleDataResult, - NAMES_driverBraking:vehicleDataResult, - NAMES_wiperStatus:vehicleDataResult, - NAMES_headLampStatus:vehicleDataResult, - NAMES_engineTorque:vehicleDataResult, - NAMES_accPedalPosition:vehicleDataResult, - NAMES_steeringWheelAngle:vehicleDataResult, - NAMES_eCallInfo:vehicleDataResult, - NAMES_airbagStatus:vehicleDataResult, - NAMES_emergencyEvent:vehicleDataResult, - NAMES_clusterModes:vehicleDataResult, - NAMES_myKey:vehicleDataResult}, - NAMES_operation_name:NAMES_UnsubscribeVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameGps:vehicleDataResult, + SDLNameSpeed:vehicleDataResult, + SDLNameRpm:vehicleDataResult, + SDLNameFuelLevel:vehicleDataResult, + SDLNameFuelLevelState:vehicleDataResult, + SDLNameInstantFuelConsumption:vehicleDataResult, + SDLNameExternalTemperature:vehicleDataResult, + SDLNamePrndl:vehicleDataResult, + SDLNameTirePressure:vehicleDataResult, + SDLNameOdometer:vehicleDataResult, + SDLNameBeltStatus:vehicleDataResult, + SDLNameBodyInformation:vehicleDataResult, + SDLNameDeviceStatus:vehicleDataResult, + SDLNameDriverBraking:vehicleDataResult, + SDLNameWiperStatus:vehicleDataResult, + SDLNameHeadLampStatus:vehicleDataResult, + SDLNameEngineTorque:vehicleDataResult, + SDLNameAccPedalPosition:vehicleDataResult, + SDLNameSteeringWheelAngle:vehicleDataResult, + SDLNameECallInfo:vehicleDataResult, + SDLNameAirbagStatus:vehicleDataResult, + SDLNameEmergencyEvent:vehicleDataResult, + SDLNameClusterModes:vehicleDataResult, + SDLNameMyKey:vehicleDataResult}, + SDLNameOperationName:SDLNameUnsubscribeVehicleData}} mutableCopy]; SDLUnsubscribeVehicleDataResponse* testResponse = [[SDLUnsubscribeVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.gps).to(equal(vehicleDataResult)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m index ea88855c5..6ce077a0c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m @@ -39,14 +39,14 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_driverAirbagDeployed:[SDLVehicleDataEventStatus _YES], - NAMES_driverSideAirbagDeployed:[SDLVehicleDataEventStatus NO_EVENT], - NAMES_driverCurtainAirbagDeployed:[SDLVehicleDataEventStatus _NO], - NAMES_passengerAirbagDeployed:[SDLVehicleDataEventStatus NOT_SUPPORTED], - NAMES_passengerCurtainAirbagDeployed:[SDLVehicleDataEventStatus FAULT], - NAMES_driverKneeAirbagDeployed:[SDLVehicleDataEventStatus _NO], - NAMES_passengerSideAirbagDeployed:[SDLVehicleDataEventStatus _YES], - NAMES_passengerKneeAirbagDeployed:[SDLVehicleDataEventStatus NO_EVENT]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameDriverAirbagDeployed:[SDLVehicleDataEventStatus _YES], + SDLNameDriverSideAirbagDeployed:[SDLVehicleDataEventStatus NO_EVENT], + SDLNameDriverCurtainAirbagDeployed:[SDLVehicleDataEventStatus _NO], + SDLNamePassengerAirbagDeployed:[SDLVehicleDataEventStatus NOT_SUPPORTED], + SDLNamePassengerCurtainAirbagDeployed:[SDLVehicleDataEventStatus FAULT], + SDLNameDriverKneeAirbagDeployed:[SDLVehicleDataEventStatus _NO], + SDLNamePassengerSideAirbagDeployed:[SDLVehicleDataEventStatus _YES], + SDLNamePassengerKneeAirbagDeployed:[SDLVehicleDataEventStatus NO_EVENT]} mutableCopy]; SDLAirbagStatus* testStruct = [[SDLAirbagStatus alloc] initWithDictionary:dict]; expect(testStruct.driverAirbagDeployed).to(equal([SDLVehicleDataEventStatus _YES])); @@ -73,4 +73,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m index 424c299b8..73e2fc1bd 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m @@ -28,9 +28,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_appDisplayName:@"display name", - NAMES_appVersion:@"1.2.3.4", - NAMES_appBundleID:@"com.app.bundle"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameAppDisplayName:@"display name", + SDLNameAppVersion:@"1.2.3.4", + SDLNameAppBundleId:@"com.app.bundle"} mutableCopy]; SDLAppInfo* testStruct = [[SDLAppInfo alloc] initWithDictionary:dict]; expect(testStruct.appDisplayName).to(equal(@"display name")); @@ -47,4 +47,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m index 8d66fc8af..e4b62e1ff 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m @@ -31,9 +31,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_samplingRate:[SDLSamplingRate _22KHZ], - NAMES_bitsPerSample:[SDLBitsPerSample _8_BIT], - NAMES_audioType:[SDLAudioType PCM]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameSamplingRate:[SDLSamplingRate _22KHZ], + SDLNameBitsPerSample:[SDLBitsPerSample _8_BIT], + SDLNameAudioType:[SDLAudioType PCM]} mutableCopy]; SDLAudioPassThruCapabilities* testStruct = [[SDLAudioPassThruCapabilities alloc] initWithDictionary:dict]; expect(testStruct.samplingRate).to(equal([SDLSamplingRate _22KHZ])); @@ -50,4 +50,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m index e0d8c4883..761ff193b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m @@ -53,21 +53,21 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_driverBeltDeployed:[SDLVehicleDataEventStatus NO_EVENT], - NAMES_passengerBeltDeployed:[SDLVehicleDataEventStatus _YES], - NAMES_passengerBuckleBelted:[SDLVehicleDataEventStatus _NO], - NAMES_driverBuckleBelted:[SDLVehicleDataEventStatus FAULT], - NAMES_leftRow2BuckleBelted:[SDLVehicleDataEventStatus _YES], - NAMES_passengerChildDetected:[SDLVehicleDataEventStatus _NO], - NAMES_rightRow2BuckleBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED], - NAMES_middleRow2BuckleBelted:[SDLVehicleDataEventStatus NO_EVENT], - NAMES_middleRow3BuckleBelted:[SDLVehicleDataEventStatus _YES], - NAMES_leftRow3BuckleBelted:[SDLVehicleDataEventStatus FAULT], - NAMES_rightRow3BuckleBelted:[SDLVehicleDataEventStatus _NO], - NAMES_leftRearInflatableBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED], - NAMES_rightRearInflatableBelted:[SDLVehicleDataEventStatus FAULT], - NAMES_middleRow1BeltDeployed:[SDLVehicleDataEventStatus NO_EVENT], - NAMES_middleRow1BuckleBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameDriverBeltDeployed:[SDLVehicleDataEventStatus NO_EVENT], + SDLNamePassengerBeltDeployed:[SDLVehicleDataEventStatus _YES], + SDLNamePassengerBuckleBelted:[SDLVehicleDataEventStatus _NO], + SDLNameDriverBuckleBelted:[SDLVehicleDataEventStatus FAULT], + SDLNameLeftRow2BuckleBelted:[SDLVehicleDataEventStatus _YES], + SDLNamePassengerChildDetected:[SDLVehicleDataEventStatus _NO], + SDLNameRightRow2BuckleBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED], + SDLNameMiddleRow2BuckleBelted:[SDLVehicleDataEventStatus NO_EVENT], + SDLNameMiddleRow3BuckleBelted:[SDLVehicleDataEventStatus _YES], + SDLNameLeftRow3BuckleBelted:[SDLVehicleDataEventStatus FAULT], + SDLNameRightRow3BuckleBelted:[SDLVehicleDataEventStatus _NO], + SDLNameLeftRearInflatableBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED], + SDLNameRightRearInflatableBelted:[SDLVehicleDataEventStatus FAULT], + SDLNameMiddleRow1BeltDeployed:[SDLVehicleDataEventStatus NO_EVENT], + SDLNameMiddleRow1BuckleBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED]} mutableCopy]; SDLBeltStatus* testStruct = [[SDLBeltStatus alloc] initWithDictionary:dict]; expect(testStruct.driverBeltDeployed).to(equal([SDLVehicleDataEventStatus NO_EVENT])); @@ -108,4 +108,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m index a13a7cc9c..70688afed 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m @@ -37,13 +37,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_parkBrakeActive:@YES, - NAMES_ignitionStableStatus:[SDLIgnitionStableStatus IGNITION_SWITCH_NOT_STABLE], - NAMES_ignitionStatus:[SDLIgnitionStatus START], - NAMES_driverDoorAjar:@NO, - NAMES_passengerDoorAjar:@NO, - NAMES_rearLeftDoorAjar:@NO, - NAMES_rearRightDoorAjar:@YES} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameParkBrakeActive:@YES, + SDLNameIgnitionStableStatus:[SDLIgnitionStableStatus IGNITION_SWITCH_NOT_STABLE], + SDLNameIgnitionStatus:[SDLIgnitionStatus START], + SDLNameDriverDoorAjar:@NO, + SDLNamePassengerDoorAjar:@NO, + SDLNameRearLeftDoorAjar:@NO, + SDLNameRearRightDoorAjar:@YES} mutableCopy]; SDLBodyInformation* testStruct = [[SDLBodyInformation alloc] initWithDictionary:dict]; expect(testStruct.parkBrakeActive).to(equal(@YES)); @@ -68,4 +68,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m index a5f753629..5cce60c0a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m @@ -31,10 +31,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_name:[SDLButtonName CUSTOM_BUTTON], - NAMES_shortPressAvailable:@YES, - NAMES_longPressAvailable:@YES, - NAMES_upDownAvailable:@NO} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameName:[SDLButtonName CUSTOM_BUTTON], + SDLNameShortPressAvailable:@YES, + SDLNameLongPressAvailable:@YES, + SDLNameUpDownAvailable:@NO} mutableCopy]; SDLButtonCapabilities* testStruct = [[SDLButtonCapabilities alloc] initWithDictionary:dict]; expect(testStruct.name).to(equal([SDLButtonName CUSTOM_BUTTON])); @@ -53,4 +53,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m index 63116976a..09857a90e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m @@ -40,13 +40,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_choiceID:@3, - NAMES_menuName:@"Hello", - NAMES_vrCommands:[@[@"1", @"2"] mutableCopy], - NAMES_image:image, - NAMES_secondaryText:@"Arbitrary", - NAMES_tertiaryText:@"qwerty", - NAMES_secondaryImage:secondaryImage} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameChoiceId:@3, + SDLNameMenuName:@"Hello", + SDLNameVrCommands:[@[@"1", @"2"] mutableCopy], + SDLNameImage:image, + SDLNameSecondaryText:@"Arbitrary", + SDLNameTertiaryText:@"qwerty", + SDLNameSecondaryImage:secondaryImage} mutableCopy]; SDLChoice* testStruct = [[SDLChoice alloc] initWithDictionary:dict]; expect(testStruct.choiceID).to(equal(@3)); @@ -71,4 +71,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m index 8e74324cf..459937f42 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m @@ -32,10 +32,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_powerModeActive:@NO, - NAMES_powerModeQualificationStatus:[SDLPowerModeQualificationStatus POWER_MODE_OK], - NAMES_carModeStatus:[SDLCarModeStatus CRASH], - NAMES_powerModeStatus:[SDLPowerModeStatus KEY_OUT]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNamePowerModeActive:@NO, + SDLNamePowerModeQualificationStatus:[SDLPowerModeQualificationStatus POWER_MODE_OK], + SDLNameCarModeStatus:[SDLCarModeStatus CRASH], + SDLNamePowerModeStatus:[SDLPowerModeStatus KEY_OUT]} mutableCopy]; SDLClusterModeStatus* testStruct = [[SDLClusterModeStatus alloc] initWithDictionary:dict]; expect(testStruct.powerModeActive).to(equal(@NO)); @@ -54,4 +54,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m index db626f959..f88b1d92e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m @@ -29,9 +29,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_resultCode:[SDLVehicleDataResultCode DATA_NOT_SUBSCRIBED], - NAMES_didLocation:@300, - NAMES_data:@"gertwydhty4235tdhedt4tue"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResultCode:[SDLVehicleDataResultCode DATA_NOT_SUBSCRIBED], + SDLNameDidLocation:@300, + SDLNameData:@"gertwydhty4235tdhedt4tue"} mutableCopy]; SDLDIDResult* testStruct = [[SDLDIDResult alloc] initWithDictionary:dict]; expect(testStruct.resultCode).to(equal([SDLVehicleDataResultCode DATA_NOT_SUBSCRIBED])); @@ -48,4 +48,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m index beb3b2d80..bfc36e708 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m @@ -33,12 +33,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_hardware:@"GDFR34F", - NAMES_firmwareRev:@"4.2a", - NAMES_os:@"Robot", - NAMES_osVersion:@"9.9", - NAMES_carrier:@"ThatOneWirelessCompany", - NAMES_maxNumberRFCOMMPorts:@20} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameHardware:@"GDFR34F", + SDLNameFirmwareRev:@"4.2a", + SDLNameOs:@"Robot", + SDLNameOsVersion:@"9.9", + SDLNameCarrier:@"ThatOneWirelessCompany", + SDLNameMaxNumberRfcommPorts:@20} mutableCopy]; SDLDeviceInfo* testStruct = [[SDLDeviceInfo alloc] initWithDictionary:dict]; expect(testStruct.hardware).to(equal(@"GDFR34F")); @@ -61,4 +61,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m index 1996e45a8..b15902c6c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m @@ -46,17 +46,17 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_voiceRecOn:@NO, - NAMES_btIconOn:@NO, - NAMES_callActive:@YES, - NAMES_phoneRoaming:@NO, - NAMES_textMsgAvailable:@YES, - NAMES_battLevelStatus:[SDLDeviceLevelStatus FOUR_LEVEL_BARS], - NAMES_stereoAudioOutputMuted:@YES, - NAMES_monoAudioOutputMuted:@YES, - NAMES_signalLevelStatus:[SDLDeviceLevelStatus TWO_LEVEL_BARS], - NAMES_primaryAudioSource:[SDLPrimaryAudioSource BLUETOOTH_STEREO_BTST], - NAMES_eCallEventActive:@NO} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameVoiceRecOn:@NO, + SDLNameBluetoothIconOn:@NO, + SDLNameCallActive:@YES, + SDLNamePhoneRoaming:@NO, + SDLNameTextMsgAvailable:@YES, + SDLNameBattLevelStatus:[SDLDeviceLevelStatus FOUR_LEVEL_BARS], + SDLNameStereoAudioOutputMuted:@YES, + SDLNameMonoAudioOutputMuted:@YES, + SDLNameSignalLevelStatus:[SDLDeviceLevelStatus TWO_LEVEL_BARS], + SDLNamePrimaryAudioSource:[SDLPrimaryAudioSource BLUETOOTH_STEREO_BTST], + SDLNameECallEventActive:@NO} mutableCopy]; SDLDeviceStatus* testStruct = [[SDLDeviceStatus alloc] initWithDictionary:dict]; expect(testStruct.voiceRecOn).to(equal(@NO)); @@ -89,4 +89,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m index 02cac7f54..1db8cea08 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m @@ -47,14 +47,14 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_displayType:[SDLDisplayType GEN2_6_DMA], - NAMES_textFields:[@[textField] mutableCopy], - NAMES_imageFields:[@[imageField] mutableCopy], - NAMES_mediaClockFormats:[@[[SDLMediaClockFormat CLOCKTEXT1], [SDLMediaClockFormat CLOCK3], [SDLMediaClockFormat CLOCKTEXT3]] copy], - NAMES_graphicSupported:@YES, - NAMES_templatesAvailable:[@[@"String", @"String", @"String"] mutableCopy], - NAMES_screenParams:screenParams, - NAMES_numCustomPresetsAvailable:@43} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameDisplayType:[SDLDisplayType GEN2_6_DMA], + SDLNameTextFields:[@[textField] mutableCopy], + SDLNameImageFields:[@[imageField] mutableCopy], + SDLNameMediaClockFormats:[@[[SDLMediaClockFormat CLOCKTEXT1], [SDLMediaClockFormat CLOCK3], [SDLMediaClockFormat CLOCKTEXT3]] copy], + SDLNameGraphicSupported:@YES, + SDLNameTemplatesAvailable:[@[@"String", @"String", @"String"] mutableCopy], + SDLNameScreenParams:screenParams, + SDLNameNumCustomPresetsAvailable:@43} mutableCopy]; SDLDisplayCapabilities* testStruct = [[SDLDisplayCapabilities alloc] initWithDictionary:dict]; expect(testStruct.displayType).to(equal([SDLDisplayType GEN2_6_DMA])); @@ -81,4 +81,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m index 28e226187..2e553a218 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m @@ -30,9 +30,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_eCallNotificationStatus:[SDLVehicleDataNotificationStatus NORMAL], - NAMES_auxECallNotificationStatus:[SDLVehicleDataNotificationStatus ACTIVE], - NAMES_eCallConfirmationStatus:[SDLECallConfirmationStatus CALL_IN_PROGRESS]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameECallNotificationStatus:[SDLVehicleDataNotificationStatus NORMAL], + SDLNameAuxECallNotificationStatus:[SDLVehicleDataNotificationStatus ACTIVE], + SDLNameECallConfirmationStatus:[SDLECallConfirmationStatus CALL_IN_PROGRESS]} mutableCopy]; SDLECallInfo* testStruct = [[SDLECallInfo alloc] initWithDictionary:dict]; expect(testStruct.eCallNotificationStatus).to(equal([SDLVehicleDataNotificationStatus NORMAL])); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m index c67f45d45..2706297c2 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m @@ -35,11 +35,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_emergencyEventType:[SDLEmergencyEventType FRONTAL], - NAMES_fuelCutoffStatus:[SDLFuelCutoffStatus NORMAL_OPERATION], - NAMES_rolloverEvent:[SDLVehicleDataEventStatus _YES], - NAMES_maximumChangeVelocity:@33, - NAMES_multipleEvents:[SDLVehicleDataEventStatus _NO]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameEmergencyEventType:[SDLEmergencyEventType FRONTAL], + SDLNameFuelCutoffStatus:[SDLFuelCutoffStatus NORMAL_OPERATION], + SDLNameRolloverEvent:[SDLVehicleDataEventStatus _YES], + SDLNameMaximumChangeVelocity:@33, + SDLNameMultipleEvents:[SDLVehicleDataEventStatus _NO]} mutableCopy]; SDLEmergencyEvent* testStruct = [[SDLEmergencyEvent alloc] initWithDictionary:dict]; expect(testStruct.emergencyEventType).to(equal([SDLEmergencyEventType FRONTAL])); @@ -60,4 +60,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m index 6d19dbf77..e88bfaaab 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m @@ -60,24 +60,24 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_longitudeDegrees:@31.41592653589793, - NAMES_latitudeDegrees:@45, - NAMES_utcYear:@2015, - NAMES_utcMonth:@1, - NAMES_utcDay:@26, - NAMES_utcHours:@23, - NAMES_utcMinutes:@59, - NAMES_utcSeconds:@59, - NAMES_compassDirection:[SDLCompassDirection SOUTHEAST], - NAMES_pdop:@3.4, - NAMES_hdop:@9.9, - NAMES_vdop:@0, - NAMES_actual:@NO, - NAMES_satellites:@12, - NAMES_dimension:[SDLDimension _3D], - NAMES_altitude:@3000, - NAMES_heading:@96, - NAMES_speed:@64} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameLongitudeDegrees:@31.41592653589793, + SDLNameLatitudeDegrees:@45, + SDLNameUtcYear:@2015, + SDLNameUtcMonth:@1, + SDLNameUtcDay:@26, + SDLNameUtcHours:@23, + SDLNameUtcMinutes:@59, + SDLNameUtcSeconds:@59, + SDLNameCompassDirection:[SDLCompassDirection SOUTHEAST], + SDLNamePdop:@3.4, + SDLNameHdop:@9.9, + SDLNameVdop:@0, + SDLNameActual:@NO, + SDLNameSatellites:@12, + SDLNameDimension:[SDLDimension _3D], + SDLNameAltitude:@3000, + SDLNameHeading:@96, + SDLNameSpeed:@64} mutableCopy]; SDLGPSData* testStruct = [[SDLGPSData alloc] initWithDictionary:dict]; expect(testStruct.longitudeDegrees).to(equal(@31.41592653589793)); @@ -124,4 +124,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m index e9935bedf..4121992df 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m @@ -36,8 +36,8 @@ describe(@"SDLHMICapabilities struct", ^{ context(@"When initialized with a dictionary", ^{ beforeEach(^{ NSDictionary *structInitDict = @{ - NAMES_navigation: someNavigationState, - NAMES_phoneCall: somePhoneCallState + SDLNameNavigation: someNavigationState, + SDLNamePhoneCall: somePhoneCallState }; testStruct = [[SDLHMICapabilities alloc] initWithDictionary:[structInitDict mutableCopy]]; }); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m index 63df146cb..b02c79c2a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m @@ -26,8 +26,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_allowed:[@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy], - NAMES_userDisallowed:[@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] copy]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameAllowed:[@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy], + SDLNameUserDisallowed:[@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] copy]} mutableCopy]; SDLHMIPermissions* testStruct = [[SDLHMIPermissions alloc] initWithDictionary:dict]; expect(testStruct.allowed).to(equal([@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy])); @@ -42,4 +42,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m index b418b962b..a84c2f98b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m @@ -29,9 +29,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_lowBeamsOn:@YES, - NAMES_highBeamsOn:@NO, - NAMES_ambientLightSensorStatus:[SDLAmbientLightStatus TWILIGHT_3]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameLowBeamsOn:@YES, + SDLNameHighBeamsOn:@NO, + SDLNameAmbientLightSensorStatus:[SDLAmbientLightStatus TWILIGHT_3]} mutableCopy]; SDLHeadLampStatus* testStruct = [[SDLHeadLampStatus alloc] initWithDictionary:dict]; expect(testStruct.lowBeamsOn).to(equal(@YES)); @@ -48,4 +48,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m index 2bcef11f1..0e7556b12 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m @@ -33,9 +33,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_name:[SDLImageFieldName turnIcon], - NAMES_imageTypeSupported:[@[[SDLFileType GRAPHIC_PNG], [SDLFileType GRAPHIC_JPEG]] copy], - NAMES_imageResolution:resolution} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameName:[SDLImageFieldName turnIcon], + SDLNameImageTypeSupported:[@[[SDLFileType GRAPHIC_PNG], [SDLFileType GRAPHIC_JPEG]] copy], + SDLNameImageResolution:resolution} mutableCopy]; SDLImageField* testStruct = [[SDLImageField alloc] initWithDictionary:dict]; expect(testStruct.name).to(equal([SDLImageFieldName turnIcon])); @@ -52,4 +52,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m index dba2d630e..ff33f04f2 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m @@ -27,8 +27,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_value:@"value", - NAMES_imageType:[SDLImageType STATIC]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameValue:@"value", + SDLNameImageType:[SDLImageType STATIC]} mutableCopy]; SDLImage* testStruct = [[SDLImage alloc] initWithDictionary:dict]; expect(testStruct.value).to(equal(@"value")); @@ -43,4 +43,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m index 3e6793b62..c1c9410fe 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m @@ -35,11 +35,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_language:[SDLLanguage DA_DK], - NAMES_keyboardLayout:[SDLKeyboardLayout QWERTZ], - NAMES_keypressMode:[SDLKeypressMode RESEND_CURRENT_ENTRY], - NAMES_limitedCharacterList:[@[@"s", @"r", @"f", @"q"] mutableCopy], - NAMES_autoCompleteText:@"Auto Carrot"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameLanguage:[SDLLanguage DA_DK], + SDLNameKeyboardLayout:[SDLKeyboardLayout QWERTZ], + SDLNameKeypressMode:[SDLKeypressMode RESEND_CURRENT_ENTRY], + SDLNameLimitedCharacterList:[@[@"s", @"r", @"f", @"q"] mutableCopy], + SDLNameAutoCompleteText:@"Auto Carrot"} mutableCopy]; SDLKeyboardProperties* testStruct = [[SDLKeyboardProperties alloc] initWithDictionary:dict]; expect(testStruct.language).to(equal([SDLLanguage DA_DK])); @@ -60,4 +60,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m index 3d6bc6462..72b8029d4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m @@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_parentID:@504320489, - NAMES_position:@256, - NAMES_menuName:@"Menu"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameParentId:@504320489, + SDLNamePosition:@256, + SDLNameMenuName:@"Menu"} mutableCopy]; SDLMenuParams* testStruct = [[SDLMenuParams alloc] initWithDictionary:dict]; expect(testStruct.parentID).to(equal(@504320489)); @@ -46,4 +46,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m index c442e2cfc..1b546613c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m @@ -25,7 +25,7 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_e911Override:[SDLVehicleDataStatus ON]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameE911Override:[SDLVehicleDataStatus ON]} mutableCopy]; SDLMyKey* testStruct = [[SDLMyKey alloc] initWithDictionary:dict]; expect(testStruct.e911Override).to(equal([SDLVehicleDataStatus ON])); @@ -38,4 +38,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m index 08e375e9f..80558faf3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m @@ -26,8 +26,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_allowed:[@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy], - NAMES_userDisallowed:[@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] copy]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameAllowed:[@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy], + SDLNameUserDisallowed:[@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] copy]} mutableCopy]; SDLParameterPermissions* testStruct = [[SDLParameterPermissions alloc] initWithDictionary:dict]; expect(testStruct.allowed).to(equal([@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy])); @@ -42,4 +42,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m index 0e5b367d1..e19b64258 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m @@ -32,9 +32,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_rpcName:@"RPCNameThing", - NAMES_hmiPermissions:hmiPermissions, - NAMES_parameterPermissions:parameterPermissions} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRpcName:@"RPCNameThing", + SDLNameHmiPermissions:hmiPermissions, + SDLNameParameterPermissions:parameterPermissions} mutableCopy]; SDLPermissionItem* testStruct = [[SDLPermissionItem alloc] initWithDictionary:dict]; expect(testStruct.rpcName).to(equal(@"RPCNameThing")); @@ -51,4 +51,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m index f473c60b6..16330022f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m @@ -23,7 +23,7 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_onScreenPresetsAvailable:@YES} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameOnScreenPresetsAvailable:@YES} mutableCopy]; SDLPresetBankCapabilities* testStruct = [[SDLPresetBankCapabilities alloc] initWithDictionary:dict]; expect(testStruct.onScreenPresetsAvailable).to(equal(@YES)); @@ -36,4 +36,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m index 0438b8a21..e24ee7ee8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m @@ -31,8 +31,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_resolution:resolution, - NAMES_touchEventAvailable:capabilities} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResolution:resolution, + SDLNameTouchEventAvailable:capabilities} mutableCopy]; SDLScreenParams* testStruct = [[SDLScreenParams alloc] initWithDictionary:dict]; expect(testStruct.resolution).to(equal(resolution)); @@ -47,4 +47,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m index 6482a4f75..5f65785fe 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m @@ -24,7 +24,7 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_status:[SDLComponentVolumeStatus LOW]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameStatus:[SDLComponentVolumeStatus LOW]} mutableCopy]; SDLSingleTireStatus* testStruct = [[SDLSingleTireStatus alloc] initWithDictionary:dict]; expect(testStruct.status).to(equal([SDLComponentVolumeStatus LOW])); @@ -37,4 +37,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m index 0cb200414..6301272d6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m @@ -29,10 +29,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_shortPressAvailable:@NO, - NAMES_longPressAvailable:@YES, - NAMES_upDownAvailable:@NO, - NAMES_imageSupported:@NO} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameShortPressAvailable:@NO, + SDLNameLongPressAvailable:@YES, + SDLNameUpDownAvailable:@NO, + SDLNameImageSupported:@NO} mutableCopy]; SDLSoftButtonCapabilities* testStruct = [[SDLSoftButtonCapabilities alloc] initWithDictionary:dict]; expect(testStruct.shortPressAvailable).to(equal(@NO)); @@ -51,4 +51,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m index c9e766a65..1451cd94d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m @@ -39,12 +39,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_type:[SDLSoftButtonType IMAGE], - NAMES_text:@"Button", - NAMES_image:image, - NAMES_isHighlighted:@YES, - NAMES_softButtonID:@5423, - NAMES_systemAction:[SDLSystemAction KEEP_CONTEXT]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameType:[SDLSoftButtonType IMAGE], + SDLNameText:@"Button", + SDLNameImage:image, + SDLNameIsHighlighted:@YES, + SDLNameSoftButtonId:@5423, + SDLNameSystemAction:[SDLSystemAction KEEP_CONTEXT]} mutableCopy]; SDLSoftButton* testStruct = [[SDLSoftButton alloc] initWithDictionary:dict]; expect(testStruct.type).to(equal([SDLSoftButtonType IMAGE])); @@ -67,4 +67,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m index 476fc6500..201863048 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m @@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_hours:@22, - NAMES_minutes:@39, - NAMES_seconds:@11} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameHours:@22, + SDLNameMinutes:@39, + SDLNameSeconds:@11} mutableCopy]; SDLStartTime* testStruct = [[SDLStartTime alloc] initWithDictionary:dict]; expect(testStruct.hours).to(equal(@22)); @@ -46,4 +46,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m index 56c74cd18..75e06f8de 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m @@ -25,8 +25,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_majorVersion:@4, - NAMES_minorVersion:@532} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameMajorVersion:@4, + SDLNameMinorVersion:@532} mutableCopy]; SDLSyncMsgVersion* testStruct = [[SDLSyncMsgVersion alloc] initWithDictionary:dict]; expect(testStruct.majorVersion).to(equal(@4)); @@ -41,4 +41,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m index 78ca915c9..2a8650d70 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m @@ -27,8 +27,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_text:@"TEXT", - NAMES_type:[SDLSpeechCapabilities PRE_RECORDED]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameText:@"TEXT", + SDLNameType:[SDLSpeechCapabilities PRE_RECORDED]} mutableCopy]; SDLTTSChunk* testStruct = [[SDLTTSChunk alloc] initWithDictionary:dict]; expect(testStruct.text).to(equal(@"TEXT")); @@ -43,4 +43,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m index a07331a59..226d6269b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m @@ -32,10 +32,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_name:[SDLTextFieldName tertiaryText], - NAMES_characterSet:[SDLCharacterSet TYPE5SET], - NAMES_width:@111, - NAMES_rows:@4} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameName:[SDLTextFieldName tertiaryText], + SDLNameCharacterSet:[SDLCharacterSet TYPE5SET], + SDLNameWidth:@111, + SDLNameRows:@4} mutableCopy]; SDLTextField* testStruct = [[SDLTextField alloc] initWithDictionary:dict]; expect(testStruct.name).to(equal([SDLTextFieldName tertiaryText])); @@ -54,4 +54,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m index dcad4943d..d1b220fb3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m @@ -44,13 +44,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_pressureTelltale:[SDLWarningLightStatus OFF], - NAMES_leftFront:tire1, - NAMES_rightFront:tire2, - NAMES_leftRear:tire3, - NAMES_rightRear:tire4, - NAMES_innerLeftRear:tire5, - NAMES_innerRightRear:tire6} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNamePressureTelltale:[SDLWarningLightStatus OFF], + SDLNameLeftFront:tire1, + SDLNameRightFront:tire2, + SDLNameLeftRear:tire3, + SDLNameRightRear:tire4, + SDLNameInnerLeftRear:tire5, + SDLNameInnerRightRear:tire6} mutableCopy]; SDLTireStatus* testStruct = [[SDLTireStatus alloc] initWithDictionary:dict]; expect(testStruct.pressureTelltale).to(equal([SDLWarningLightStatus OFF])); @@ -75,4 +75,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m index eedca3a9b..0431fe455 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m @@ -25,8 +25,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_x:@67, - NAMES_y:@362} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameX:@67, + SDLNameY:@362} mutableCopy]; SDLTouchCoord* testStruct = [[SDLTouchCoord alloc] initWithDictionary:dict]; expect(testStruct.x).to(equal(@67)); @@ -41,4 +41,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m index a8b8c73e0..cdda41afc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m @@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_pressAvailable:@YES, - NAMES_multiTouchAvailable:@NO, - NAMES_doublePressAvailable:@NO} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNamePressAvailable:@YES, + SDLNameMultiTouchAvailable:@NO, + SDLNameDoublePressAvailable:@NO} mutableCopy]; SDLTouchEventCapabilities* testStruct = [[SDLTouchEventCapabilities alloc] initWithDictionary:dict]; expect(testStruct.pressAvailable).to(equal(@YES)); @@ -46,4 +46,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m index c95cfb525..63ffae0d7 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m @@ -30,9 +30,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_id:@3, - NAMES_ts:[@[@23, @52, @41345234] mutableCopy], - NAMES_c:[@[coord] mutableCopy]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameId:@3, + SDLNameTs:[@[@23, @52, @41345234] mutableCopy], + SDLNameCoord:[@[coord] mutableCopy]} mutableCopy]; SDLTouchEvent* testStruct = [[SDLTouchEvent alloc] initWithDictionary:dict]; expect(testStruct.touchEventId).to(equal(@3)); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m index 07152ad92..7b44c251e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m @@ -28,8 +28,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_navigationText:@"NAVTEXT", - NAMES_turnIcon:image} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNavigationText:@"NAVTEXT", + SDLNameTurnIcon:image} mutableCopy]; SDLTurn* testStruct = [[SDLTurn alloc] initWithDictionary:dict]; expect(testStruct.navigationText).to(equal(@"NAVTEXT")); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m index ee3c4774a..4515c938b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m @@ -27,8 +27,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_dataType:[SDLVehicleDataType VEHICLEDATA_AIRBAGSTATUS], - NAMES_resultCode:[SDLVehicleDataResultCode DISALLOWED]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameDataType:[SDLVehicleDataType VEHICLEDATA_AIRBAGSTATUS], + SDLNameResultCode:[SDLVehicleDataResultCode DISALLOWED]} mutableCopy]; SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] initWithDictionary:dict]; expect(testStruct.dataType).to(equal([SDLVehicleDataType VEHICLEDATA_AIRBAGSTATUS])); @@ -43,4 +43,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m index 9a282b72e..0eaa6e698 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m @@ -29,10 +29,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_make:@"Make", - NAMES_model:@"Model", - NAMES_modelYear:@"3.141*10^36", - NAMES_trim:@"AE"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameMake:@"Make", + SDLNameModel:@"Model", + SDLNameModelYear:@"3.141*10^36", + SDLNameTrim:@"AE"} mutableCopy]; SDLVehicleType* testStruct = [[SDLVehicleType alloc] initWithDictionary:dict]; expect(testStruct.make).to(equal(@"Make")); @@ -51,4 +51,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m index e76be2558..6afde1d0a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m @@ -31,9 +31,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_text:@"DON'T PANIC", - NAMES_image:image, - NAMES_position:@42} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameText:@"DON'T PANIC", + SDLNameImage:image, + SDLNamePosition:@42} mutableCopy]; SDLVRHelpItem* testStruct = [[SDLVRHelpItem alloc] initWithDictionary:dict]; expect(testStruct.text).to(equal(@"DON'T PANIC")); @@ -50,4 +50,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m index 39a9ebc74..57dbd3513 100644 --- a/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m @@ -21,13 +21,13 @@ describe(@"Readonly Property Tests", ^ { }); it(@"Should get correctly when initialized with dictionary", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_notification: - @{NAMES_parameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameNotification: + @{SDLNameParameters: @{@"name":@"George"}, - NAMES_operation_name:@"Poorly Named"}} mutableCopy]]; + SDLNameOperationName:@"Poorly Named"}} mutableCopy]]; expect(testMessage.name).to(equal(@"Poorly Named")); - expect(testMessage.messageType).to(equal(NAMES_notification)); + expect(testMessage.messageType).to(equal(SDLNameNotification)); }); }); @@ -41,10 +41,10 @@ describe(@"Parameter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_response: - @{NAMES_parameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameResponse: + @{SDLNameParameters: @{@"age":@25}, - NAMES_operation_name:@"Nameless"}} mutableCopy]]; + SDLNameOperationName:@"Nameless"}} mutableCopy]]; expect([testMessage getParameters:@"age"]).to(equal(@25)); }); @@ -66,10 +66,10 @@ describe(@"FunctionName Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_request: - @{NAMES_parameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameRequest: + @{SDLNameParameters: @{@"age":@25}, - NAMES_operation_name:@"DoNothing"}} mutableCopy]]; + SDLNameOperationName:@"DoNothing"}} mutableCopy]]; expect([testMessage getFunctionName]).to(equal(@"DoNothing")); @@ -79,8 +79,8 @@ describe(@"FunctionName Tests", ^ { }); it(@"Should be nil if not set", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_notification: - @{NAMES_parameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameNotification: + @{SDLNameParameters: @{}}} mutableCopy]]; expect([testMessage getFunctionName]).to(beNil()); }); @@ -97,10 +97,10 @@ describe(@"BulkDataTests", ^ { }); it(@"Should get correctly when initialized", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_notification: - @{NAMES_parameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameNotification: + @{SDLNameParameters: @{}}, - NAMES_bulkData:[NSData dataWithBytes:"ImageData" length:strlen("ImageData")]} mutableCopy]]; + SDLNameBulkData:[NSData dataWithBytes:"ImageData" length:strlen("ImageData")]} mutableCopy]]; expect(testMessage.bulkData).to(equal([NSData dataWithBytes:"ImageData" length:strlen("ImageData")])); }); @@ -112,4 +112,4 @@ describe(@"BulkDataTests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd |