diff options
Diffstat (limited to 'SmartDeviceLink')
295 files changed, 317 insertions, 2674 deletions
diff --git a/SmartDeviceLink/SDLAddCommand.h b/SmartDeviceLink/SDLAddCommand.h index fead3e2dc..fec0aa8be 100644 --- a/SmartDeviceLink/SDLAddCommand.h +++ b/SmartDeviceLink/SDLAddCommand.h @@ -37,11 +37,6 @@ @interface SDLAddCommand : SDLRPCRequest <SDLRequestHandler> /** - * Constructs a new SDLAddCommand object - */ -- (instancetype)init; - -/** * Construct a SDLAddCommand with a handler callback when an event occurs. * * @param handler A callback that will be called when a button event occurs for the command @@ -51,13 +46,6 @@ - (instancetype)initWithHandler:(SDLRPCNotificationHandler)handler; /** - * Constructs a new *SDLAddCommand* object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - -/** * A handler that will let you know when the button you created is subscribed. * * @warning This will only work if you use SDLManager. diff --git a/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink/SDLAddCommand.m index a264d164a..9d302b209 100644 --- a/SmartDeviceLink/SDLAddCommand.m +++ b/SmartDeviceLink/SDLAddCommand.m @@ -28,12 +28,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setCmdID:(NSNumber *)cmdID { if (cmdID != nil) { [parameters setObject:cmdID forKey:NAMES_cmdID]; @@ -59,7 +53,7 @@ if (obj == nil || [obj isKindOfClass:SDLMenuParams.class]) { return (SDLMenuParams *)obj; } else { - return [[SDLMenuParams alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLMenuParams alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -88,7 +82,7 @@ if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLAddCommandResponse.h b/SmartDeviceLink/SDLAddCommandResponse.h index dfa132f6d..ee037f281 100644 --- a/SmartDeviceLink/SDLAddCommandResponse.h +++ b/SmartDeviceLink/SDLAddCommandResponse.h @@ -9,10 +9,6 @@ * * Since <b>SmartDeviceLink 1.0</b> */ -@interface SDLAddCommandResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLAddCommandResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLAddCommandResponse.m b/SmartDeviceLink/SDLAddCommandResponse.m index 3beba9db6..7e66a2310 100644 --- a/SmartDeviceLink/SDLAddCommandResponse.m +++ b/SmartDeviceLink/SDLAddCommandResponse.m @@ -12,10 +12,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLAddSubMenu.h b/SmartDeviceLink/SDLAddSubMenu.h index 0a749b382..623757916 100644 --- a/SmartDeviceLink/SDLAddSubMenu.h +++ b/SmartDeviceLink/SDLAddSubMenu.h @@ -16,20 +16,7 @@ * Since <b>SmartDeviceLink 1.0</b><br> * see SDLDeleteSubMenu SDLAddCommand SDLDeleteCommand */ -@interface SDLAddSubMenu : SDLRPCRequest { -} - -/** - * Constructs a new SDLAddSubMenu object - */ -- (instancetype)init; -/** - * Constructs a new SDLAddSubMenu object indicated by the dictionary parameter - * <p> - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLAddSubMenu : SDLRPCRequest /** * @abstract a Menu ID that identifies a sub menu diff --git a/SmartDeviceLink/SDLAddSubMenu.m b/SmartDeviceLink/SDLAddSubMenu.m index f02192b00..c852cb160 100644 --- a/SmartDeviceLink/SDLAddSubMenu.m +++ b/SmartDeviceLink/SDLAddSubMenu.m @@ -12,12 +12,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setMenuID:(NSNumber *)menuID { if (menuID != nil) { [parameters setObject:menuID forKey:NAMES_menuID]; diff --git a/SmartDeviceLink/SDLAddSubMenuResponse.h b/SmartDeviceLink/SDLAddSubMenuResponse.h index 2ea2157d7..b3124433b 100644 --- a/SmartDeviceLink/SDLAddSubMenuResponse.h +++ b/SmartDeviceLink/SDLAddSubMenuResponse.h @@ -7,10 +7,6 @@ * SDLAddSubMenuResponse is sent, when SDLAddSubMenu has been called * Since <b>SmartDeviceLink 1.0</b> */ -@interface SDLAddSubMenuResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLAddSubMenuResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLAddSubMenuResponse.m b/SmartDeviceLink/SDLAddSubMenuResponse.m index 5df2745b5..b9b2fa5b1 100644 --- a/SmartDeviceLink/SDLAddSubMenuResponse.m +++ b/SmartDeviceLink/SDLAddSubMenuResponse.m @@ -12,10 +12,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLAirbagStatus.h b/SmartDeviceLink/SDLAirbagStatus.h index 3681795b5..39c585e29 100644 --- a/SmartDeviceLink/SDLAirbagStatus.h +++ b/SmartDeviceLink/SDLAirbagStatus.h @@ -6,11 +6,7 @@ @class SDLVehicleDataEventStatus; -@interface SDLAirbagStatus : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLAirbagStatus : SDLRPCStruct @property (strong) SDLVehicleDataEventStatus *driverAirbagDeployed; @property (strong) SDLVehicleDataEventStatus *driverSideAirbagDeployed; diff --git a/SmartDeviceLink/SDLAirbagStatus.m b/SmartDeviceLink/SDLAirbagStatus.m index a3ce06689..df244cc1c 100644 --- a/SmartDeviceLink/SDLAirbagStatus.m +++ b/SmartDeviceLink/SDLAirbagStatus.m @@ -8,18 +8,6 @@ @implementation SDLAirbagStatus -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setDriverAirbagDeployed:(SDLVehicleDataEventStatus *)driverAirbagDeployed { if (driverAirbagDeployed != nil) { [store setObject:driverAirbagDeployed forKey:NAMES_driverAirbagDeployed]; diff --git a/SmartDeviceLink/SDLAlert.h b/SmartDeviceLink/SDLAlert.h index 59f909caa..410a8e073 100644 --- a/SmartDeviceLink/SDLAlert.h +++ b/SmartDeviceLink/SDLAlert.h @@ -32,21 +32,7 @@ * * @since SDL 1.0 */ -@interface SDLAlert : SDLRPCRequest { -} - -/** - * Constructs a new SDLAlert object - */ -- (instancetype)init; - -/** - * Constructs a new SDLAlert object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - +@interface SDLAlert : SDLRPCRequest /** * @abstract The String to be displayed in the first field of the display during the Alert diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m index ddc7fdc3a..c68b29b4b 100644 --- a/SmartDeviceLink/SDLAlert.m +++ b/SmartDeviceLink/SDLAlert.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setAlertText1:(NSString *)alertText1 { if (alertText1 != nil) { [parameters setObject:alertText1 forKey:NAMES_alertText1]; @@ -71,7 +65,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -128,7 +122,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLAlertManeuver.h b/SmartDeviceLink/SDLAlertManeuver.h index 2bb8e12ed..dffa8f21c 100644 --- a/SmartDeviceLink/SDLAlertManeuver.h +++ b/SmartDeviceLink/SDLAlertManeuver.h @@ -7,11 +7,7 @@ /** * @since SmartDeviceLink 1.0 */ -@interface SDLAlertManeuver : SDLRPCRequest { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLAlertManeuver : SDLRPCRequest @property (strong) NSMutableArray *ttsChunks; @property (strong) NSMutableArray *softButtons; diff --git a/SmartDeviceLink/SDLAlertManeuver.m b/SmartDeviceLink/SDLAlertManeuver.m index 81717506f..dfd204798 100644 --- a/SmartDeviceLink/SDLAlertManeuver.m +++ b/SmartDeviceLink/SDLAlertManeuver.m @@ -16,12 +16,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setTtsChunks:(NSMutableArray *)ttsChunks { if (ttsChunks != nil) { [parameters setObject:ttsChunks forKey:NAMES_ttsChunks]; @@ -37,7 +31,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -58,7 +52,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLAlertManeuverResponse.h b/SmartDeviceLink/SDLAlertManeuverResponse.h index b7d3d6c0a..41dcaaa5e 100644 --- a/SmartDeviceLink/SDLAlertManeuverResponse.h +++ b/SmartDeviceLink/SDLAlertManeuverResponse.h @@ -7,10 +7,6 @@ /** SDLAlertManeuverResponse is sent, when SDLAlertManeuver has been called. * @since SmartDeviceLink 1.0 */ -@interface SDLAlertManeuverResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLAlertManeuverResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLAlertManeuverResponse.m b/SmartDeviceLink/SDLAlertManeuverResponse.m index 5687d3117..0882b6e86 100644 --- a/SmartDeviceLink/SDLAlertManeuverResponse.m +++ b/SmartDeviceLink/SDLAlertManeuverResponse.m @@ -13,10 +13,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLAlertResponse.h b/SmartDeviceLink/SDLAlertResponse.h index 81228d34a..b2c4fb500 100644 --- a/SmartDeviceLink/SDLAlertResponse.h +++ b/SmartDeviceLink/SDLAlertResponse.h @@ -8,11 +8,7 @@ * Sent after SDLAlert has been sent * @since SDL 1.0 */ -@interface SDLAlertResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLAlertResponse : SDLRPCResponse @property (strong) NSNumber *tryAgainTime; diff --git a/SmartDeviceLink/SDLAlertResponse.m b/SmartDeviceLink/SDLAlertResponse.m index f55982377..35bce7b22 100644 --- a/SmartDeviceLink/SDLAlertResponse.m +++ b/SmartDeviceLink/SDLAlertResponse.m @@ -13,12 +13,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setTryAgainTime:(NSNumber *)tryAgainTime { if (tryAgainTime != nil) { [parameters setObject:tryAgainTime forKey:NAMES_tryAgainTime]; diff --git a/SmartDeviceLink/SDLAudioPassThruCapabilities.h b/SmartDeviceLink/SDLAudioPassThruCapabilities.h index 96772b62b..35c8c4a99 100644 --- a/SmartDeviceLink/SDLAudioPassThruCapabilities.h +++ b/SmartDeviceLink/SDLAudioPassThruCapabilities.h @@ -42,18 +42,7 @@ * </table> * Since <b>SmartDeviceLink 2.0</b> */ -@interface SDLAudioPassThruCapabilities : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLAudioPassThruCapabilities object - */ -- (instancetype)init; -/** - * Constructs a newly allocated SDLAudioPassThruCapabilities object indicated by the Hashtable parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLAudioPassThruCapabilities : SDLRPCStruct /** * @abstract The sampling rate for AudioPassThru<br> diff --git a/SmartDeviceLink/SDLAudioPassThruCapabilities.m b/SmartDeviceLink/SDLAudioPassThruCapabilities.m index fbb02be84..e327bd30a 100644 --- a/SmartDeviceLink/SDLAudioPassThruCapabilities.m +++ b/SmartDeviceLink/SDLAudioPassThruCapabilities.m @@ -12,18 +12,6 @@ @implementation SDLAudioPassThruCapabilities -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setSamplingRate:(SDLSamplingRate *)samplingRate { if (samplingRate != nil) { [store setObject:samplingRate forKey:NAMES_samplingRate]; diff --git a/SmartDeviceLink/SDLBeltStatus.h b/SmartDeviceLink/SDLBeltStatus.h index d12e42eb7..ff70b6636 100644 --- a/SmartDeviceLink/SDLBeltStatus.h +++ b/SmartDeviceLink/SDLBeltStatus.h @@ -6,11 +6,7 @@ @class SDLVehicleDataEventStatus; -@interface SDLBeltStatus : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLBeltStatus : SDLRPCStruct @property (strong) SDLVehicleDataEventStatus *driverBeltDeployed; @property (strong) SDLVehicleDataEventStatus *passengerBeltDeployed; diff --git a/SmartDeviceLink/SDLBeltStatus.m b/SmartDeviceLink/SDLBeltStatus.m index 70b54d2bd..f6980fb8d 100644 --- a/SmartDeviceLink/SDLBeltStatus.m +++ b/SmartDeviceLink/SDLBeltStatus.m @@ -9,18 +9,6 @@ @implementation SDLBeltStatus -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setDriverBeltDeployed:(SDLVehicleDataEventStatus *)driverBeltDeployed { if (driverBeltDeployed != nil) { [store setObject:driverBeltDeployed forKey:NAMES_driverBeltDeployed]; diff --git a/SmartDeviceLink/SDLBodyInformation.h b/SmartDeviceLink/SDLBodyInformation.h index 1c92243cd..8168a2d78 100644 --- a/SmartDeviceLink/SDLBodyInformation.h +++ b/SmartDeviceLink/SDLBodyInformation.h @@ -10,20 +10,7 @@ /** * The body information including power modes. */ -@interface SDLBodyInformation : SDLRPCStruct { -} - -/** - * @abstract Constructs a new SDLBodyInformation object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLBodyInformation object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLBodyInformation : SDLRPCStruct /** * @abstract References signal "PrkBrkActv_B_Actl". diff --git a/SmartDeviceLink/SDLBodyInformation.m b/SmartDeviceLink/SDLBodyInformation.m index 9be7a88d6..bfec038b5 100644 --- a/SmartDeviceLink/SDLBodyInformation.m +++ b/SmartDeviceLink/SDLBodyInformation.m @@ -11,18 +11,6 @@ @implementation SDLBodyInformation -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setParkBrakeActive:(NSNumber *)parkBrakeActive { if (parkBrakeActive != nil) { [store setObject:parkBrakeActive forKey:NAMES_parkBrakeActive]; diff --git a/SmartDeviceLink/SDLButtonCapabilities.h b/SmartDeviceLink/SDLButtonCapabilities.h index d84da609a..51ef7bfef 100644 --- a/SmartDeviceLink/SDLButtonCapabilities.h +++ b/SmartDeviceLink/SDLButtonCapabilities.h @@ -11,19 +11,7 @@ * * @since SDL 1.0 */ -@interface SDLButtonCapabilities : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLButtonCapabilities object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLButtonCapabilities object indicated by the Hashtable parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLButtonCapabilities : SDLRPCStruct /** * @abstract The name of the SDL HMI button. diff --git a/SmartDeviceLink/SDLButtonCapabilities.m b/SmartDeviceLink/SDLButtonCapabilities.m index fbcab54c9..e562aebc6 100644 --- a/SmartDeviceLink/SDLButtonCapabilities.m +++ b/SmartDeviceLink/SDLButtonCapabilities.m @@ -9,18 +9,6 @@ @implementation SDLButtonCapabilities -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setName:(SDLButtonName *)name { if (name != nil) { [store setObject:name forKey:NAMES_name]; diff --git a/SmartDeviceLink/SDLChangeRegistration.h b/SmartDeviceLink/SDLChangeRegistration.h index 4bbc7c234..8ac8a3840 100644 --- a/SmartDeviceLink/SDLChangeRegistration.h +++ b/SmartDeviceLink/SDLChangeRegistration.h @@ -14,20 +14,7 @@ * * @since SDL 2.0 */ -@interface SDLChangeRegistration : SDLRPCRequest { -} - -/** - * Constructs a new SDLChangeRegistration object - */ -- (instancetype)init; - -/** - * Constructs a new SDLChangeRegistration object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLChangeRegistration : SDLRPCRequest /** * @abstract The language the app wants to change to diff --git a/SmartDeviceLink/SDLChangeRegistration.m b/SmartDeviceLink/SDLChangeRegistration.m index 00a7de885..1f25a0d40 100644 --- a/SmartDeviceLink/SDLChangeRegistration.m +++ b/SmartDeviceLink/SDLChangeRegistration.m @@ -15,12 +15,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setLanguage:(SDLLanguage *)language { if (language != nil) { [parameters setObject:language forKey:NAMES_language]; diff --git a/SmartDeviceLink/SDLChangeRegistrationResponse.h b/SmartDeviceLink/SDLChangeRegistrationResponse.h index 38709e235..20017d066 100644 --- a/SmartDeviceLink/SDLChangeRegistrationResponse.h +++ b/SmartDeviceLink/SDLChangeRegistrationResponse.h @@ -9,10 +9,6 @@ * * @since SDL 2.0 */ -@interface SDLChangeRegistrationResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLChangeRegistrationResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLChangeRegistrationResponse.m b/SmartDeviceLink/SDLChangeRegistrationResponse.m index 710495d2c..1c6b13e49 100644 --- a/SmartDeviceLink/SDLChangeRegistrationResponse.m +++ b/SmartDeviceLink/SDLChangeRegistrationResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLChoice.h b/SmartDeviceLink/SDLChoice.h index 478b33b5f..248d633ac 100644 --- a/SmartDeviceLink/SDLChoice.h +++ b/SmartDeviceLink/SDLChoice.h @@ -50,19 +50,7 @@ * * Since <b>SmartDeviceLink 1.0</b><br> */ -@interface SDLChoice : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLChoice object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLChoice object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLChoice : SDLRPCStruct /** * @abstract the application-scoped identifier that uniquely identifies this choice diff --git a/SmartDeviceLink/SDLChoice.m b/SmartDeviceLink/SDLChoice.m index 83e1d56ae..0f66ae9e0 100644 --- a/SmartDeviceLink/SDLChoice.m +++ b/SmartDeviceLink/SDLChoice.m @@ -9,18 +9,6 @@ @implementation SDLChoice -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setChoiceID:(NSNumber *)choiceID { if (choiceID != nil) { [store setObject:choiceID forKey:NAMES_choiceID]; @@ -70,7 +58,7 @@ if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -111,7 +99,7 @@ if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLClusterModeStatus.h b/SmartDeviceLink/SDLClusterModeStatus.h index 7b745804f..6333ad372 100644 --- a/SmartDeviceLink/SDLClusterModeStatus.h +++ b/SmartDeviceLink/SDLClusterModeStatus.h @@ -8,11 +8,7 @@ @class SDLPowerModeStatus; -@interface SDLClusterModeStatus : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLClusterModeStatus : SDLRPCStruct @property (strong) NSNumber *powerModeActive; @property (strong) SDLPowerModeQualificationStatus *powerModeQualificationStatus; diff --git a/SmartDeviceLink/SDLClusterModeStatus.m b/SmartDeviceLink/SDLClusterModeStatus.m index ecd2a528b..53e702dce 100644 --- a/SmartDeviceLink/SDLClusterModeStatus.m +++ b/SmartDeviceLink/SDLClusterModeStatus.m @@ -11,18 +11,6 @@ @implementation SDLClusterModeStatus -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setPowerModeActive:(NSNumber *)powerModeActive { if (powerModeActive != nil) { [store setObject:powerModeActive forKey:NAMES_powerModeActive]; diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.h b/SmartDeviceLink/SDLCreateInteractionChoiceSet.h index 721f505d7..4a54b1698 100644 --- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.h +++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.h @@ -17,20 +17,7 @@ * * @see SDLDeleteInteractionChoiceSet SDLPerformInteraction */ -@interface SDLCreateInteractionChoiceSet : SDLRPCRequest { -} - -/** - * Constructs a new SDLCreateInteractionChoiceSet object - */ -- (instancetype)init; - -/** - * Constructs a new SDLCreateInteractionChoiceSet object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLCreateInteractionChoiceSet : SDLRPCRequest /** * @abstract A unique ID that identifies the Choice Set diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m index 32324d46e..df94f19c1 100644 --- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m +++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m @@ -15,12 +15,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setInteractionChoiceSetID:(NSNumber *)interactionChoiceSetID { if (interactionChoiceSetID != nil) { [parameters setObject:interactionChoiceSetID forKey:NAMES_interactionChoiceSetID]; @@ -48,7 +42,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLChoice alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLChoice alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h index e2d3b76e5..0573dcc2f 100644 --- a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h +++ b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h @@ -10,10 +10,6 @@ * * Since <b>SmartDeviceLink 1.0</b> */ -@interface SDLCreateInteractionChoiceSetResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLCreateInteractionChoiceSetResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m index 17c2bf3f9..96f5b28a1 100644 --- a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m +++ b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLDIDResult.h b/SmartDeviceLink/SDLDIDResult.h index a7d0b6c16..c660f8c22 100644 --- a/SmartDeviceLink/SDLDIDResult.h +++ b/SmartDeviceLink/SDLDIDResult.h @@ -6,11 +6,7 @@ @class SDLVehicleDataResultCode; -@interface SDLDIDResult : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDIDResult : SDLRPCStruct @property (strong) SDLVehicleDataResultCode *resultCode; @property (strong) NSNumber *didLocation; diff --git a/SmartDeviceLink/SDLDIDResult.m b/SmartDeviceLink/SDLDIDResult.m index be42582e7..7c0cfd3e2 100644 --- a/SmartDeviceLink/SDLDIDResult.m +++ b/SmartDeviceLink/SDLDIDResult.m @@ -9,18 +9,6 @@ @implementation SDLDIDResult -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setResultCode:(SDLVehicleDataResultCode *)resultCode { if (resultCode != nil) { [store setObject:resultCode forKey:NAMES_resultCode]; diff --git a/SmartDeviceLink/SDLDeleteCommand.h b/SmartDeviceLink/SDLDeleteCommand.h index 4f3b74d90..bf5e076dd 100644 --- a/SmartDeviceLink/SDLDeleteCommand.h +++ b/SmartDeviceLink/SDLDeleteCommand.h @@ -16,21 +16,7 @@ * Since <b>SmartDeviceLink 1.0</b><br> * see SDLAddCommand SDLAddSubMenu SDLDeleteSubMenu */ -@interface SDLDeleteCommand : SDLRPCRequest { -} - -/** - * Constructs a new SDLDeleteCommand object - */ -- (instancetype)init; -/** - * Constructs a new SDLDeleteCommand object indicated by the NSMutableDictionary - * parameter - * <p> - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeleteCommand : SDLRPCRequest /** * @abstract the Command ID that identifies the Command to be deleted from Command Menu diff --git a/SmartDeviceLink/SDLDeleteCommand.m b/SmartDeviceLink/SDLDeleteCommand.m index 13c51d7ed..1460a23e1 100644 --- a/SmartDeviceLink/SDLDeleteCommand.m +++ b/SmartDeviceLink/SDLDeleteCommand.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setCmdID:(NSNumber *)cmdID { if (cmdID != nil) { [parameters setObject:cmdID forKey:NAMES_cmdID]; diff --git a/SmartDeviceLink/SDLDeleteCommandResponse.h b/SmartDeviceLink/SDLDeleteCommandResponse.h index 7f231c8e3..4c07a3c2f 100644 --- a/SmartDeviceLink/SDLDeleteCommandResponse.h +++ b/SmartDeviceLink/SDLDeleteCommandResponse.h @@ -9,10 +9,6 @@ * * Since <b>SmartDeviceLink 1.0</b><br> */ -@interface SDLDeleteCommandResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeleteCommandResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLDeleteCommandResponse.m b/SmartDeviceLink/SDLDeleteCommandResponse.m index 3c3d5b7a7..52157f53c 100644 --- a/SmartDeviceLink/SDLDeleteCommandResponse.m +++ b/SmartDeviceLink/SDLDeleteCommandResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLDeleteFile.h b/SmartDeviceLink/SDLDeleteFile.h index 325782673..196ff65d2 100644 --- a/SmartDeviceLink/SDLDeleteFile.h +++ b/SmartDeviceLink/SDLDeleteFile.h @@ -12,20 +12,7 @@ * Since <b>SmartDeviceLink 2.0</b><br> * see SDLPutFile SDLListFiles */ -@interface SDLDeleteFile : SDLRPCRequest { -} - -/** - * Constructs a new SDLDeleteFile object - */ -- (instancetype)init; -/** - * Constructs a new SDLDeleteFile object indicated by the dictionary parameter - * <p> - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeleteFile : SDLRPCRequest /** * @abstract a file reference name diff --git a/SmartDeviceLink/SDLDeleteFile.m b/SmartDeviceLink/SDLDeleteFile.m index d7a4c18b2..83dc75fb7 100644 --- a/SmartDeviceLink/SDLDeleteFile.m +++ b/SmartDeviceLink/SDLDeleteFile.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setSyncFileName:(NSString *)syncFileName { if (syncFileName != nil) { [parameters setObject:syncFileName forKey:NAMES_syncFileName]; diff --git a/SmartDeviceLink/SDLDeleteFileResponse.h b/SmartDeviceLink/SDLDeleteFileResponse.h index ee61aa9d0..5fa17495f 100644 --- a/SmartDeviceLink/SDLDeleteFileResponse.h +++ b/SmartDeviceLink/SDLDeleteFileResponse.h @@ -9,11 +9,7 @@ * * Since <b>SmartDeviceLink 2.0</b><br> */ -@interface SDLDeleteFileResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeleteFileResponse : SDLRPCResponse @property (strong) NSNumber *spaceAvailable; diff --git a/SmartDeviceLink/SDLDeleteFileResponse.m b/SmartDeviceLink/SDLDeleteFileResponse.m index b94075b39..4b375bd91 100644 --- a/SmartDeviceLink/SDLDeleteFileResponse.m +++ b/SmartDeviceLink/SDLDeleteFileResponse.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setSpaceAvailable:(NSNumber *)spaceAvailable { if (spaceAvailable != nil) { [parameters setObject:spaceAvailable forKey:NAMES_spaceAvailable]; diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h index 28058064b..4b7100a05 100644 --- a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h +++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h @@ -18,21 +18,7 @@ * Since <b>SmartDeviceLink 1.0</b><br> * see SDLCreateInteractionChoiceSet SDLPerformInteraction */ -@interface SDLDeleteInteractionChoiceSet : SDLRPCRequest { -} - -/** - * Constructs a new SDLDeleteInteractionChoiceSet object - */ -- (instancetype)init; -/** - * Constructs a new SDLDeleteInteractionChoiceSet object indicated by the - * NSMutableDictionary parameter - * <p> - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeleteInteractionChoiceSet : SDLRPCRequest /** * @abstract a unique ID that identifies the Choice Set diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m index fd5d202b1..1ae1de828 100644 --- a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m +++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setInteractionChoiceSetID:(NSNumber *)interactionChoiceSetID { if (interactionChoiceSetID != nil) { [parameters setObject:interactionChoiceSetID forKey:NAMES_interactionChoiceSetID]; diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.h b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.h index 7a5cd4406..c67aef1d1 100644 --- a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.h +++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.h @@ -9,10 +9,6 @@ * * Since <b>SmartDeviceLink 1.0</b> */ -@interface SDLDeleteInteractionChoiceSetResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeleteInteractionChoiceSetResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m index 666a758a1..0fea859c5 100644 --- a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m +++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLDeleteSubMenu.h b/SmartDeviceLink/SDLDeleteSubMenu.h index 37c2dc544..0cddf67bb 100644 --- a/SmartDeviceLink/SDLDeleteSubMenu.h +++ b/SmartDeviceLink/SDLDeleteSubMenu.h @@ -16,18 +16,7 @@ * Since <b>SmartDeviceLink 1.0</b><br> * see SDLAddCommand SDLAddSubMenu SDLDeleteCommand */ -@interface SDLDeleteSubMenu : SDLRPCRequest { -} - -/** - * Constructs a new SDLDeleteSubMenu object - */ -- (instancetype)init; -/** - * Constructs a new SDLDeleteSubMenu object indicated by the dictionary parameter<p> - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeleteSubMenu : SDLRPCRequest /** * @abstract the MenuID that identifies the SDLSubMenu to be delete diff --git a/SmartDeviceLink/SDLDeleteSubMenu.m b/SmartDeviceLink/SDLDeleteSubMenu.m index 8727f44d3..c2c6e932e 100644 --- a/SmartDeviceLink/SDLDeleteSubMenu.m +++ b/SmartDeviceLink/SDLDeleteSubMenu.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setMenuID:(NSNumber *)menuID { if (menuID != nil) { [parameters setObject:menuID forKey:NAMES_menuID]; diff --git a/SmartDeviceLink/SDLDeleteSubMenuResponse.h b/SmartDeviceLink/SDLDeleteSubMenuResponse.h index 3b32df8f3..5842a54be 100644 --- a/SmartDeviceLink/SDLDeleteSubMenuResponse.h +++ b/SmartDeviceLink/SDLDeleteSubMenuResponse.h @@ -9,10 +9,6 @@ * * Since <b>SmartDeviceLink 1.0</b> */ -@interface SDLDeleteSubMenuResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeleteSubMenuResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLDeleteSubMenuResponse.m b/SmartDeviceLink/SDLDeleteSubMenuResponse.m index b88d9b626..4c9faf6ae 100644 --- a/SmartDeviceLink/SDLDeleteSubMenuResponse.m +++ b/SmartDeviceLink/SDLDeleteSubMenuResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLDeviceInfo.h b/SmartDeviceLink/SDLDeviceInfo.h index 1bcbdaa27..f85c5666e 100644 --- a/SmartDeviceLink/SDLDeviceInfo.h +++ b/SmartDeviceLink/SDLDeviceInfo.h @@ -4,11 +4,7 @@ #import "SDLRPCMessage.h" -@interface SDLDeviceInfo : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeviceInfo : SDLRPCStruct @property (strong) NSString *hardware; @property (strong) NSString *firmwareRev; diff --git a/SmartDeviceLink/SDLDeviceInfo.m b/SmartDeviceLink/SDLDeviceInfo.m index 134aea629..5d5fef5cc 100644 --- a/SmartDeviceLink/SDLDeviceInfo.m +++ b/SmartDeviceLink/SDLDeviceInfo.m @@ -8,18 +8,6 @@ @implementation SDLDeviceInfo -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setHardware:(NSString *)hardware { if (hardware != nil) { [store setObject:hardware forKey:NAMES_hardware]; diff --git a/SmartDeviceLink/SDLDeviceStatus.h b/SmartDeviceLink/SDLDeviceStatus.h index d8442d438..79e72dda7 100644 --- a/SmartDeviceLink/SDLDeviceStatus.h +++ b/SmartDeviceLink/SDLDeviceStatus.h @@ -98,20 +98,7 @@ * </table> * @since SDL 2.0 */ -@interface SDLDeviceStatus : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLDeviceStatus object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLDeviceStatus object indicated by the dictionary parameter - * - * @param dict The dictionary to use to construct the object - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeviceStatus : SDLRPCStruct /** * @abstract Indicates whether the voice recognition is on or off diff --git a/SmartDeviceLink/SDLDeviceStatus.m b/SmartDeviceLink/SDLDeviceStatus.m index fbe3b4b96..256fbe11d 100644 --- a/SmartDeviceLink/SDLDeviceStatus.m +++ b/SmartDeviceLink/SDLDeviceStatus.m @@ -10,18 +10,6 @@ @implementation SDLDeviceStatus -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setVoiceRecOn:(NSNumber *)voiceRecOn { if (voiceRecOn != nil) { [store setObject:voiceRecOn forKey:NAMES_voiceRecOn]; diff --git a/SmartDeviceLink/SDLDiagnosticMessage.h b/SmartDeviceLink/SDLDiagnosticMessage.h index 40ca013f2..7339a3762 100644 --- a/SmartDeviceLink/SDLDiagnosticMessage.h +++ b/SmartDeviceLink/SDLDiagnosticMessage.h @@ -9,11 +9,7 @@ * * @since SDL 3.0 */ -@interface SDLDiagnosticMessage : SDLRPCRequest { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDiagnosticMessage : SDLRPCRequest /** * Name of target ECU diff --git a/SmartDeviceLink/SDLDiagnosticMessage.m b/SmartDeviceLink/SDLDiagnosticMessage.m index 8a45a8650..21260bbee 100644 --- a/SmartDeviceLink/SDLDiagnosticMessage.m +++ b/SmartDeviceLink/SDLDiagnosticMessage.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setTargetID:(NSNumber *)targetID { if (targetID != nil) { [parameters setObject:targetID forKey:NAMES_targetID]; diff --git a/SmartDeviceLink/SDLDiagnosticMessageResponse.h b/SmartDeviceLink/SDLDiagnosticMessageResponse.h index 4820b893f..c0d1a4901 100644 --- a/SmartDeviceLink/SDLDiagnosticMessageResponse.h +++ b/SmartDeviceLink/SDLDiagnosticMessageResponse.h @@ -7,11 +7,7 @@ /** SDLDiagnosticMessageResponse is sent, when SDLDiagnosticMessage has been called. * Since<b>SmartDeviceLink 3.0</b> */ -@interface SDLDiagnosticMessageResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDiagnosticMessageResponse : SDLRPCResponse @property (strong) NSMutableArray *messageDataResult; diff --git a/SmartDeviceLink/SDLDiagnosticMessageResponse.m b/SmartDeviceLink/SDLDiagnosticMessageResponse.m index f8215d977..b01b2482b 100644 --- a/SmartDeviceLink/SDLDiagnosticMessageResponse.m +++ b/SmartDeviceLink/SDLDiagnosticMessageResponse.m @@ -13,12 +13,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setMessageDataResult:(NSMutableArray *)messageDataResult { if (messageDataResult != nil) { [parameters setObject:messageDataResult forKey:NAMES_messageDataResult]; diff --git a/SmartDeviceLink/SDLDialNumber.h b/SmartDeviceLink/SDLDialNumber.h index 48cca6a6d..f94750863 100644 --- a/SmartDeviceLink/SDLDialNumber.h +++ b/SmartDeviceLink/SDLDialNumber.h @@ -11,9 +11,6 @@ */ @interface SDLDialNumber : SDLRPCRequest -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - /** * Up to 40 character string representing the phone number. All characters stripped except for '0'-'9', '*', '#', ',', ';', and '+' */ diff --git a/SmartDeviceLink/SDLDialNumber.m b/SmartDeviceLink/SDLDialNumber.m index 856f9ad75..976ed4e82 100644 --- a/SmartDeviceLink/SDLDialNumber.m +++ b/SmartDeviceLink/SDLDialNumber.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setNumber:(NSString *)number { if (number != nil) { parameters[NAMES_number] = number; diff --git a/SmartDeviceLink/SDLDialNumberResponse.h b/SmartDeviceLink/SDLDialNumberResponse.h index 454babcf3..1270751ac 100644 --- a/SmartDeviceLink/SDLDialNumberResponse.h +++ b/SmartDeviceLink/SDLDialNumberResponse.h @@ -11,7 +11,4 @@ */ @interface SDLDialNumberResponse : SDLRPCResponse -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - @end diff --git a/SmartDeviceLink/SDLDialNumberResponse.m b/SmartDeviceLink/SDLDialNumberResponse.m index a0b6dd83e..b3dc9a85a 100644 --- a/SmartDeviceLink/SDLDialNumberResponse.m +++ b/SmartDeviceLink/SDLDialNumberResponse.m @@ -15,10 +15,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLDisplayCapabilities.h b/SmartDeviceLink/SDLDisplayCapabilities.h index 57ebd6719..c072f6bce 100644 --- a/SmartDeviceLink/SDLDisplayCapabilities.h +++ b/SmartDeviceLink/SDLDisplayCapabilities.h @@ -12,20 +12,7 @@ * * @since SDL 1.0 */ -@interface SDLDisplayCapabilities : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLDisplayCapabilities object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLDisplayCapabilities object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDisplayCapabilities : SDLRPCStruct /** * @abstract The type of display diff --git a/SmartDeviceLink/SDLDisplayCapabilities.m b/SmartDeviceLink/SDLDisplayCapabilities.m index 07ae53d62..95389a940 100644 --- a/SmartDeviceLink/SDLDisplayCapabilities.m +++ b/SmartDeviceLink/SDLDisplayCapabilities.m @@ -13,18 +13,6 @@ @implementation SDLDisplayCapabilities -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setDisplayType:(SDLDisplayType *)displayType { if (displayType != nil) { [store setObject:displayType forKey:NAMES_displayType]; @@ -57,7 +45,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTextField alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTextField alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -78,7 +66,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLImageField alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLImageField alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -142,7 +130,7 @@ if (obj == nil || [obj isKindOfClass:SDLScreenParams.class]) { return (SDLScreenParams *)obj; } else { - return [[SDLScreenParams alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLScreenParams alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLECallInfo.h b/SmartDeviceLink/SDLECallInfo.h index 932cf056a..6e4fef129 100644 --- a/SmartDeviceLink/SDLECallInfo.h +++ b/SmartDeviceLink/SDLECallInfo.h @@ -7,11 +7,7 @@ @class SDLECallConfirmationStatus; -@interface SDLECallInfo : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLECallInfo : SDLRPCStruct @property (strong) SDLVehicleDataNotificationStatus *eCallNotificationStatus; @property (strong) SDLVehicleDataNotificationStatus *auxECallNotificationStatus; diff --git a/SmartDeviceLink/SDLECallInfo.m b/SmartDeviceLink/SDLECallInfo.m index 44046fcd0..bab0fd26f 100644 --- a/SmartDeviceLink/SDLECallInfo.m +++ b/SmartDeviceLink/SDLECallInfo.m @@ -10,18 +10,6 @@ @implementation SDLECallInfo -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setECallNotificationStatus:(SDLVehicleDataNotificationStatus *)eCallNotificationStatus { if (eCallNotificationStatus != nil) { [store setObject:eCallNotificationStatus forKey:NAMES_eCallNotificationStatus]; diff --git a/SmartDeviceLink/SDLEmergencyEvent.h b/SmartDeviceLink/SDLEmergencyEvent.h index 6dd0c410d..d6725d91a 100644 --- a/SmartDeviceLink/SDLEmergencyEvent.h +++ b/SmartDeviceLink/SDLEmergencyEvent.h @@ -8,11 +8,7 @@ @class SDLVehicleDataEventStatus; -@interface SDLEmergencyEvent : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLEmergencyEvent : SDLRPCStruct @property (strong) SDLEmergencyEventType *emergencyEventType; @property (strong) SDLFuelCutoffStatus *fuelCutoffStatus; diff --git a/SmartDeviceLink/SDLEmergencyEvent.m b/SmartDeviceLink/SDLEmergencyEvent.m index 76fca57e2..773e55cd3 100644 --- a/SmartDeviceLink/SDLEmergencyEvent.m +++ b/SmartDeviceLink/SDLEmergencyEvent.m @@ -11,18 +11,6 @@ @implementation SDLEmergencyEvent -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setEmergencyEventType:(SDLEmergencyEventType *)emergencyEventType { if (emergencyEventType != nil) { [store setObject:emergencyEventType forKey:NAMES_emergencyEventType]; diff --git a/SmartDeviceLink/SDLEncodedSyncPData.h b/SmartDeviceLink/SDLEncodedSyncPData.h index b3b0276b7..d239655c6 100644 --- a/SmartDeviceLink/SDLEncodedSyncPData.h +++ b/SmartDeviceLink/SDLEncodedSyncPData.h @@ -4,11 +4,7 @@ #import "SDLRPCRequest.h" -@interface SDLEncodedSyncPData : SDLRPCRequest { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLEncodedSyncPData : SDLRPCRequest @property (strong) NSMutableArray *data; diff --git a/SmartDeviceLink/SDLEncodedSyncPData.m b/SmartDeviceLink/SDLEncodedSyncPData.m index b44cb7b3e..9c5c13a7a 100644 --- a/SmartDeviceLink/SDLEncodedSyncPData.m +++ b/SmartDeviceLink/SDLEncodedSyncPData.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setData:(NSMutableArray *)data { if (data != nil) { [parameters setObject:data forKey:NAMES_data]; diff --git a/SmartDeviceLink/SDLEncodedSyncPDataResponse.h b/SmartDeviceLink/SDLEncodedSyncPDataResponse.h index 7d646ed23..ff1dec1ac 100644 --- a/SmartDeviceLink/SDLEncodedSyncPDataResponse.h +++ b/SmartDeviceLink/SDLEncodedSyncPDataResponse.h @@ -4,10 +4,6 @@ #import "SDLRPCResponse.h" -@interface SDLEncodedSyncPDataResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLEncodedSyncPDataResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLEncodedSyncPDataResponse.m b/SmartDeviceLink/SDLEncodedSyncPDataResponse.m index cf899a21b..8502f1e52 100644 --- a/SmartDeviceLink/SDLEncodedSyncPDataResponse.m +++ b/SmartDeviceLink/SDLEncodedSyncPDataResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLEndAudioPassThru.h b/SmartDeviceLink/SDLEndAudioPassThru.h index fddde6c13..6c5d82914 100644 --- a/SmartDeviceLink/SDLEndAudioPassThru.h +++ b/SmartDeviceLink/SDLEndAudioPassThru.h @@ -14,20 +14,6 @@ * Since <b>SmartDeviceLink 2.0</b><br> * see SDLPerformAudioPassThru */ -@interface SDLEndAudioPassThru : SDLRPCRequest { -} - -/** - * Constructs a new SDLEndAudioPassThru object - */ -- (instancetype)init; -/** - * Constructs a new SDLEndAudioPassThru object indicated by the NSMutableDictionary - * parameter - * <p> - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLEndAudioPassThru : SDLRPCRequest @end diff --git a/SmartDeviceLink/SDLEndAudioPassThru.m b/SmartDeviceLink/SDLEndAudioPassThru.m index 576287170..8fa52ea79 100644 --- a/SmartDeviceLink/SDLEndAudioPassThru.m +++ b/SmartDeviceLink/SDLEndAudioPassThru.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLEndAudioPassThruResponse.h b/SmartDeviceLink/SDLEndAudioPassThruResponse.h index e464f5d32..1e976a6f8 100644 --- a/SmartDeviceLink/SDLEndAudioPassThruResponse.h +++ b/SmartDeviceLink/SDLEndAudioPassThruResponse.h @@ -9,10 +9,6 @@ * * Since <b>SmartDeviceLink 2.0</b> */ -@interface SDLEndAudioPassThruResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLEndAudioPassThruResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLEndAudioPassThruResponse.m b/SmartDeviceLink/SDLEndAudioPassThruResponse.m index 73c3b6336..9d7a8037d 100644 --- a/SmartDeviceLink/SDLEndAudioPassThruResponse.m +++ b/SmartDeviceLink/SDLEndAudioPassThruResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLGPSData.h b/SmartDeviceLink/SDLGPSData.h index cfeebaa41..9517524d1 100644 --- a/SmartDeviceLink/SDLGPSData.h +++ b/SmartDeviceLink/SDLGPSData.h @@ -12,19 +12,7 @@ * * @since SDL 2.0 */ -@interface SDLGPSData : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLGPSData object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLGPSData object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLGPSData : SDLRPCStruct /** * @abstract longitude degrees diff --git a/SmartDeviceLink/SDLGPSData.m b/SmartDeviceLink/SDLGPSData.m index 1cec52112..4ed3c157a 100644 --- a/SmartDeviceLink/SDLGPSData.m +++ b/SmartDeviceLink/SDLGPSData.m @@ -10,18 +10,6 @@ @implementation SDLGPSData -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setLongitudeDegrees:(NSNumber *)longitudeDegrees { if (longitudeDegrees != nil) { [store setObject:longitudeDegrees forKey:NAMES_longitudeDegrees]; diff --git a/SmartDeviceLink/SDLGenericResponse.h b/SmartDeviceLink/SDLGenericResponse.h index 4d339fb64..61e1f2c8d 100644 --- a/SmartDeviceLink/SDLGenericResponse.h +++ b/SmartDeviceLink/SDLGenericResponse.h @@ -9,10 +9,6 @@ * retrieved. Only used in case of an error. Currently, only resultCode * INVALID_DATA is used. */ -@interface SDLGenericResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLGenericResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLGenericResponse.m b/SmartDeviceLink/SDLGenericResponse.m index aff982d8f..bea910344 100644 --- a/SmartDeviceLink/SDLGenericResponse.m +++ b/SmartDeviceLink/SDLGenericResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLGetDTCs.h b/SmartDeviceLink/SDLGetDTCs.h index 3d38a0079..67367dae2 100644 --- a/SmartDeviceLink/SDLGetDTCs.h +++ b/SmartDeviceLink/SDLGetDTCs.h @@ -13,19 +13,8 @@ * <b>HMILevel needs to be FULL, LIMITED or BACKGROUND</b> * <p> */ -@interface SDLGetDTCs : SDLRPCRequest { -} -/** - * Constructs a new SDLGetDTCs object - */ -- (instancetype)init; -/** - * Constructs a new SDLGetDTCs object indicated by the dictionary parameter - * <p> - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLGetDTCs : SDLRPCRequest + /** * @abstract a name of the module to receive the DTC form * @discussion an NSNumber value representing a name of the module to receive diff --git a/SmartDeviceLink/SDLGetDTCs.m b/SmartDeviceLink/SDLGetDTCs.m index cf7db88e5..3f09c0f3f 100644 --- a/SmartDeviceLink/SDLGetDTCs.m +++ b/SmartDeviceLink/SDLGetDTCs.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setEcuName:(NSNumber *)ecuName { if (ecuName != nil) { [parameters setObject:ecuName forKey:NAMES_ecuName]; diff --git a/SmartDeviceLink/SDLGetDTCsResponse.h b/SmartDeviceLink/SDLGetDTCsResponse.h index 4e0af4a39..c31855228 100644 --- a/SmartDeviceLink/SDLGetDTCsResponse.h +++ b/SmartDeviceLink/SDLGetDTCsResponse.h @@ -9,11 +9,7 @@ * * Since <b>SmartDeviceLink 2.0</b> */ -@interface SDLGetDTCsResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLGetDTCsResponse : SDLRPCResponse @property (strong) NSNumber *ecuHeader; @property (strong) NSMutableArray *dtc; diff --git a/SmartDeviceLink/SDLGetDTCsResponse.m b/SmartDeviceLink/SDLGetDTCsResponse.m index bbf678a78..b7f3e88a8 100644 --- a/SmartDeviceLink/SDLGetDTCsResponse.m +++ b/SmartDeviceLink/SDLGetDTCsResponse.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setEcuHeader:(NSNumber *)ecuHeader { if (ecuHeader != nil) { [parameters setObject:ecuHeader forKey:NAMES_ecuHeader]; diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index df2c1923e..b73298e68 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -15,20 +15,7 @@ * Since SmartDeviceLink 2.0<br/> * See SDLSubscribeVehicleData SDLUnsubscribeVehicleData */ -@interface SDLGetVehicleData : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLGetVehicleData object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLGetVehicleData object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLGetVehicleData : SDLRPCRequest /** * @abstract A boolean value. If true, requests Gps data @@ -137,4 +124,4 @@ @property (strong) NSNumber *clusterModeStatus; @property (strong) NSNumber *myKey; -@end
\ No newline at end of file +@end diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m index ab5d59a19..dd2585a27 100644 --- a/SmartDeviceLink/SDLGetVehicleData.m +++ b/SmartDeviceLink/SDLGetVehicleData.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setGps:(NSNumber *)gps { if (gps != nil) { [parameters setObject:gps forKey:NAMES_gps]; diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index 882c09b51..0a5d7aa7f 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -25,22 +25,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLGetVehicleDataResponse : SDLRPCResponse { -} - - -/** - * @abstract Constructs a new SDLGetVehicleDataResponse object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLGetVehicleDataResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - +@interface SDLGetVehicleDataResponse : SDLRPCResponse /** * @abstract A SDLGPSData* value. See GPSData. diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m index 7f1bdb351..e322831c2 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.m +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m @@ -30,12 +30,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setGps:(SDLGPSData *)gps { if (gps != nil) { [parameters setObject:gps forKey:NAMES_gps]; @@ -49,7 +43,7 @@ if (obj == nil || [obj isKindOfClass:SDLGPSData.class]) { return (SDLGPSData *)obj; } else { - return [[SDLGPSData alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLGPSData alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -172,7 +166,7 @@ if (obj == nil || [obj isKindOfClass:SDLTireStatus.class]) { return (SDLTireStatus *)obj; } else { - return [[SDLTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLTireStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -201,7 +195,7 @@ if (obj == nil || [obj isKindOfClass:SDLBeltStatus.class]) { return (SDLBeltStatus *)obj; } else { - return [[SDLBeltStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLBeltStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -218,7 +212,7 @@ if (obj == nil || [obj isKindOfClass:SDLBodyInformation.class]) { return (SDLBodyInformation *)obj; } else { - return [[SDLBodyInformation alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLBodyInformation alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -235,7 +229,7 @@ if (obj == nil || [obj isKindOfClass:SDLDeviceStatus.class]) { return (SDLDeviceStatus *)obj; } else { - return [[SDLDeviceStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLDeviceStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -286,7 +280,7 @@ if (obj == nil || [obj isKindOfClass:SDLHeadLampStatus.class]) { return (SDLHeadLampStatus *)obj; } else { - return [[SDLHeadLampStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLHeadLampStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -339,7 +333,7 @@ if (obj == nil || [obj isKindOfClass:SDLECallInfo.class]) { return (SDLECallInfo *)obj; } else { - return [[SDLECallInfo alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLECallInfo alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -356,7 +350,7 @@ if (obj == nil || [obj isKindOfClass:SDLAirbagStatus.class]) { return (SDLAirbagStatus *)obj; } else { - return [[SDLAirbagStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLAirbagStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -373,7 +367,7 @@ if (obj == nil || [obj isKindOfClass:SDLEmergencyEvent.class]) { return (SDLEmergencyEvent *)obj; } else { - return [[SDLEmergencyEvent alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLEmergencyEvent alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -390,7 +384,7 @@ if (obj == nil || [obj isKindOfClass:SDLClusterModeStatus.class]) { return (SDLClusterModeStatus *)obj; } else { - return [[SDLClusterModeStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLClusterModeStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -407,7 +401,7 @@ if (obj == nil || [obj isKindOfClass:SDLMyKey.class]) { return (SDLMyKey *)obj; } else { - return [[SDLMyKey alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLMyKey alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLHMICapabilities.h b/SmartDeviceLink/SDLHMICapabilities.h index 6a84cec2c..3680dbec4 100644 --- a/SmartDeviceLink/SDLHMICapabilities.h +++ b/SmartDeviceLink/SDLHMICapabilities.h @@ -6,9 +6,6 @@ @interface SDLHMICapabilities : SDLRPCStruct -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - /** Availability of build in Nav. True: Available, False: Not Available diff --git a/SmartDeviceLink/SDLHMICapabilities.m b/SmartDeviceLink/SDLHMICapabilities.m index 24b35be25..52fc93733 100644 --- a/SmartDeviceLink/SDLHMICapabilities.m +++ b/SmartDeviceLink/SDLHMICapabilities.m @@ -9,24 +9,6 @@ @implementation SDLHMICapabilities -- (instancetype)init { - self = [super init]; - if (!self) { - return nil; - } - - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - self = [super initWithDictionary:dict]; - if (!self) { - return nil; - } - - return self; -} - - (void)setNavigation:(NSNumber *)navigation { if (navigation != nil) { store[NAMES_navigation] = navigation; diff --git a/SmartDeviceLink/SDLHMIPermissions.h b/SmartDeviceLink/SDLHMIPermissions.h index 49a7025a7..0aec4718f 100644 --- a/SmartDeviceLink/SDLHMIPermissions.h +++ b/SmartDeviceLink/SDLHMIPermissions.h @@ -9,19 +9,7 @@ * * @since SDL 2.0 */ -@interface SDLHMIPermissions : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLHMIPermissions object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLHMIPermissions object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLHMIPermissions : SDLRPCStruct /** * @abstract a set of all HMI levels that are permitted for this given RPC diff --git a/SmartDeviceLink/SDLHMIPermissions.m b/SmartDeviceLink/SDLHMIPermissions.m index 29555bf59..c0848e87a 100644 --- a/SmartDeviceLink/SDLHMIPermissions.m +++ b/SmartDeviceLink/SDLHMIPermissions.m @@ -9,18 +9,6 @@ @implementation SDLHMIPermissions -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setAllowed:(NSMutableArray *)allowed { if (allowed != nil) { [store setObject:allowed forKey:NAMES_allowed]; diff --git a/SmartDeviceLink/SDLHeadLampStatus.h b/SmartDeviceLink/SDLHeadLampStatus.h index cc1586122..919e763d0 100644 --- a/SmartDeviceLink/SDLHeadLampStatus.h +++ b/SmartDeviceLink/SDLHeadLampStatus.h @@ -9,18 +9,8 @@ /** * Status of the head lamps */ -@interface SDLHeadLampStatus : SDLRPCStruct { -} -/** - * @abstract Constructs a new SDLHeadLampStatus object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLHeadLampStatus object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLHeadLampStatus : SDLRPCStruct + /** * @abstract A boolean value. Status of the low beam lamps. */ @@ -30,4 +20,4 @@ */ @property (strong) NSNumber *highBeamsOn; @property (strong) SDLAmbientLightStatus *ambientLightSensorStatus; -@end
\ No newline at end of file +@end diff --git a/SmartDeviceLink/SDLHeadLampStatus.m b/SmartDeviceLink/SDLHeadLampStatus.m index 44ed87b44..db20b1566 100644 --- a/SmartDeviceLink/SDLHeadLampStatus.m +++ b/SmartDeviceLink/SDLHeadLampStatus.m @@ -9,18 +9,6 @@ @implementation SDLHeadLampStatus -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setLowBeamsOn:(NSNumber *)lowBeamsOn { if (lowBeamsOn != nil) { [store setObject:lowBeamsOn forKey:NAMES_lowBeamsOn]; diff --git a/SmartDeviceLink/SDLImage.h b/SmartDeviceLink/SDLImage.h index 993107ec3..ed3e981cb 100644 --- a/SmartDeviceLink/SDLImage.h +++ b/SmartDeviceLink/SDLImage.h @@ -11,19 +11,7 @@ * * @since SDL 2.0 */ -@interface SDLImage : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLImage object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLImage object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLImage : SDLRPCStruct /** * @abstract The static hex icon value or the binary image file name identifier (sent by SDLPutFile) diff --git a/SmartDeviceLink/SDLImage.m b/SmartDeviceLink/SDLImage.m index ef646f794..fd381d03e 100644 --- a/SmartDeviceLink/SDLImage.m +++ b/SmartDeviceLink/SDLImage.m @@ -9,18 +9,6 @@ @implementation SDLImage -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setValue:(NSString *)value { if (value != nil) { [store setObject:value forKey:NAMES_value]; diff --git a/SmartDeviceLink/SDLImageField.h b/SmartDeviceLink/SDLImageField.h index eb0942e79..4075d023a 100644 --- a/SmartDeviceLink/SDLImageField.h +++ b/SmartDeviceLink/SDLImageField.h @@ -7,11 +7,7 @@ @class SDLImageResolution; -@interface SDLImageField : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLImageField : SDLRPCStruct @property (strong) SDLImageFieldName *name; @property (strong) NSMutableArray *imageTypeSupported; diff --git a/SmartDeviceLink/SDLImageField.m b/SmartDeviceLink/SDLImageField.m index af4f15517..7cec4ba3a 100644 --- a/SmartDeviceLink/SDLImageField.m +++ b/SmartDeviceLink/SDLImageField.m @@ -11,18 +11,6 @@ @implementation SDLImageField -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setName:(SDLImageFieldName *)name { if (name != nil) { [store setObject:name forKey:NAMES_name]; @@ -74,7 +62,7 @@ if (obj == nil || [obj isKindOfClass:SDLImageResolution.class]) { return (SDLImageResolution *)obj; } else { - return [[SDLImageResolution alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImageResolution alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLImageResolution.h b/SmartDeviceLink/SDLImageResolution.h index bae946ab2..884f9fe76 100644 --- a/SmartDeviceLink/SDLImageResolution.h +++ b/SmartDeviceLink/SDLImageResolution.h @@ -4,11 +4,7 @@ #import "SDLRPCMessage.h" -@interface SDLImageResolution : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLImageResolution : SDLRPCStruct @property (strong) NSNumber *resolutionWidth; @property (strong) NSNumber *resolutionHeight; diff --git a/SmartDeviceLink/SDLImageResolution.m b/SmartDeviceLink/SDLImageResolution.m index 7f10116de..6431a2c7e 100644 --- a/SmartDeviceLink/SDLImageResolution.m +++ b/SmartDeviceLink/SDLImageResolution.m @@ -8,18 +8,6 @@ @implementation SDLImageResolution -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setResolutionWidth:(NSNumber *)resolutionWidth { if (resolutionWidth != nil) { [store setObject:resolutionWidth forKey:NAMES_resolutionWidth]; diff --git a/SmartDeviceLink/SDLKeyboardProperties.h b/SmartDeviceLink/SDLKeyboardProperties.h index 8215a8938..b23ec9f79 100644 --- a/SmartDeviceLink/SDLKeyboardProperties.h +++ b/SmartDeviceLink/SDLKeyboardProperties.h @@ -8,11 +8,7 @@ @class SDLKeypressMode; -@interface SDLKeyboardProperties : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLKeyboardProperties : SDLRPCStruct @property (strong) SDLLanguage *language; @property (strong) SDLKeyboardLayout *keyboardLayout; diff --git a/SmartDeviceLink/SDLKeyboardProperties.m b/SmartDeviceLink/SDLKeyboardProperties.m index 896f3a99a..76a713a59 100644 --- a/SmartDeviceLink/SDLKeyboardProperties.m +++ b/SmartDeviceLink/SDLKeyboardProperties.m @@ -11,18 +11,6 @@ @implementation SDLKeyboardProperties -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setLanguage:(SDLLanguage *)language { if (language != nil) { [store setObject:language forKey:NAMES_language]; diff --git a/SmartDeviceLink/SDLListFiles.h b/SmartDeviceLink/SDLListFiles.h index 8a58d8639..61ae4c03b 100644 --- a/SmartDeviceLink/SDLListFiles.h +++ b/SmartDeviceLink/SDLListFiles.h @@ -11,17 +11,6 @@ * * Since <b>SmartDeviceLink 2.0</b> */ -@interface SDLListFiles : SDLRPCRequest { -} -/** - * Constructs a new SDLListFiles object - */ -- (instancetype)init; -/** - * Constructs a new SDLListFiles object indicated by the dictionary parameter - * <p> - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLListFiles : SDLRPCRequest + @end diff --git a/SmartDeviceLink/SDLListFiles.m b/SmartDeviceLink/SDLListFiles.m index a1110df1b..13730327e 100644 --- a/SmartDeviceLink/SDLListFiles.m +++ b/SmartDeviceLink/SDLListFiles.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLListFilesResponse.h b/SmartDeviceLink/SDLListFilesResponse.h index fd309770c..ddd9eb03a 100644 --- a/SmartDeviceLink/SDLListFilesResponse.h +++ b/SmartDeviceLink/SDLListFilesResponse.h @@ -9,11 +9,7 @@ * * Since <b>SmartDeviceLink 2.0</b> */ -@interface SDLListFilesResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLListFilesResponse : SDLRPCResponse @property (strong) NSMutableArray *filenames; @property (strong) NSNumber *spaceAvailable; diff --git a/SmartDeviceLink/SDLListFilesResponse.m b/SmartDeviceLink/SDLListFilesResponse.m index 2d58371d8..f840c7edb 100644 --- a/SmartDeviceLink/SDLListFilesResponse.m +++ b/SmartDeviceLink/SDLListFilesResponse.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setFilenames:(NSMutableArray *)filenames { if (filenames != nil) { [parameters setObject:filenames forKey:NAMES_filenames]; diff --git a/SmartDeviceLink/SDLMenuParams.h b/SmartDeviceLink/SDLMenuParams.h index 14f51e390..df7e394af 100644 --- a/SmartDeviceLink/SDLMenuParams.h +++ b/SmartDeviceLink/SDLMenuParams.h @@ -9,20 +9,7 @@ * * @since SDL 1.0 */ -@interface SDLMenuParams : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLMenuParams object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLMenuParams object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - +@interface SDLMenuParams : SDLRPCStruct /** * @abstract the unique ID of an existing submenu to which a command will be added diff --git a/SmartDeviceLink/SDLMenuParams.m b/SmartDeviceLink/SDLMenuParams.m index 84fb595a8..27dc59825 100644 --- a/SmartDeviceLink/SDLMenuParams.m +++ b/SmartDeviceLink/SDLMenuParams.m @@ -8,18 +8,6 @@ @implementation SDLMenuParams -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setParentID:(NSNumber *)parentID { if (parentID != nil) { [store setObject:parentID forKey:NAMES_parentID]; diff --git a/SmartDeviceLink/SDLMyKey.h b/SmartDeviceLink/SDLMyKey.h index ff039e582..1810c30ba 100644 --- a/SmartDeviceLink/SDLMyKey.h +++ b/SmartDeviceLink/SDLMyKey.h @@ -6,11 +6,7 @@ @class SDLVehicleDataStatus; -@interface SDLMyKey : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLMyKey : SDLRPCStruct @property (strong) SDLVehicleDataStatus *e911Override; diff --git a/SmartDeviceLink/SDLMyKey.m b/SmartDeviceLink/SDLMyKey.m index ec4e5ef95..04efc64e8 100644 --- a/SmartDeviceLink/SDLMyKey.m +++ b/SmartDeviceLink/SDLMyKey.m @@ -9,18 +9,6 @@ @implementation SDLMyKey -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setE911Override:(SDLVehicleDataStatus *)e911Override { if (e911Override != nil) { [store setObject:e911Override forKey:NAMES_e911Override]; diff --git a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.h b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.h index 59b596f58..bbeb91af6 100644 --- a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.h +++ b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.h @@ -14,18 +14,7 @@ * @since SDL 1.0 * @see SDLRegisterAppInterface */ -@interface SDLOnAppInterfaceUnregistered : SDLRPCNotification { -} - -/** - * Constructs a newly allocated SDLOnAppInterfaceUnregistered object - */ -- (instancetype)init; -/** - * Constructs a newly allocated SDLOnAppInterfaceUnregistered object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnAppInterfaceUnregistered : SDLRPCNotification /** * @abstract The reason application's interface was terminated diff --git a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m index 5427cf871..a9ebb9acc 100644 --- a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m +++ b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m @@ -15,12 +15,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setReason:(SDLAppInterfaceUnregisteredReason *)reason { if (reason != nil) { [parameters setObject:reason forKey:NAMES_reason]; diff --git a/SmartDeviceLink/SDLOnAudioPassThru.h b/SmartDeviceLink/SDLOnAudioPassThru.h index f37d4067e..1f9c5d74b 100644 --- a/SmartDeviceLink/SDLOnAudioPassThru.h +++ b/SmartDeviceLink/SDLOnAudioPassThru.h @@ -23,17 +23,6 @@ * </ul> * </ul> */ -@interface SDLOnAudioPassThru : SDLRPCNotification { -} +@interface SDLOnAudioPassThru : SDLRPCNotification -/** - *Constructs a newly allocated SDLOnAudioPassThru object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLOnAudioPassThru object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; @end diff --git a/SmartDeviceLink/SDLOnAudioPassThru.m b/SmartDeviceLink/SDLOnAudioPassThru.m index e0360e3e4..0c0867072 100644 --- a/SmartDeviceLink/SDLOnAudioPassThru.m +++ b/SmartDeviceLink/SDLOnAudioPassThru.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLOnButtonEvent.h b/SmartDeviceLink/SDLOnButtonEvent.h index 0d1fc8afd..1f98f6847 100644 --- a/SmartDeviceLink/SDLOnButtonEvent.h +++ b/SmartDeviceLink/SDLOnButtonEvent.h @@ -44,20 +44,7 @@ * * @since SDL 1.0 */ -@interface SDLOnButtonEvent : SDLRPCNotification { -} - -/** - * Constructs a newly allocated SDLOnButtonEvent object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLOnButtonEvent object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnButtonEvent : SDLRPCNotification /** * @abstract The name of the button diff --git a/SmartDeviceLink/SDLOnButtonEvent.m b/SmartDeviceLink/SDLOnButtonEvent.m index d112d88ea..6262ca804 100644 --- a/SmartDeviceLink/SDLOnButtonEvent.m +++ b/SmartDeviceLink/SDLOnButtonEvent.m @@ -16,12 +16,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setButtonName:(SDLButtonName *)buttonName { if (buttonName != nil) { [parameters setObject:buttonName forKey:NAMES_buttonName]; diff --git a/SmartDeviceLink/SDLOnButtonPress.h b/SmartDeviceLink/SDLOnButtonPress.h index 942dbd583..c15dd315e 100644 --- a/SmartDeviceLink/SDLOnButtonPress.h +++ b/SmartDeviceLink/SDLOnButtonPress.h @@ -49,20 +49,7 @@ * * @since SDL 1.0 */ -@interface SDLOnButtonPress : SDLRPCNotification { -} - -/** - * Constructs a newly allocated SDLOnButtonPress object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLOnButtonPress object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnButtonPress : SDLRPCNotification /** * @abstract the button's name diff --git a/SmartDeviceLink/SDLOnButtonPress.m b/SmartDeviceLink/SDLOnButtonPress.m index 8926b7951..0948679c1 100644 --- a/SmartDeviceLink/SDLOnButtonPress.m +++ b/SmartDeviceLink/SDLOnButtonPress.m @@ -16,12 +16,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setButtonName:(SDLButtonName *)buttonName { if (buttonName != nil) { [parameters setObject:buttonName forKey:NAMES_buttonName]; diff --git a/SmartDeviceLink/SDLOnCommand.h b/SmartDeviceLink/SDLOnCommand.h index 5d3d3f599..7374591ff 100644 --- a/SmartDeviceLink/SDLOnCommand.h +++ b/SmartDeviceLink/SDLOnCommand.h @@ -15,19 +15,7 @@ * @since SDL 1.0 * @see SDLAddCommand SDLDeleteCommand SDLDeleteSubMenu */ -@interface SDLOnCommand : SDLRPCNotification { -} - -/** - *Constructs a newly allocated SDLRPCNotification object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLRPCNotification object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnCommand : SDLRPCNotification /** * @abstract The command ID of the command the user selected. This is the command ID value provided by the application in the <i>SDLAddCommand</i> operation that created the command. diff --git a/SmartDeviceLink/SDLOnCommand.m b/SmartDeviceLink/SDLOnCommand.m index f16023d42..523557aeb 100644 --- a/SmartDeviceLink/SDLOnCommand.m +++ b/SmartDeviceLink/SDLOnCommand.m @@ -15,12 +15,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setCmdID:(NSNumber *)cmdID { if (cmdID != nil) { [parameters setObject:cmdID forKey:NAMES_cmdID]; diff --git a/SmartDeviceLink/SDLOnDriverDistraction.h b/SmartDeviceLink/SDLOnDriverDistraction.h index d99e57393..c4188e771 100644 --- a/SmartDeviceLink/SDLOnDriverDistraction.h +++ b/SmartDeviceLink/SDLOnDriverDistraction.h @@ -23,20 +23,7 @@ * * @since SDL 1.0 */ -@interface SDLOnDriverDistraction : SDLRPCNotification { -} - -/** - * Constructs a newly allocated SDLOnDriverDistraction object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLOnDriverDistraction object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnDriverDistraction : SDLRPCNotification /** * @abstract The driver distraction state (i.e. whether driver distraction rules are in effect, or not) diff --git a/SmartDeviceLink/SDLOnDriverDistraction.m b/SmartDeviceLink/SDLOnDriverDistraction.m index 1a87075b3..c71facfee 100644 --- a/SmartDeviceLink/SDLOnDriverDistraction.m +++ b/SmartDeviceLink/SDLOnDriverDistraction.m @@ -15,12 +15,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setState:(SDLDriverDistractionState *)state { if (state != nil) { [parameters setObject:state forKey:NAMES_state]; diff --git a/SmartDeviceLink/SDLOnEncodedSyncPData.h b/SmartDeviceLink/SDLOnEncodedSyncPData.h index 618aaf7d2..f5ed29722 100644 --- a/SmartDeviceLink/SDLOnEncodedSyncPData.h +++ b/SmartDeviceLink/SDLOnEncodedSyncPData.h @@ -4,11 +4,7 @@ #import "SDLRPCNotification.h" -@interface SDLOnEncodedSyncPData : SDLRPCNotification { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnEncodedSyncPData : SDLRPCNotification @property (strong) NSMutableArray *data; @property (strong) NSString *URL; diff --git a/SmartDeviceLink/SDLOnEncodedSyncPData.m b/SmartDeviceLink/SDLOnEncodedSyncPData.m index f4aca251a..0994c3766 100644 --- a/SmartDeviceLink/SDLOnEncodedSyncPData.m +++ b/SmartDeviceLink/SDLOnEncodedSyncPData.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setData:(NSMutableArray *)data { if (data != nil) { [parameters setObject:data forKey:NAMES_data]; diff --git a/SmartDeviceLink/SDLOnHMIStatus.h b/SmartDeviceLink/SDLOnHMIStatus.h index c417070d5..6c9911ffd 100644 --- a/SmartDeviceLink/SDLOnHMIStatus.h +++ b/SmartDeviceLink/SDLOnHMIStatus.h @@ -23,19 +23,7 @@ * * @since SDL 1.0 */ -@interface SDLOnHMIStatus : SDLRPCNotification { -} - -/** - *Constructs a newly allocated SDLOnHMIStatus object - */ -- (instancetype)init; - -/** - *<p>Constructs a newly allocated SDLOnHMIStatus object indicated by the dictionary parameter</p> - *@param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnHMIStatus : SDLRPCNotification /** * @abstract SDLHMILevel in effect for the application diff --git a/SmartDeviceLink/SDLOnHMIStatus.m b/SmartDeviceLink/SDLOnHMIStatus.m index e3dc0d7fc..23ebb3875 100644 --- a/SmartDeviceLink/SDLOnHMIStatus.m +++ b/SmartDeviceLink/SDLOnHMIStatus.m @@ -17,12 +17,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setHmiLevel:(SDLHMILevel *)hmiLevel { if (hmiLevel != nil) { [parameters setObject:hmiLevel forKey:NAMES_hmiLevel]; diff --git a/SmartDeviceLink/SDLOnHashChange.h b/SmartDeviceLink/SDLOnHashChange.h index 4facf1f15..e339444e9 100644 --- a/SmartDeviceLink/SDLOnHashChange.h +++ b/SmartDeviceLink/SDLOnHashChange.h @@ -4,11 +4,7 @@ #import "SDLRPCNotification.h" -@interface SDLOnHashChange : SDLRPCNotification { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnHashChange : SDLRPCNotification @property (strong) NSString *hashID; diff --git a/SmartDeviceLink/SDLOnHashChange.m b/SmartDeviceLink/SDLOnHashChange.m index b1bfd8c6a..07dd199b8 100644 --- a/SmartDeviceLink/SDLOnHashChange.m +++ b/SmartDeviceLink/SDLOnHashChange.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setHashID:(NSString *)hashID { if (hashID != nil) { [parameters setObject:hashID forKey:NAMES_hashID]; diff --git a/SmartDeviceLink/SDLOnKeyboardInput.h b/SmartDeviceLink/SDLOnKeyboardInput.h index e976d6c88..52edac52f 100644 --- a/SmartDeviceLink/SDLOnKeyboardInput.h +++ b/SmartDeviceLink/SDLOnKeyboardInput.h @@ -6,11 +6,7 @@ @class SDLKeyboardEvent; -@interface SDLOnKeyboardInput : SDLRPCNotification { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnKeyboardInput : SDLRPCNotification @property (strong) SDLKeyboardEvent *event; @property (strong) NSString *data; diff --git a/SmartDeviceLink/SDLOnKeyboardInput.m b/SmartDeviceLink/SDLOnKeyboardInput.m index a70a7d06c..4ba935d57 100644 --- a/SmartDeviceLink/SDLOnKeyboardInput.m +++ b/SmartDeviceLink/SDLOnKeyboardInput.m @@ -15,12 +15,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setEvent:(SDLKeyboardEvent *)event { if (event != nil) { [parameters setObject:event forKey:NAMES_event]; diff --git a/SmartDeviceLink/SDLOnLanguageChange.h b/SmartDeviceLink/SDLOnLanguageChange.h index b794edcd1..112ea5a47 100644 --- a/SmartDeviceLink/SDLOnLanguageChange.h +++ b/SmartDeviceLink/SDLOnLanguageChange.h @@ -11,19 +11,7 @@ * * @since SDL 2.0 */ -@interface SDLOnLanguageChange : SDLRPCNotification { -} - -/** - *Constructs a newly allocated SDLOnLanguageChange object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLOnLanguageChange object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnLanguageChange : SDLRPCNotification /** * @abstract Current SDL voice engine (VR+TTS) language diff --git a/SmartDeviceLink/SDLOnLanguageChange.m b/SmartDeviceLink/SDLOnLanguageChange.m index 216d0c4a5..0b4e116a0 100644 --- a/SmartDeviceLink/SDLOnLanguageChange.m +++ b/SmartDeviceLink/SDLOnLanguageChange.m @@ -15,12 +15,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setLanguage:(SDLLanguage *)language { if (language != nil) { [parameters setObject:language forKey:NAMES_language]; diff --git a/SmartDeviceLink/SDLOnLockScreenStatus.h b/SmartDeviceLink/SDLOnLockScreenStatus.h index 3a4a31452..41bf9c013 100644 --- a/SmartDeviceLink/SDLOnLockScreenStatus.h +++ b/SmartDeviceLink/SDLOnLockScreenStatus.h @@ -19,9 +19,6 @@ */ @interface SDLOnLockScreenStatus : SDLRPCNotification -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - /** * <p>Get the current driver distraction status(i.e. whether driver distraction rules are in effect, or not)</p> * @return String diff --git a/SmartDeviceLink/SDLOnLockScreenStatus.m b/SmartDeviceLink/SDLOnLockScreenStatus.m index fc9e39c00..d24354447 100644 --- a/SmartDeviceLink/SDLOnLockScreenStatus.m +++ b/SmartDeviceLink/SDLOnLockScreenStatus.m @@ -17,12 +17,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setLockScreenStatus:(SDLLockScreenStatus *)lockScreenStatus { if (lockScreenStatus != nil) { [parameters setObject:lockScreenStatus forKey:@"OnLockScreenStatus"]; diff --git a/SmartDeviceLink/SDLOnPermissionsChange.h b/SmartDeviceLink/SDLOnPermissionsChange.h index 267a63a10..7ec871117 100644 --- a/SmartDeviceLink/SDLOnPermissionsChange.h +++ b/SmartDeviceLink/SDLOnPermissionsChange.h @@ -9,19 +9,7 @@ * * @since SDL 2.0 */ -@interface SDLOnPermissionsChange : SDLRPCNotification { -} - -/** - * Constructs a newly allocated SDLOnPermissionsChange object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLOnPermissionsChange object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnPermissionsChange : SDLRPCNotification /** * @abstract Describes change in permissions for a given set of RPCs diff --git a/SmartDeviceLink/SDLOnPermissionsChange.m b/SmartDeviceLink/SDLOnPermissionsChange.m index e80df88c4..ffbb9fb7b 100644 --- a/SmartDeviceLink/SDLOnPermissionsChange.m +++ b/SmartDeviceLink/SDLOnPermissionsChange.m @@ -15,12 +15,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setPermissionItem:(NSMutableArray *)permissionItem { if (permissionItem != nil) { [parameters setObject:permissionItem forKey:NAMES_permissionItem]; @@ -36,7 +30,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLPermissionItem alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLPermissionItem alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLOnSyncPData.h b/SmartDeviceLink/SDLOnSyncPData.h index 8729a881a..86d3c466d 100644 --- a/SmartDeviceLink/SDLOnSyncPData.h +++ b/SmartDeviceLink/SDLOnSyncPData.h @@ -4,11 +4,7 @@ #import "SDLRPCNotification.h" -@interface SDLOnSyncPData : SDLRPCNotification { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnSyncPData : SDLRPCNotification @property (strong) NSString *URL; @property (strong) NSNumber *Timeout; diff --git a/SmartDeviceLink/SDLOnSyncPData.m b/SmartDeviceLink/SDLOnSyncPData.m index 11fe8a3ac..4b869e8cf 100644 --- a/SmartDeviceLink/SDLOnSyncPData.m +++ b/SmartDeviceLink/SDLOnSyncPData.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setURL:(NSString *)URL { if (URL != nil) { [parameters setObject:URL forKey:NAMES_URL]; diff --git a/SmartDeviceLink/SDLOnSystemRequest.h b/SmartDeviceLink/SDLOnSystemRequest.h index b590f0650..8784eeb91 100644 --- a/SmartDeviceLink/SDLOnSystemRequest.h +++ b/SmartDeviceLink/SDLOnSystemRequest.h @@ -7,11 +7,7 @@ @class SDLRequestType; -@interface SDLOnSystemRequest : SDLRPCNotification { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnSystemRequest : SDLRPCNotification @property (strong) SDLRequestType *requestType; @property (strong) NSString *url; diff --git a/SmartDeviceLink/SDLOnSystemRequest.m b/SmartDeviceLink/SDLOnSystemRequest.m index c5aff7569..2aa45c9ec 100644 --- a/SmartDeviceLink/SDLOnSystemRequest.m +++ b/SmartDeviceLink/SDLOnSystemRequest.m @@ -16,12 +16,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setRequestType:(SDLRequestType *)requestType { if (requestType != nil) { [parameters setObject:requestType forKey:NAMES_requestType]; diff --git a/SmartDeviceLink/SDLOnTBTClientState.h b/SmartDeviceLink/SDLOnTBTClientState.h index 8dec001ca..607b57ca8 100644 --- a/SmartDeviceLink/SDLOnTBTClientState.h +++ b/SmartDeviceLink/SDLOnTBTClientState.h @@ -6,11 +6,7 @@ @class SDLTBTState; -@interface SDLOnTBTClientState : SDLRPCNotification { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnTBTClientState : SDLRPCNotification @property (strong) SDLTBTState *state; diff --git a/SmartDeviceLink/SDLOnTBTClientState.m b/SmartDeviceLink/SDLOnTBTClientState.m index ee0dc1efc..b81b9af9b 100644 --- a/SmartDeviceLink/SDLOnTBTClientState.m +++ b/SmartDeviceLink/SDLOnTBTClientState.m @@ -15,12 +15,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setState:(SDLTBTState *)state { if (state != nil) { [parameters setObject:state forKey:NAMES_state]; diff --git a/SmartDeviceLink/SDLOnTouchEvent.h b/SmartDeviceLink/SDLOnTouchEvent.h index 68f1fa707..00789cac4 100644 --- a/SmartDeviceLink/SDLOnTouchEvent.h +++ b/SmartDeviceLink/SDLOnTouchEvent.h @@ -6,11 +6,7 @@ @class SDLTouchType; -@interface SDLOnTouchEvent : SDLRPCNotification { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnTouchEvent : SDLRPCNotification @property (strong) SDLTouchType *type; @property (strong) NSMutableArray *event; diff --git a/SmartDeviceLink/SDLOnTouchEvent.m b/SmartDeviceLink/SDLOnTouchEvent.m index e73c79603..15c0905a6 100644 --- a/SmartDeviceLink/SDLOnTouchEvent.m +++ b/SmartDeviceLink/SDLOnTouchEvent.m @@ -16,12 +16,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setType:(SDLTouchType *)type { if (type != nil) { [parameters setObject:type forKey:NAMES_type]; @@ -54,7 +48,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTouchEvent alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTouchEvent alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index 245477e3b..df88ccd82 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -25,21 +25,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLOnVehicleData : SDLRPCNotification { -} - - -/** - * @abstract Constructs a new SDLOnVehicleData object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLOnVehicleData object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnVehicleData : SDLRPCNotification /** * @abstract A SDLGPSData* value. See GPSData. diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m index 3386ca450..1b9143f26 100644 --- a/SmartDeviceLink/SDLOnVehicleData.m +++ b/SmartDeviceLink/SDLOnVehicleData.m @@ -29,12 +29,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setGps:(SDLGPSData *)gps { if (gps != nil) { [parameters setObject:gps forKey:NAMES_gps]; @@ -48,7 +42,7 @@ if (obj == nil || [obj isKindOfClass:SDLGPSData.class]) { return (SDLGPSData *)obj; } else { - return [[SDLGPSData alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLGPSData alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -171,7 +165,7 @@ if (obj == nil || [obj isKindOfClass:SDLTireStatus.class]) { return (SDLTireStatus *)obj; } else { - return [[SDLTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLTireStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -200,7 +194,7 @@ if (obj == nil || [obj isKindOfClass:SDLBeltStatus.class]) { return (SDLBeltStatus *)obj; } else { - return [[SDLBeltStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLBeltStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -217,7 +211,7 @@ if (obj == nil || [obj isKindOfClass:SDLBodyInformation.class]) { return (SDLBodyInformation *)obj; } else { - return [[SDLBodyInformation alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLBodyInformation alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -234,7 +228,7 @@ if (obj == nil || [obj isKindOfClass:SDLDeviceStatus.class]) { return (SDLDeviceStatus *)obj; } else { - return [[SDLDeviceStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLDeviceStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -285,7 +279,7 @@ if (obj == nil || [obj isKindOfClass:SDLHeadLampStatus.class]) { return (SDLHeadLampStatus *)obj; } else { - return [[SDLHeadLampStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLHeadLampStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -338,7 +332,7 @@ if (obj == nil || [obj isKindOfClass:SDLECallInfo.class]) { return (SDLECallInfo *)obj; } else { - return [[SDLECallInfo alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLECallInfo alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -355,7 +349,7 @@ if (obj == nil || [obj isKindOfClass:SDLAirbagStatus.class]) { return (SDLAirbagStatus *)obj; } else { - return [[SDLAirbagStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLAirbagStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -372,7 +366,7 @@ if (obj == nil || [obj isKindOfClass:SDLEmergencyEvent.class]) { return (SDLEmergencyEvent *)obj; } else { - return [[SDLEmergencyEvent alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLEmergencyEvent alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -389,7 +383,7 @@ if (obj == nil || [obj isKindOfClass:SDLClusterModeStatus.class]) { return (SDLClusterModeStatus *)obj; } else { - return [[SDLClusterModeStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLClusterModeStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -406,7 +400,7 @@ if (obj == nil || [obj isKindOfClass:SDLMyKey.class]) { return (SDLMyKey *)obj; } else { - return [[SDLMyKey alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLMyKey alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLParameterPermissions.h b/SmartDeviceLink/SDLParameterPermissions.h index af724d53f..71b49ad0a 100644 --- a/SmartDeviceLink/SDLParameterPermissions.h +++ b/SmartDeviceLink/SDLParameterPermissions.h @@ -9,19 +9,7 @@ * * @since SDL 2.0 */ -@interface SDLParameterPermissions : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLParameterPermissions object - */ -- (instancetype)init; -/** - * @abstract Constructs a newly allocated SDLParameterPermissions object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLParameterPermissions : SDLRPCStruct /** * @abstract A set of all parameters that are permitted for this given RPC. diff --git a/SmartDeviceLink/SDLParameterPermissions.m b/SmartDeviceLink/SDLParameterPermissions.m index e18d1ec12..c81587fd2 100644 --- a/SmartDeviceLink/SDLParameterPermissions.m +++ b/SmartDeviceLink/SDLParameterPermissions.m @@ -8,18 +8,6 @@ @implementation SDLParameterPermissions -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setAllowed:(NSMutableArray *)allowed { if (allowed != nil) { [store setObject:allowed forKey:NAMES_allowed]; diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.h b/SmartDeviceLink/SDLPerformAudioPassThru.h index 66dfacf19..34fe7ee4d 100644 --- a/SmartDeviceLink/SDLPerformAudioPassThru.h +++ b/SmartDeviceLink/SDLPerformAudioPassThru.h @@ -20,18 +20,7 @@ * <p>Since SmartDeviceLink 2.0</p> * <p>See SDLEndAudioPassThru</p> */ -@interface SDLPerformAudioPassThru : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLPerformAudioPassThru object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLPerformAudioPassThru object indicated by the NSMutableDictionary - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLPerformAudioPassThru : SDLRPCRequest /** * @abstract initial prompt which will be spoken before opening the audio pass diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.m b/SmartDeviceLink/SDLPerformAudioPassThru.m index 67b0f05c3..9d1b0cdae 100644 --- a/SmartDeviceLink/SDLPerformAudioPassThru.m +++ b/SmartDeviceLink/SDLPerformAudioPassThru.m @@ -19,12 +19,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setInitialPrompt:(NSMutableArray *)initialPrompt { if (initialPrompt != nil) { [parameters setObject:initialPrompt forKey:NAMES_initialPrompt]; @@ -40,7 +34,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLPerformAudioPassThruResponse.h b/SmartDeviceLink/SDLPerformAudioPassThruResponse.h index 3d2835114..c187f0c78 100644 --- a/SmartDeviceLink/SDLPerformAudioPassThruResponse.h +++ b/SmartDeviceLink/SDLPerformAudioPassThruResponse.h @@ -9,17 +9,6 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLPerformAudioPassThruResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLPerformAudioPassThruResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLPerformAudioPassThruResponse object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLPerformAudioPassThruResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLPerformAudioPassThruResponse.m b/SmartDeviceLink/SDLPerformAudioPassThruResponse.m index ed8a1e614..dc9dc5eb6 100644 --- a/SmartDeviceLink/SDLPerformAudioPassThruResponse.m +++ b/SmartDeviceLink/SDLPerformAudioPassThruResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLPerformInteraction.h b/SmartDeviceLink/SDLPerformInteraction.h index 29f166c96..04738d739 100644 --- a/SmartDeviceLink/SDLPerformInteraction.h +++ b/SmartDeviceLink/SDLPerformInteraction.h @@ -23,18 +23,7 @@ * Since SmartDeviceLink 1.0<br/> * See SDLCreateInteractionChoiceSet SDLDeleteInteractionChoiceSet */ -@interface SDLPerformInteraction : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLPerformInteraction object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLPerformInteraction object indicated by the NSMutableDictionary - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLPerformInteraction : SDLRPCRequest /** * @abstract The Text that Displayed when the interaction begins. This text may diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m index de6c3622f..de4c6fdca 100644 --- a/SmartDeviceLink/SDLPerformInteraction.m +++ b/SmartDeviceLink/SDLPerformInteraction.m @@ -18,12 +18,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setInitialText:(NSString *)initialText { if (initialText != nil) { [parameters setObject:initialText forKey:NAMES_initialText]; @@ -51,7 +45,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -101,7 +95,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -122,7 +116,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -155,7 +149,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLVRHelpItem alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLVRHelpItem alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLPerformInteractionResponse.h b/SmartDeviceLink/SDLPerformInteractionResponse.h index b589f9492..99224907e 100644 --- a/SmartDeviceLink/SDLPerformInteractionResponse.h +++ b/SmartDeviceLink/SDLPerformInteractionResponse.h @@ -12,19 +12,7 @@ * * @since SDL 1.0 */ -@interface SDLPerformInteractionResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLPerformInteractionResponse object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLPerformInteractionResponse object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLPerformInteractionResponse : SDLRPCResponse /** * @abstract ID of the choice that was selected in response to PerformInteraction. diff --git a/SmartDeviceLink/SDLPerformInteractionResponse.m b/SmartDeviceLink/SDLPerformInteractionResponse.m index ae1c5e14c..f5f4ddd55 100644 --- a/SmartDeviceLink/SDLPerformInteractionResponse.m +++ b/SmartDeviceLink/SDLPerformInteractionResponse.m @@ -16,12 +16,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setChoiceID:(NSNumber *)choiceID { if (choiceID != nil) { [parameters setObject:choiceID forKey:NAMES_choiceID]; diff --git a/SmartDeviceLink/SDLPermissionItem.h b/SmartDeviceLink/SDLPermissionItem.h index a0fe0d580..a64c11aa2 100644 --- a/SmartDeviceLink/SDLPermissionItem.h +++ b/SmartDeviceLink/SDLPermissionItem.h @@ -7,11 +7,7 @@ @class SDLParameterPermissions; -@interface SDLPermissionItem : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLPermissionItem : SDLRPCStruct @property (strong) NSString *rpcName; @property (strong) SDLHMIPermissions *hmiPermissions; diff --git a/SmartDeviceLink/SDLPermissionItem.m b/SmartDeviceLink/SDLPermissionItem.m index 560094c2e..d07502e70 100644 --- a/SmartDeviceLink/SDLPermissionItem.m +++ b/SmartDeviceLink/SDLPermissionItem.m @@ -10,18 +10,6 @@ @implementation SDLPermissionItem -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setRpcName:(NSString *)rpcName { if (rpcName != nil) { [store setObject:rpcName forKey:NAMES_rpcName]; @@ -47,7 +35,7 @@ if (obj == nil || [obj isKindOfClass:SDLHMIPermissions.class]) { return (SDLHMIPermissions *)obj; } else { - return [[SDLHMIPermissions alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLHMIPermissions alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -64,7 +52,7 @@ if (obj == nil || [obj isKindOfClass:SDLParameterPermissions.class]) { return (SDLParameterPermissions *)obj; } else { - return [[SDLParameterPermissions alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLParameterPermissions alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLPresetBankCapabilities.h b/SmartDeviceLink/SDLPresetBankCapabilities.h index edf544f8b..4bc582191 100644 --- a/SmartDeviceLink/SDLPresetBankCapabilities.h +++ b/SmartDeviceLink/SDLPresetBankCapabilities.h @@ -9,19 +9,7 @@ * * @since SDL 2.0 */ -@interface SDLPresetBankCapabilities : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLPresetBankCapabilities object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLPresetBankCapabilities object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLPresetBankCapabilities : SDLRPCStruct /** * @abstract If Onscreen custom presets are available. diff --git a/SmartDeviceLink/SDLPresetBankCapabilities.m b/SmartDeviceLink/SDLPresetBankCapabilities.m index 7654aa61d..e2f721ef4 100644 --- a/SmartDeviceLink/SDLPresetBankCapabilities.m +++ b/SmartDeviceLink/SDLPresetBankCapabilities.m @@ -8,18 +8,6 @@ @implementation SDLPresetBankCapabilities -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setOnScreenPresetsAvailable:(NSNumber *)onScreenPresetsAvailable { if (onScreenPresetsAvailable != nil) { [store setObject:onScreenPresetsAvailable forKey:NAMES_onScreenPresetsAvailable]; diff --git a/SmartDeviceLink/SDLPutFile.h b/SmartDeviceLink/SDLPutFile.h index eb7bae2bf..01d42cebe 100644 --- a/SmartDeviceLink/SDLPutFile.h +++ b/SmartDeviceLink/SDLPutFile.h @@ -14,20 +14,7 @@ * @see SDLDeleteFile * @see SDLListFiles */ -@interface SDLPutFile : SDLRPCRequest { -} - -/** - * Constructs a new SDLPutFile object - */ -- (instancetype)init; - -/** - * Constructs a new SDLPutFile object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLPutFile : SDLRPCRequest /** * A file reference name diff --git a/SmartDeviceLink/SDLPutFile.m b/SmartDeviceLink/SDLPutFile.m index 69d83edcd..287b290b1 100644 --- a/SmartDeviceLink/SDLPutFile.m +++ b/SmartDeviceLink/SDLPutFile.m @@ -15,12 +15,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setSyncFileName:(NSString *)syncFileName { if (syncFileName != nil) { [parameters setObject:syncFileName forKey:NAMES_syncFileName]; diff --git a/SmartDeviceLink/SDLPutFileResponse.h b/SmartDeviceLink/SDLPutFileResponse.h index 9857607ca..2140a0e2d 100644 --- a/SmartDeviceLink/SDLPutFileResponse.h +++ b/SmartDeviceLink/SDLPutFileResponse.h @@ -9,16 +9,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLPutFileResponse : SDLRPCResponse { -} -/** - * @abstract Constructs a new SDLPutFileResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLPutFileResponse object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLPutFileResponse : SDLRPCResponse + @property (strong) NSNumber *spaceAvailable; @end diff --git a/SmartDeviceLink/SDLPutFileResponse.m b/SmartDeviceLink/SDLPutFileResponse.m index 4a956cfbd..0951676f3 100644 --- a/SmartDeviceLink/SDLPutFileResponse.m +++ b/SmartDeviceLink/SDLPutFileResponse.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setSpaceAvailable:(NSNumber *)spaceAvailable { if (spaceAvailable != nil) { [parameters setObject:spaceAvailable forKey:NAMES_spaceAvailable]; diff --git a/SmartDeviceLink/SDLRPCMessage.h b/SmartDeviceLink/SDLRPCMessage.h index fc5f577ef..febfa406d 100644 --- a/SmartDeviceLink/SDLRPCMessage.h +++ b/SmartDeviceLink/SDLRPCMessage.h @@ -12,7 +12,7 @@ } - (instancetype)initWithName:(NSString *)name; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +- (instancetype)initWithDictionary:(NSDictionary *)dict; - (NSString *)getFunctionName; - (void)setFunctionName:(NSString *)functionName; - (NSObject *)getParameters:(NSString *)functionName; diff --git a/SmartDeviceLink/SDLRPCMessage.m b/SmartDeviceLink/SDLRPCMessage.m index be5f95334..ce3ee4ce7 100644 --- a/SmartDeviceLink/SDLRPCMessage.m +++ b/SmartDeviceLink/SDLRPCMessage.m @@ -23,7 +23,7 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { +- (instancetype)initWithDictionary:(NSDictionary *)dict { if (self = [super initWithDictionary:dict]) { NSEnumerator *enumerator = [store keyEnumerator]; while (messageType = [enumerator nextObject]) { diff --git a/SmartDeviceLink/SDLRPCNotification.h b/SmartDeviceLink/SDLRPCNotification.h index 05f182b9b..06f5ac52f 100644 --- a/SmartDeviceLink/SDLRPCNotification.h +++ b/SmartDeviceLink/SDLRPCNotification.h @@ -4,10 +4,6 @@ #import "SDLRPCMessage.h" -@interface SDLRPCNotification : SDLRPCMessage { -} - -- (instancetype)initWithName:(NSString *)name; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLRPCNotification : SDLRPCMessage @end diff --git a/SmartDeviceLink/SDLRPCNotification.m b/SmartDeviceLink/SDLRPCNotification.m index 5c2a063dd..e91348707 100644 --- a/SmartDeviceLink/SDLRPCNotification.m +++ b/SmartDeviceLink/SDLRPCNotification.m @@ -20,7 +20,7 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { +- (instancetype)initWithDictionary:(NSDictionary *)dict { self = [super initWithDictionary:dict]; if (!self) { return nil; diff --git a/SmartDeviceLink/SDLRPCPayload.m b/SmartDeviceLink/SDLRPCPayload.m index 2d47b6d1f..90c09175b 100644 --- a/SmartDeviceLink/SDLRPCPayload.m +++ b/SmartDeviceLink/SDLRPCPayload.m @@ -10,12 +10,6 @@ const NSUInteger RPC_HEADER_SIZE = 12; @implementation SDLRPCPayload -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - - (instancetype)initWithData:(NSData *)data { unsigned long dataLength = data.length; diff --git a/SmartDeviceLink/SDLRPCRequest.h b/SmartDeviceLink/SDLRPCRequest.h index e637eb4bc..cbac10ab8 100644 --- a/SmartDeviceLink/SDLRPCRequest.h +++ b/SmartDeviceLink/SDLRPCRequest.h @@ -4,8 +4,7 @@ #import "SDLRPCMessage.h" -@interface SDLRPCRequest : SDLRPCMessage { -} +@interface SDLRPCRequest : SDLRPCMessage @property (strong) NSNumber *correlationID; diff --git a/SmartDeviceLink/SDLRPCResponse.h b/SmartDeviceLink/SDLRPCResponse.h index 57bd500f4..2f85db9ab 100644 --- a/SmartDeviceLink/SDLRPCResponse.h +++ b/SmartDeviceLink/SDLRPCResponse.h @@ -6,8 +6,7 @@ @class SDLResult; -@interface SDLRPCResponse : SDLRPCMessage { -} +@interface SDLRPCResponse : SDLRPCMessage @property (strong) NSNumber *correlationID; @property (strong) NSNumber *success; diff --git a/SmartDeviceLink/SDLRPCStruct.h b/SmartDeviceLink/SDLRPCStruct.h index e6b3bcccb..6ff942bd0 100644 --- a/SmartDeviceLink/SDLRPCStruct.h +++ b/SmartDeviceLink/SDLRPCStruct.h @@ -8,9 +8,9 @@ NSMutableDictionary *store; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +- (instancetype)initWithDictionary:(NSDictionary *)dict; - (instancetype)init; -- (NSMutableDictionary *)serializeAsDictionary:(Byte)version; +- (NSDictionary *)serializeAsDictionary:(Byte)version; @end diff --git a/SmartDeviceLink/SDLRPCStruct.m b/SmartDeviceLink/SDLRPCStruct.m index dd96fff5d..e7347979a 100644 --- a/SmartDeviceLink/SDLRPCStruct.m +++ b/SmartDeviceLink/SDLRPCStruct.m @@ -10,12 +10,12 @@ @implementation SDLRPCStruct -- (id)initWithDictionary:(NSMutableDictionary *)dict { +- (id)initWithDictionary:(NSDictionary *)dict { if (self = [super init]) { if (dict != nil) { - store = dict; + store = [dict mutableCopy]; } else { - store = [[NSMutableDictionary alloc] init]; + store = [NSMutableDictionary dictionary]; } } return self; @@ -23,22 +23,45 @@ - (id)init { if (self = [super init]) { - store = [[NSMutableDictionary alloc] init]; + store = [NSMutableDictionary dictionary]; } return self; } -- (NSMutableDictionary *)serializeDictionary:(NSDictionary *)dict version:(Byte)version { +- (NSDictionary *)serializeAsDictionary:(Byte)version { + if (version >= 2) { + NSString *messageType = [[store keyEnumerator] nextObject]; + NSMutableDictionary *function = [store objectForKey:messageType]; + if ([function isKindOfClass:NSMutableDictionary.class]) { + NSMutableDictionary *parameters = [function objectForKey:NAMES_parameters]; + return [self sdl_serializeDictionary:parameters version:version]; + } else { + return [self sdl_serializeDictionary:store version:version]; + } + } else { + return [self sdl_serializeDictionary:store version:version]; + } +} + +- (NSString *)description { + return [store description]; +} + +- (void)dealloc { + store = nil; +} + +- (NSDictionary *)sdl_serializeDictionary:(NSDictionary *)dict version:(Byte)version { NSMutableDictionary *ret = [NSMutableDictionary dictionaryWithCapacity:dict.count]; for (NSString *key in [dict keyEnumerator]) { NSObject *value = [dict objectForKey:key]; if ([value isKindOfClass:SDLRPCStruct.class]) { [ret setObject:[(SDLRPCStruct *)value serializeAsDictionary:version] forKey:key]; } else if ([value isKindOfClass:NSDictionary.class]) { - [ret setObject:[self serializeDictionary:(NSDictionary *)value version:version] forKey:key]; + [ret setObject:[self sdl_serializeDictionary:(NSDictionary *)value version:version] forKey:key]; } else if ([value isKindOfClass:NSArray.class]) { NSArray *arrayVal = (NSArray *)value; - + if (arrayVal.count > 0 && ([[arrayVal objectAtIndex:0] isKindOfClass:SDLRPCStruct.class])) { NSMutableArray *serializedList = [NSMutableArray arrayWithCapacity:arrayVal.count]; for (SDLRPCStruct *serializeable in arrayVal) { @@ -63,27 +86,4 @@ return ret; } -- (NSMutableDictionary *)serializeAsDictionary:(Byte)version { - if (version >= 2) { - NSString *messageType = [[store keyEnumerator] nextObject]; - NSMutableDictionary *function = [store objectForKey:messageType]; - if ([function isKindOfClass:NSMutableDictionary.class]) { - NSMutableDictionary *parameters = [function objectForKey:NAMES_parameters]; - return [self serializeDictionary:parameters version:version]; - } else { - return [self serializeDictionary:store version:version]; - } - } else { - return [self serializeDictionary:store version:version]; - } -} - -- (NSString *)description { - return [store description]; -} - -- (void)dealloc { - store = nil; -} - @end diff --git a/SmartDeviceLink/SDLReadDID.h b/SmartDeviceLink/SDLReadDID.h index 76df4a592..0da0c7dfb 100644 --- a/SmartDeviceLink/SDLReadDID.h +++ b/SmartDeviceLink/SDLReadDID.h @@ -16,19 +16,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLReadDID : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLReadDID object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLReadDID object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLReadDID : SDLRPCRequest /** * @abstract An ID of the vehicle module diff --git a/SmartDeviceLink/SDLReadDID.m b/SmartDeviceLink/SDLReadDID.m index 198d992e0..29fa002d6 100644 --- a/SmartDeviceLink/SDLReadDID.m +++ b/SmartDeviceLink/SDLReadDID.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setEcuName:(NSNumber *)ecuName { if (ecuName != nil) { [parameters setObject:ecuName forKey:NAMES_ecuName]; diff --git a/SmartDeviceLink/SDLReadDIDResponse.h b/SmartDeviceLink/SDLReadDIDResponse.h index da1c81573..4c1a1de81 100644 --- a/SmartDeviceLink/SDLReadDIDResponse.h +++ b/SmartDeviceLink/SDLReadDIDResponse.h @@ -9,11 +9,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLReadDIDResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLReadDIDResponse : SDLRPCResponse @property (strong) NSMutableArray *didResult; diff --git a/SmartDeviceLink/SDLReadDIDResponse.m b/SmartDeviceLink/SDLReadDIDResponse.m index 08c5477f6..3e7e9e2ed 100644 --- a/SmartDeviceLink/SDLReadDIDResponse.m +++ b/SmartDeviceLink/SDLReadDIDResponse.m @@ -15,12 +15,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setDidResult:(NSMutableArray *)didResult { if (didResult != nil) { [parameters setObject:didResult forKey:NAMES_didResult]; @@ -36,7 +30,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLDIDResult alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLDIDResult alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLRegisterAppInterface.h b/SmartDeviceLink/SDLRegisterAppInterface.h index 642edd3e3..b5b0c0926 100644 --- a/SmartDeviceLink/SDLRegisterAppInterface.h +++ b/SmartDeviceLink/SDLRegisterAppInterface.h @@ -79,20 +79,7 @@ * * @see SDLUnregisterAppInterface SDLOnAppInterfaceUnregistered */ -@interface SDLRegisterAppInterface : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLRegisterAppInterface object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLRegisterAppInterface object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLRegisterAppInterface : SDLRPCRequest /** * @abstract The version of the SDL interface diff --git a/SmartDeviceLink/SDLRegisterAppInterface.m b/SmartDeviceLink/SDLRegisterAppInterface.m index 36fac6627..820f3b766 100644 --- a/SmartDeviceLink/SDLRegisterAppInterface.m +++ b/SmartDeviceLink/SDLRegisterAppInterface.m @@ -21,12 +21,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setSyncMsgVersion:(SDLSyncMsgVersion *)syncMsgVersion { if (syncMsgVersion != nil) { [parameters setObject:syncMsgVersion forKey:NAMES_syncMsgVersion]; @@ -40,7 +34,7 @@ if (obj == nil || [obj isKindOfClass:SDLSyncMsgVersion.class]) { return (SDLSyncMsgVersion *)obj; } else { - return [[SDLSyncMsgVersion alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLSyncMsgVersion alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -71,7 +65,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -193,7 +187,7 @@ if (obj == nil || [obj isKindOfClass:SDLDeviceInfo.class]) { return (SDLDeviceInfo *)obj; } else { - return [[SDLDeviceInfo alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLDeviceInfo alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -222,7 +216,7 @@ if (obj == nil || [obj isKindOfClass:SDLAppInfo.class]) { return (SDLAppInfo *)obj; } else { - return [[SDLAppInfo alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLAppInfo alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h index 9bfc0a16a..2da59baf1 100644 --- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h +++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h @@ -17,20 +17,7 @@ * * Since SmartDeviceLink 1.0 */ -@interface SDLRegisterAppInterfaceResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLRegisterAppInterfaceResponse object - */ -- (instancetype)init; - -/** - * Constructs a new SDLRegisterAppInterfaceResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLRegisterAppInterfaceResponse : SDLRPCResponse /** * @see SDLSyncMsgVersion diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m index 18356c34f..b013e444f 100644 --- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m +++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m @@ -28,12 +28,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setSyncMsgVersion:(SDLSyncMsgVersion *)syncMsgVersion { if (syncMsgVersion != nil) { [parameters setObject:syncMsgVersion forKey:NAMES_syncMsgVersion]; @@ -47,7 +41,7 @@ if (obj == nil || [obj isKindOfClass:SDLSyncMsgVersion.class]) { return (SDLSyncMsgVersion *)obj; } else { - return [[SDLSyncMsgVersion alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLSyncMsgVersion alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -98,7 +92,7 @@ if (obj == nil || [obj isKindOfClass:SDLDisplayCapabilities.class]) { return (SDLDisplayCapabilities *)obj; } else { - return [[SDLDisplayCapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLDisplayCapabilities alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -117,7 +111,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLButtonCapabilities alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLButtonCapabilities alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -138,7 +132,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButtonCapabilities alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLSoftButtonCapabilities alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -157,7 +151,7 @@ if (obj == nil || [obj isKindOfClass:SDLPresetBankCapabilities.class]) { return (SDLPresetBankCapabilities *)obj; } else { - return [[SDLPresetBankCapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLPresetBankCapabilities alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -260,7 +254,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLAudioPassThruCapabilities alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLAudioPassThruCapabilities alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -279,7 +273,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleType.class]) { return (SDLVehicleType *)obj; } else { - return [[SDLVehicleType alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleType alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -308,7 +302,7 @@ if (obj == nil || [obj isKindOfClass:[SDLHMICapabilities class]]) { return (SDLHMICapabilities *)obj; } else { - return [[SDLHMICapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLHMICapabilities alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLResetGlobalProperties.h b/SmartDeviceLink/SDLResetGlobalProperties.h index f30b59a41..ec4e37f1b 100644 --- a/SmartDeviceLink/SDLResetGlobalProperties.h +++ b/SmartDeviceLink/SDLResetGlobalProperties.h @@ -20,19 +20,7 @@ * Since SmartDeviceLink 1.0 * See SetGlobalProperties */ -@interface SDLResetGlobalProperties : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLResetGlobalProperties object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLResetGlobalProperties object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLResetGlobalProperties : SDLRPCRequest /** * @abstract An array of one or more GlobalProperty enumeration elements diff --git a/SmartDeviceLink/SDLResetGlobalProperties.m b/SmartDeviceLink/SDLResetGlobalProperties.m index 350f96de0..e60e73612 100644 --- a/SmartDeviceLink/SDLResetGlobalProperties.m +++ b/SmartDeviceLink/SDLResetGlobalProperties.m @@ -15,12 +15,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setProperties:(NSMutableArray *)properties { if (properties != nil) { [parameters setObject:properties forKey:NAMES_properties]; diff --git a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.h b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.h index 5e576445a..eda1b2628 100644 --- a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.h +++ b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.h @@ -9,18 +9,6 @@ * * Since SmartDeviceLink 1.0 */ -@interface SDLResetGlobalPropertiesResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLResetGlobalPropertiesResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLResetGlobalPropertiesResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLResetGlobalPropertiesResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m index e43b61a40..37e25d4d4 100644 --- a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m +++ b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLScreenParams.h b/SmartDeviceLink/SDLScreenParams.h index c60f6f1d6..6236181cf 100644 --- a/SmartDeviceLink/SDLScreenParams.h +++ b/SmartDeviceLink/SDLScreenParams.h @@ -7,11 +7,7 @@ @class SDLTouchEventCapabilities; -@interface SDLScreenParams : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLScreenParams : SDLRPCStruct @property (strong) SDLImageResolution *resolution; @property (strong) SDLTouchEventCapabilities *touchEventAvailable; diff --git a/SmartDeviceLink/SDLScreenParams.m b/SmartDeviceLink/SDLScreenParams.m index 1debff302..d00063cbb 100644 --- a/SmartDeviceLink/SDLScreenParams.m +++ b/SmartDeviceLink/SDLScreenParams.m @@ -10,18 +10,6 @@ @implementation SDLScreenParams -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setResolution:(SDLImageResolution *)resolution { if (resolution != nil) { [store setObject:resolution forKey:NAMES_resolution]; @@ -35,7 +23,7 @@ if (obj == nil || [obj isKindOfClass:SDLImageResolution.class]) { return (SDLImageResolution *)obj; } else { - return [[SDLImageResolution alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImageResolution alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -52,7 +40,7 @@ if (obj == nil || [obj isKindOfClass:SDLTouchEventCapabilities.class]) { return (SDLTouchEventCapabilities *)obj; } else { - return [[SDLTouchEventCapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLTouchEventCapabilities alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLScrollableMessage.h b/SmartDeviceLink/SDLScrollableMessage.h index 27e894221..e64332890 100644 --- a/SmartDeviceLink/SDLScrollableMessage.h +++ b/SmartDeviceLink/SDLScrollableMessage.h @@ -13,19 +13,7 @@ * <b>HMILevel needs to be FULL</b> * <p> */ -@interface SDLScrollableMessage : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLScrollableMessage object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLScrollableMessage object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLScrollableMessage : SDLRPCRequest /** * @abstract A Body of text that can include newlines and tabs diff --git a/SmartDeviceLink/SDLScrollableMessage.m b/SmartDeviceLink/SDLScrollableMessage.m index 5995e7874..a0c8d67c7 100644 --- a/SmartDeviceLink/SDLScrollableMessage.m +++ b/SmartDeviceLink/SDLScrollableMessage.m @@ -15,12 +15,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setScrollableMessageBody:(NSString *)scrollableMessageBody { if (scrollableMessageBody != nil) { [parameters setObject:scrollableMessageBody forKey:NAMES_scrollableMessageBody]; @@ -60,7 +54,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLScrollableMessageResponse.h b/SmartDeviceLink/SDLScrollableMessageResponse.h index e75b157ec..516415468 100644 --- a/SmartDeviceLink/SDLScrollableMessageResponse.h +++ b/SmartDeviceLink/SDLScrollableMessageResponse.h @@ -9,18 +9,6 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLScrollableMessageResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLScrollableMessageResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLScrollableMessageResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLScrollableMessageResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLScrollableMessageResponse.m b/SmartDeviceLink/SDLScrollableMessageResponse.m index 77473f07e..59f8d682a 100644 --- a/SmartDeviceLink/SDLScrollableMessageResponse.m +++ b/SmartDeviceLink/SDLScrollableMessageResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLSendLocation.h b/SmartDeviceLink/SDLSendLocation.h index cec60c422..235caec28 100644 --- a/SmartDeviceLink/SDLSendLocation.h +++ b/SmartDeviceLink/SDLSendLocation.h @@ -10,9 +10,6 @@ @interface SDLSendLocation : SDLRPCRequest -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - /** * The longitudinal coordinate of the location. * diff --git a/SmartDeviceLink/SDLSendLocation.m b/SmartDeviceLink/SDLSendLocation.m index 7bf1c5c70..e8b3e4a8b 100644 --- a/SmartDeviceLink/SDLSendLocation.m +++ b/SmartDeviceLink/SDLSendLocation.m @@ -18,15 +18,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - self = [super initWithDictionary:dict]; - if (!self) { - return nil; - } - - return self; -} - - (void)setLongitudeDegrees:(NSNumber *)longitudeDegrees { if (longitudeDegrees != nil) { parameters[NAMES_longitudeDegrees] = longitudeDegrees; diff --git a/SmartDeviceLink/SDLSendLocationResponse.h b/SmartDeviceLink/SDLSendLocationResponse.h index 39d8a4ba2..35fc2eca1 100644 --- a/SmartDeviceLink/SDLSendLocationResponse.h +++ b/SmartDeviceLink/SDLSendLocationResponse.h @@ -6,7 +6,4 @@ @interface SDLSendLocationResponse : SDLRPCResponse -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - @end diff --git a/SmartDeviceLink/SDLSendLocationResponse.m b/SmartDeviceLink/SDLSendLocationResponse.m index 83cde8118..c85c75518 100644 --- a/SmartDeviceLink/SDLSendLocationResponse.m +++ b/SmartDeviceLink/SDLSendLocationResponse.m @@ -18,13 +18,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - self = [super initWithDictionary:dict]; - if (!self) { - return nil; - } - - return self; -} - @end diff --git a/SmartDeviceLink/SDLSetAppIcon.h b/SmartDeviceLink/SDLSetAppIcon.h index eee61deb5..10a10abec 100644 --- a/SmartDeviceLink/SDLSetAppIcon.h +++ b/SmartDeviceLink/SDLSetAppIcon.h @@ -11,18 +11,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLSetAppIcon : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLSetAppIcon object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSetAppIcon object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSetAppIcon : SDLRPCRequest /** * @abstract A file reference name diff --git a/SmartDeviceLink/SDLSetAppIcon.m b/SmartDeviceLink/SDLSetAppIcon.m index 717eeb023..c41354d74 100644 --- a/SmartDeviceLink/SDLSetAppIcon.m +++ b/SmartDeviceLink/SDLSetAppIcon.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setSyncFileName:(NSString *)syncFileName { if (syncFileName != nil) { [parameters setObject:syncFileName forKey:NAMES_syncFileName]; diff --git a/SmartDeviceLink/SDLSetAppIconResponse.h b/SmartDeviceLink/SDLSetAppIconResponse.h index 31dd1e6c9..28c818782 100644 --- a/SmartDeviceLink/SDLSetAppIconResponse.h +++ b/SmartDeviceLink/SDLSetAppIconResponse.h @@ -7,10 +7,6 @@ /** SDLSetAppIconResponse is sent, when SDLSetAppIcon has been called. * Since<b>SmartDeviceLink 2.0</b> */ -@interface SDLSetAppIconResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSetAppIconResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLSetAppIconResponse.m b/SmartDeviceLink/SDLSetAppIconResponse.m index 64c10600f..81179a13a 100644 --- a/SmartDeviceLink/SDLSetAppIconResponse.m +++ b/SmartDeviceLink/SDLSetAppIconResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLSetDisplayLayout.h b/SmartDeviceLink/SDLSetDisplayLayout.h index 15226a821..74ef9837e 100644 --- a/SmartDeviceLink/SDLSetDisplayLayout.h +++ b/SmartDeviceLink/SDLSetDisplayLayout.h @@ -10,19 +10,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLSetDisplayLayout : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLSetDisplayLayout object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSetDisplayLayout object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSetDisplayLayout : SDLRPCRequest /** * @abstract A display layout. Predefined or dynamically created screen layout. diff --git a/SmartDeviceLink/SDLSetDisplayLayout.m b/SmartDeviceLink/SDLSetDisplayLayout.m index ed812f647..b043b2e07 100644 --- a/SmartDeviceLink/SDLSetDisplayLayout.m +++ b/SmartDeviceLink/SDLSetDisplayLayout.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setDisplayLayout:(NSString *)displayLayout { if (displayLayout != nil) { [parameters setObject:displayLayout forKey:NAMES_displayLayout]; diff --git a/SmartDeviceLink/SDLSetDisplayLayoutResponse.h b/SmartDeviceLink/SDLSetDisplayLayoutResponse.h index 7838ae0a6..2c64cba74 100644 --- a/SmartDeviceLink/SDLSetDisplayLayoutResponse.h +++ b/SmartDeviceLink/SDLSetDisplayLayoutResponse.h @@ -12,14 +12,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLSetDisplayLayoutResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLSetDisplayLayoutResponse object - */ -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSetDisplayLayoutResponse : SDLRPCResponse @property (strong) SDLDisplayCapabilities *displayCapabilities; @property (strong) NSMutableArray *buttonCapabilities; diff --git a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m index fde37062e..e5148b248 100644 --- a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m +++ b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m @@ -19,12 +19,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setDisplayCapabilities:(SDLDisplayCapabilities *)displayCapabilities { if (displayCapabilities != nil) { [parameters setObject:displayCapabilities forKey:NAMES_displayCapabilities]; @@ -38,7 +32,7 @@ if (obj == nil || [obj isKindOfClass:SDLDisplayCapabilities.class]) { return (SDLDisplayCapabilities *)obj; } else { - return [[SDLDisplayCapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLDisplayCapabilities alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -57,7 +51,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLButtonCapabilities alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLButtonCapabilities alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -78,7 +72,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButtonCapabilities alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLSoftButtonCapabilities alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -97,7 +91,7 @@ if (obj == nil || [obj isKindOfClass:SDLPresetBankCapabilities.class]) { return (SDLPresetBankCapabilities *)obj; } else { - return [[SDLPresetBankCapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLPresetBankCapabilities alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLSetGlobalProperties.h b/SmartDeviceLink/SDLSetGlobalProperties.h index 7ad36e8d5..ba15798a4 100644 --- a/SmartDeviceLink/SDLSetGlobalProperties.h +++ b/SmartDeviceLink/SDLSetGlobalProperties.h @@ -17,19 +17,7 @@ * Since SmartDeviceLink 1.0 * See SDLResetGlobalProperties */ -@interface SDLSetGlobalProperties : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLSetGlobalProperties object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSetGlobalProperties object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSetGlobalProperties : SDLRPCRequest /** * @abstract Sets a Vector<TTSChunk> for Help Prompt that Array of one or more diff --git a/SmartDeviceLink/SDLSetGlobalProperties.m b/SmartDeviceLink/SDLSetGlobalProperties.m index ba9749e3e..660cb88a8 100644 --- a/SmartDeviceLink/SDLSetGlobalProperties.m +++ b/SmartDeviceLink/SDLSetGlobalProperties.m @@ -19,12 +19,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setHelpPrompt:(NSMutableArray *)helpPrompt { if (helpPrompt != nil) { [parameters setObject:helpPrompt forKey:NAMES_helpPrompt]; @@ -40,7 +34,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -61,7 +55,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -94,7 +88,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLVRHelpItem alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLVRHelpItem alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -125,7 +119,7 @@ if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -142,7 +136,7 @@ if (obj == nil || [obj isKindOfClass:SDLKeyboardProperties.class]) { return (SDLKeyboardProperties *)obj; } else { - return [[SDLKeyboardProperties alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLKeyboardProperties alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.h b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.h index 131700137..a5dd82139 100644 --- a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.h +++ b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.h @@ -9,18 +9,6 @@ * * Since SmartDeviceLink 1.0 */ -@interface SDLSetGlobalPropertiesResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLSetGlobalPropertiesResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSetGlobalPropertiesResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSetGlobalPropertiesResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m index ff4db22c8..d28ed814f 100644 --- a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m +++ b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLSetMediaClockTimer.h b/SmartDeviceLink/SDLSetMediaClockTimer.h index 71de56b35..d827d6273 100644 --- a/SmartDeviceLink/SDLSetMediaClockTimer.h +++ b/SmartDeviceLink/SDLSetMediaClockTimer.h @@ -17,19 +17,7 @@ * * Since SmartDeviceLink 1.0 */ -@interface SDLSetMediaClockTimer : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLSetMediaClockTimer object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSetMediaClockTimer object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSetMediaClockTimer : SDLRPCRequest /** * @abstract A Start Time with specifying hour, minute, second values diff --git a/SmartDeviceLink/SDLSetMediaClockTimer.m b/SmartDeviceLink/SDLSetMediaClockTimer.m index 325d0e347..1b81a7be5 100644 --- a/SmartDeviceLink/SDLSetMediaClockTimer.m +++ b/SmartDeviceLink/SDLSetMediaClockTimer.m @@ -17,12 +17,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setStartTime:(SDLStartTime *)startTime { if (startTime != nil) { [parameters setObject:startTime forKey:NAMES_startTime]; @@ -36,7 +30,7 @@ if (obj == nil || [obj isKindOfClass:SDLStartTime.class]) { return (SDLStartTime *)obj; } else { - return [[SDLStartTime alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLStartTime alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -53,7 +47,7 @@ if (obj == nil || [obj isKindOfClass:SDLStartTime.class]) { return (SDLStartTime *)obj; } else { - return [[SDLStartTime alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLStartTime alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLSetMediaClockTimerResponse.h b/SmartDeviceLink/SDLSetMediaClockTimerResponse.h index ffa6a77ae..d1adbda4d 100644 --- a/SmartDeviceLink/SDLSetMediaClockTimerResponse.h +++ b/SmartDeviceLink/SDLSetMediaClockTimerResponse.h @@ -9,20 +9,6 @@ * * Since SmartDeviceLink 1.0 */ -@interface SDLSetMediaClockTimerResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLSetMediaClockTimerResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSetMediaClockTimerResponse object indicated by the NSMutableDictionary - * parameter - * <p> - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSetMediaClockTimerResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLSetMediaClockTimerResponse.m b/SmartDeviceLink/SDLSetMediaClockTimerResponse.m index 098522fbd..bbd8ddada 100644 --- a/SmartDeviceLink/SDLSetMediaClockTimerResponse.m +++ b/SmartDeviceLink/SDLSetMediaClockTimerResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLShow.h b/SmartDeviceLink/SDLShow.h index 20cf84a92..ef16e6eb3 100644 --- a/SmartDeviceLink/SDLShow.h +++ b/SmartDeviceLink/SDLShow.h @@ -29,18 +29,7 @@ * Since SmartDeviceLink 1.0 * See SDLAlert SDLSetMediaClockTimer */ -@interface SDLShow : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLShow object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLShow object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLShow : SDLRPCRequest /** * @abstract The text displayed in a single-line display, or in the upper display diff --git a/SmartDeviceLink/SDLShow.m b/SmartDeviceLink/SDLShow.m index 933167159..cd0518706 100644 --- a/SmartDeviceLink/SDLShow.m +++ b/SmartDeviceLink/SDLShow.m @@ -18,12 +18,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setMainField1:(NSString *)mainField1 { if (mainField1 != nil) { [parameters setObject:mainField1 forKey:NAMES_mainField1]; @@ -138,7 +132,7 @@ if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -155,7 +149,7 @@ if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -174,7 +168,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLShowConstantTBT.h b/SmartDeviceLink/SDLShowConstantTBT.h index ae5dda108..28dfe3adf 100644 --- a/SmartDeviceLink/SDLShowConstantTBT.h +++ b/SmartDeviceLink/SDLShowConstantTBT.h @@ -12,11 +12,7 @@ *<p> * @since SmartDeviceLink 2.0 */ -@interface SDLShowConstantTBT : SDLRPCRequest { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLShowConstantTBT : SDLRPCRequest @property (strong) NSString *navigationText1; @property (strong) NSString *navigationText2; diff --git a/SmartDeviceLink/SDLShowConstantTBT.m b/SmartDeviceLink/SDLShowConstantTBT.m index c3f87f071..4c8dc44f4 100644 --- a/SmartDeviceLink/SDLShowConstantTBT.m +++ b/SmartDeviceLink/SDLShowConstantTBT.m @@ -17,12 +17,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setNavigationText1:(NSString *)navigationText1 { if (navigationText1 != nil) { [parameters setObject:navigationText1 forKey:NAMES_navigationText1]; @@ -96,7 +90,7 @@ if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -113,7 +107,7 @@ if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -168,7 +162,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLShowConstantTBTResponse.h b/SmartDeviceLink/SDLShowConstantTBTResponse.h index 8396f17a1..8af3a9f23 100644 --- a/SmartDeviceLink/SDLShowConstantTBTResponse.h +++ b/SmartDeviceLink/SDLShowConstantTBTResponse.h @@ -7,10 +7,6 @@ /** SDLShowConstantTBTResponse is sent, when SDLShowConstantTBT has been called. * Since<b>SmartDeviceLink 2.0</b> */ -@interface SDLShowConstantTBTResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLShowConstantTBTResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLShowConstantTBTResponse.m b/SmartDeviceLink/SDLShowConstantTBTResponse.m index 995b16e1c..c085697c7 100644 --- a/SmartDeviceLink/SDLShowConstantTBTResponse.m +++ b/SmartDeviceLink/SDLShowConstantTBTResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLShowResponse.h b/SmartDeviceLink/SDLShowResponse.h index b0d558633..1963390ec 100644 --- a/SmartDeviceLink/SDLShowResponse.h +++ b/SmartDeviceLink/SDLShowResponse.h @@ -9,18 +9,6 @@ * * Since SmartDeviceLink 1.0 */ -@interface SDLShowResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLShowResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLShowResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLShowResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLShowResponse.m b/SmartDeviceLink/SDLShowResponse.m index 1ebb5dea9..dc2c8daa3 100644 --- a/SmartDeviceLink/SDLShowResponse.m +++ b/SmartDeviceLink/SDLShowResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLSingleTireStatus.h b/SmartDeviceLink/SDLSingleTireStatus.h index 897ba1bf8..262d90d81 100644 --- a/SmartDeviceLink/SDLSingleTireStatus.h +++ b/SmartDeviceLink/SDLSingleTireStatus.h @@ -11,19 +11,7 @@ * * @since SmartDeviceLink 2.0 */ -@interface SDLSingleTireStatus : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLSingleTireStatus object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLSingleTireStatus object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSingleTireStatus : SDLRPCStruct /** * @abstract The volume status of a single tire diff --git a/SmartDeviceLink/SDLSingleTireStatus.m b/SmartDeviceLink/SDLSingleTireStatus.m index 87826f32b..05380cd69 100644 --- a/SmartDeviceLink/SDLSingleTireStatus.m +++ b/SmartDeviceLink/SDLSingleTireStatus.m @@ -9,18 +9,6 @@ @implementation SDLSingleTireStatus -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setStatus:(SDLComponentVolumeStatus *)status { if (status != nil) { [store setObject:status forKey:NAMES_status]; diff --git a/SmartDeviceLink/SDLSlider.h b/SmartDeviceLink/SDLSlider.h index 04724d780..a4ffbeb13 100644 --- a/SmartDeviceLink/SDLSlider.h +++ b/SmartDeviceLink/SDLSlider.h @@ -11,19 +11,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLSlider : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLSlider object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLSlider object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSlider : SDLRPCRequest /** * @abstract Represents a number of selectable items on a horizontal axis diff --git a/SmartDeviceLink/SDLSlider.m b/SmartDeviceLink/SDLSlider.m index 80a56d1aa..29d25fb27 100644 --- a/SmartDeviceLink/SDLSlider.m +++ b/SmartDeviceLink/SDLSlider.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setNumTicks:(NSNumber *)numTicks { if (numTicks != nil) { [parameters setObject:numTicks forKey:NAMES_numTicks]; diff --git a/SmartDeviceLink/SDLSliderResponse.h b/SmartDeviceLink/SDLSliderResponse.h index 5b38b7f0f..74baba292 100644 --- a/SmartDeviceLink/SDLSliderResponse.h +++ b/SmartDeviceLink/SDLSliderResponse.h @@ -9,19 +9,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLSliderResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLSliderResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSliderResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSliderResponse : SDLRPCResponse /** * @abstract The selected position of the slider. diff --git a/SmartDeviceLink/SDLSliderResponse.m b/SmartDeviceLink/SDLSliderResponse.m index 927ad569d..8e5802339 100644 --- a/SmartDeviceLink/SDLSliderResponse.m +++ b/SmartDeviceLink/SDLSliderResponse.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setSliderPosition:(NSNumber *)sliderPosition { if (sliderPosition != nil) { [parameters setObject:sliderPosition forKey:NAMES_sliderPosition]; diff --git a/SmartDeviceLink/SDLSoftButton.h b/SmartDeviceLink/SDLSoftButton.h index aeefc8a9c..0000e3282 100644 --- a/SmartDeviceLink/SDLSoftButton.h +++ b/SmartDeviceLink/SDLSoftButton.h @@ -11,12 +11,9 @@ @class SDLSystemAction; -@interface SDLSoftButton : SDLRPCStruct <SDLRequestHandler> { -} +@interface SDLSoftButton : SDLRPCStruct <SDLRequestHandler> -- (instancetype)init; - (instancetype)initWithHandler:(SDLRPCNotificationHandler)handler; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; @property (copy, nonatomic) SDLRPCNotificationHandler handler; diff --git a/SmartDeviceLink/SDLSoftButton.m b/SmartDeviceLink/SDLSoftButton.m index 201144f20..25b5ae0cc 100644 --- a/SmartDeviceLink/SDLSoftButton.m +++ b/SmartDeviceLink/SDLSoftButton.m @@ -11,12 +11,6 @@ @implementation SDLSoftButton -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - - (instancetype)initWithHandler:(SDLRPCNotificationHandler)handler { self = [self init]; if (!self) { @@ -28,12 +22,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setType:(SDLSoftButtonType *)type { if (type != nil) { [store setObject:type forKey:NAMES_type]; @@ -76,7 +64,7 @@ if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLSoftButtonCapabilities.h b/SmartDeviceLink/SDLSoftButtonCapabilities.h index ca9eeb2bf..c699ba17e 100644 --- a/SmartDeviceLink/SDLSoftButtonCapabilities.h +++ b/SmartDeviceLink/SDLSoftButtonCapabilities.h @@ -9,19 +9,7 @@ * * @since SDL 2.0 */ -@interface SDLSoftButtonCapabilities : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLSoftButtonCapabilities object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLSoftButtonCapabilities object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSoftButtonCapabilities : SDLRPCStruct /** * @abstract The button supports a short press. diff --git a/SmartDeviceLink/SDLSoftButtonCapabilities.m b/SmartDeviceLink/SDLSoftButtonCapabilities.m index d9a502db1..a7bb225cc 100644 --- a/SmartDeviceLink/SDLSoftButtonCapabilities.m +++ b/SmartDeviceLink/SDLSoftButtonCapabilities.m @@ -8,18 +8,6 @@ @implementation SDLSoftButtonCapabilities -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setShortPressAvailable:(NSNumber *)shortPressAvailable { if (shortPressAvailable != nil) { [store setObject:shortPressAvailable forKey:NAMES_shortPressAvailable]; diff --git a/SmartDeviceLink/SDLSpeak.h b/SmartDeviceLink/SDLSpeak.h index 8e6eb8e7e..61c605357 100644 --- a/SmartDeviceLink/SDLSpeak.h +++ b/SmartDeviceLink/SDLSpeak.h @@ -36,19 +36,7 @@ * @since SmartDeviceLink 1.0 * @see SDLAlert */ -@interface SDLSpeak : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLSpeak object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLSpeak object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSpeak : SDLRPCRequest /** * @abstract An array of TTSChunk structs which, taken together, specify the phrase to be spoken diff --git a/SmartDeviceLink/SDLSpeak.m b/SmartDeviceLink/SDLSpeak.m index 8f19b925b..a39c523b3 100644 --- a/SmartDeviceLink/SDLSpeak.m +++ b/SmartDeviceLink/SDLSpeak.m @@ -15,12 +15,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setTtsChunks:(NSMutableArray *)ttsChunks { if (ttsChunks != nil) { [parameters setObject:ttsChunks forKey:NAMES_ttsChunks]; @@ -36,7 +30,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLSpeakResponse.h b/SmartDeviceLink/SDLSpeakResponse.h index 2a7eef046..c241e7d37 100644 --- a/SmartDeviceLink/SDLSpeakResponse.h +++ b/SmartDeviceLink/SDLSpeakResponse.h @@ -9,18 +9,6 @@ * * Since SmartDeviceLink 1.0 */ -@interface SDLSpeakResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLSpeakResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSpeakResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSpeakResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLSpeakResponse.m b/SmartDeviceLink/SDLSpeakResponse.m index dfb8dff33..6a3bf77e9 100644 --- a/SmartDeviceLink/SDLSpeakResponse.m +++ b/SmartDeviceLink/SDLSpeakResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLStartTime.h b/SmartDeviceLink/SDLStartTime.h index 55eb147d6..47c10674e 100644 --- a/SmartDeviceLink/SDLStartTime.h +++ b/SmartDeviceLink/SDLStartTime.h @@ -9,19 +9,7 @@ * * @since SDL 1.0 */ -@interface SDLStartTime : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLStartTime object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLStartTime object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLStartTime : SDLRPCStruct /** * @abstract The hour of the media clock diff --git a/SmartDeviceLink/SDLStartTime.m b/SmartDeviceLink/SDLStartTime.m index 4745bf712..bcd1ba04f 100644 --- a/SmartDeviceLink/SDLStartTime.m +++ b/SmartDeviceLink/SDLStartTime.m @@ -8,18 +8,6 @@ @implementation SDLStartTime -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setHours:(NSNumber *)hours { if (hours != nil) { [store setObject:hours forKey:NAMES_hours]; diff --git a/SmartDeviceLink/SDLSubscribeButton.h b/SmartDeviceLink/SDLSubscribeButton.h index 05c2acd23..0690b317e 100644 --- a/SmartDeviceLink/SDLSubscribeButton.h +++ b/SmartDeviceLink/SDLSubscribeButton.h @@ -62,13 +62,6 @@ @interface SDLSubscribeButton : SDLRPCRequest <SDLRequestHandler> /** - * Construct an SDLSubscribeButton - * - * @return An SDLSubscribeButton object - */ -- (instancetype)init; - -/** * Construct a SDLSubscribeButton with a handler callback when an event occurs. * * @param handler A callback that will be called when a button event occurs for the subscribed button. @@ -78,13 +71,6 @@ - (instancetype)initWithHandler:(SDLRPCNotificationHandler)handler; /** - * @abstract Constructs a new SDLSubscribeButton object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - -/** * A handler that will let you know when the button you subscribed to is selected. * * @warning This will only work if you use SDLManager. diff --git a/SmartDeviceLink/SDLSubscribeButton.m b/SmartDeviceLink/SDLSubscribeButton.m index ee0191943..2e3ba5cd7 100644 --- a/SmartDeviceLink/SDLSubscribeButton.m +++ b/SmartDeviceLink/SDLSubscribeButton.m @@ -27,12 +27,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setButtonName:(SDLButtonName *)buttonName { if (buttonName != nil) { [parameters setObject:buttonName forKey:NAMES_buttonName]; diff --git a/SmartDeviceLink/SDLSubscribeButtonResponse.h b/SmartDeviceLink/SDLSubscribeButtonResponse.h index b38eb5a27..bf9c22604 100644 --- a/SmartDeviceLink/SDLSubscribeButtonResponse.h +++ b/SmartDeviceLink/SDLSubscribeButtonResponse.h @@ -9,18 +9,6 @@ * * Since SmartDeviceLink 1.0 */ -@interface SDLSubscribeButtonResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLSubscribeButtonResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSubscribeButtonResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSubscribeButtonResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLSubscribeButtonResponse.m b/SmartDeviceLink/SDLSubscribeButtonResponse.m index a70d58ede..2264f543b 100644 --- a/SmartDeviceLink/SDLSubscribeButtonResponse.m +++ b/SmartDeviceLink/SDLSubscribeButtonResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.h b/SmartDeviceLink/SDLSubscribeVehicleData.h index e357cd484..0e978329c 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.h +++ b/SmartDeviceLink/SDLSubscribeVehicleData.h @@ -19,20 +19,7 @@ * Since SmartDeviceLink 2.0<br/> * See SDLUnsubscribeVehicleData SDLGetVehicleData */ -@interface SDLSubscribeVehicleData : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLSubscribeVehicleData object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLSubscribeVehicleData object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSubscribeVehicleData : SDLRPCRequest /** * @abstract A boolean value. If true, subscribes Gps data diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m index 55ec5e9d0..7c80cd5d8 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.m +++ b/SmartDeviceLink/SDLSubscribeVehicleData.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setGps:(NSNumber *)gps { if (gps != nil) { [parameters setObject:gps forKey:NAMES_gps]; diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h index 0b4f15ca7..ca7d9917f 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h @@ -11,21 +11,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLSubscribeVehicleDataResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLSubscribeVehicleDataResponse object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLSubscribeVehicleDataResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - +@interface SDLSubscribeVehicleDataResponse : SDLRPCResponse /** * @abstract A SDLVehicleDataResult* value. See GPSData. diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m index 5afa5f1be..ac3b9d6d9 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m @@ -16,12 +16,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setGps:(SDLVehicleDataResult *)gps { if (gps != nil) { [parameters setObject:gps forKey:NAMES_gps]; @@ -35,7 +29,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -52,7 +46,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -69,7 +63,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -86,7 +80,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -103,7 +97,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -120,7 +114,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -137,7 +131,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -154,7 +148,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -171,7 +165,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -188,7 +182,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -205,7 +199,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -222,7 +216,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -239,7 +233,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -256,7 +250,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -273,7 +267,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -290,7 +284,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -307,7 +301,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -324,7 +318,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -341,7 +335,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -358,7 +352,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -375,7 +369,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -392,7 +386,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -409,7 +403,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -426,7 +420,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLSyncMsgVersion.h b/SmartDeviceLink/SDLSyncMsgVersion.h index 98b573eec..92973daf7 100644 --- a/SmartDeviceLink/SDLSyncMsgVersion.h +++ b/SmartDeviceLink/SDLSyncMsgVersion.h @@ -9,19 +9,7 @@ * * @since SDL 1.0 */ -@interface SDLSyncMsgVersion : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLSyncMsgVersion object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLSyncMsgVersion object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSyncMsgVersion : SDLRPCStruct /** * @abstract The major version indicates versions that is not-compatible to previous versions diff --git a/SmartDeviceLink/SDLSyncMsgVersion.m b/SmartDeviceLink/SDLSyncMsgVersion.m index 2d516539e..bde6d47fe 100644 --- a/SmartDeviceLink/SDLSyncMsgVersion.m +++ b/SmartDeviceLink/SDLSyncMsgVersion.m @@ -8,18 +8,6 @@ @implementation SDLSyncMsgVersion -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setMajorVersion:(NSNumber *)majorVersion { if (majorVersion != nil) { [store setObject:majorVersion forKey:NAMES_majorVersion]; diff --git a/SmartDeviceLink/SDLSyncPData.h b/SmartDeviceLink/SDLSyncPData.h index e71ea600d..33b1b9ab9 100644 --- a/SmartDeviceLink/SDLSyncPData.h +++ b/SmartDeviceLink/SDLSyncPData.h @@ -4,10 +4,6 @@ #import "SDLRPCRequest.h" -@interface SDLSyncPData : SDLRPCRequest { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSyncPData : SDLRPCRequest @end diff --git a/SmartDeviceLink/SDLSyncPData.m b/SmartDeviceLink/SDLSyncPData.m index c8730a2f1..8bf4d3b03 100644 --- a/SmartDeviceLink/SDLSyncPData.m +++ b/SmartDeviceLink/SDLSyncPData.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLSyncPDataResponse.h b/SmartDeviceLink/SDLSyncPDataResponse.h index 25a12b74a..be1905ba1 100644 --- a/SmartDeviceLink/SDLSyncPDataResponse.h +++ b/SmartDeviceLink/SDLSyncPDataResponse.h @@ -4,10 +4,6 @@ #import "SDLRPCResponse.h" -@interface SDLSyncPDataResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSyncPDataResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLSyncPDataResponse.m b/SmartDeviceLink/SDLSyncPDataResponse.m index 00edf14b1..1be0e3c8f 100644 --- a/SmartDeviceLink/SDLSyncPDataResponse.m +++ b/SmartDeviceLink/SDLSyncPDataResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLSystemRequest.h b/SmartDeviceLink/SDLSystemRequest.h index 479b5d18e..f1bcd245d 100644 --- a/SmartDeviceLink/SDLSystemRequest.h +++ b/SmartDeviceLink/SDLSystemRequest.h @@ -11,11 +11,7 @@ * @since SmartDeviceLink 3.0 * */ -@interface SDLSystemRequest : SDLRPCRequest { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSystemRequest : SDLRPCRequest @property (strong) SDLRequestType *requestType; @property (strong) NSString *fileName; diff --git a/SmartDeviceLink/SDLSystemRequest.m b/SmartDeviceLink/SDLSystemRequest.m index 836b44447..97e26d942 100644 --- a/SmartDeviceLink/SDLSystemRequest.m +++ b/SmartDeviceLink/SDLSystemRequest.m @@ -16,12 +16,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setRequestType:(SDLRequestType *)requestType { if (requestType != nil) { [parameters setObject:requestType forKey:NAMES_requestType]; diff --git a/SmartDeviceLink/SDLSystemRequestResponse.h b/SmartDeviceLink/SDLSystemRequestResponse.h index 4c99d605f..805962d3c 100644 --- a/SmartDeviceLink/SDLSystemRequestResponse.h +++ b/SmartDeviceLink/SDLSystemRequestResponse.h @@ -7,10 +7,6 @@ /** SDLSystemRequestResponse is sent, when SDLSystemRequest has been called. * Since<b>SmartDeviceLink 3.0</b> */ -@interface SDLSystemRequestResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSystemRequestResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLSystemRequestResponse.m b/SmartDeviceLink/SDLSystemRequestResponse.m index ba563e561..3d1df353c 100644 --- a/SmartDeviceLink/SDLSystemRequestResponse.m +++ b/SmartDeviceLink/SDLSystemRequestResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLTTSChunk.h b/SmartDeviceLink/SDLTTSChunk.h index a304c3d99..ccb62ebc3 100644 --- a/SmartDeviceLink/SDLTTSChunk.h +++ b/SmartDeviceLink/SDLTTSChunk.h @@ -37,20 +37,7 @@ * * @since SmartDeviceLink 1.0 */ -@interface SDLTTSChunk : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLTTSChunk object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLTTSChunk object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLTTSChunk : SDLRPCStruct /** * @abstract Text to be spoken, or a phoneme specification, or the name of a pre-recorded sound. The contents of this field are indicated by the "type" field. diff --git a/SmartDeviceLink/SDLTTSChunk.m b/SmartDeviceLink/SDLTTSChunk.m index 7e45413eb..82d6a95ba 100644 --- a/SmartDeviceLink/SDLTTSChunk.m +++ b/SmartDeviceLink/SDLTTSChunk.m @@ -9,18 +9,6 @@ @implementation SDLTTSChunk -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setText:(NSString *)text { if (text != nil) { [store setObject:text forKey:NAMES_text]; diff --git a/SmartDeviceLink/SDLTextField.h b/SmartDeviceLink/SDLTextField.h index 7af898fe5..db9407475 100644 --- a/SmartDeviceLink/SDLTextField.h +++ b/SmartDeviceLink/SDLTextField.h @@ -56,20 +56,7 @@ * * @since SDL 1.0 */ -@interface SDLTextField : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLTextField object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLTextField object indicated by the dictionary parameter - * - * @param dict The dictionary to use to construct the object - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLTextField : SDLRPCStruct /** * @abstract The enumeration identifying the field. diff --git a/SmartDeviceLink/SDLTextField.m b/SmartDeviceLink/SDLTextField.m index 926d258f1..c0b178026 100644 --- a/SmartDeviceLink/SDLTextField.m +++ b/SmartDeviceLink/SDLTextField.m @@ -10,18 +10,6 @@ @implementation SDLTextField -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setName:(SDLTextFieldName *)name { if (name != nil) { [store setObject:name forKey:NAMES_name]; diff --git a/SmartDeviceLink/SDLTireStatus.h b/SmartDeviceLink/SDLTireStatus.h index 9ebd68d8e..4803ed9c8 100644 --- a/SmartDeviceLink/SDLTireStatus.h +++ b/SmartDeviceLink/SDLTireStatus.h @@ -7,11 +7,7 @@ @class SDLWarningLightStatus; -@interface SDLTireStatus : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLTireStatus : SDLRPCStruct @property (strong) SDLWarningLightStatus *pressureTelltale; @property (strong) SDLSingleTireStatus *leftFront; diff --git a/SmartDeviceLink/SDLTireStatus.m b/SmartDeviceLink/SDLTireStatus.m index c2768565a..aa5665529 100644 --- a/SmartDeviceLink/SDLTireStatus.m +++ b/SmartDeviceLink/SDLTireStatus.m @@ -10,18 +10,6 @@ @implementation SDLTireStatus -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setPressureTelltale:(SDLWarningLightStatus *)pressureTelltale { if (pressureTelltale != nil) { [store setObject:pressureTelltale forKey:NAMES_pressureTelltale]; @@ -52,7 +40,7 @@ if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { - return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -69,7 +57,7 @@ if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { - return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -86,7 +74,7 @@ if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { - return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -103,7 +91,7 @@ if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { - return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -120,7 +108,7 @@ if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { - return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -137,7 +125,7 @@ if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { - return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLTouchCoord.h b/SmartDeviceLink/SDLTouchCoord.h index 63515811f..f3dbda487 100644 --- a/SmartDeviceLink/SDLTouchCoord.h +++ b/SmartDeviceLink/SDLTouchCoord.h @@ -4,11 +4,7 @@ #import "SDLRPCMessage.h" -@interface SDLTouchCoord : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLTouchCoord : SDLRPCStruct @property (strong) NSNumber *x; @property (strong) NSNumber *y; diff --git a/SmartDeviceLink/SDLTouchCoord.m b/SmartDeviceLink/SDLTouchCoord.m index 78895696f..4b3fff14e 100644 --- a/SmartDeviceLink/SDLTouchCoord.m +++ b/SmartDeviceLink/SDLTouchCoord.m @@ -8,18 +8,6 @@ @implementation SDLTouchCoord -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setX:(NSNumber *)x { if (x != nil) { [store setObject:x forKey:NAMES_x]; diff --git a/SmartDeviceLink/SDLTouchEvent.h b/SmartDeviceLink/SDLTouchEvent.h index 01af99b98..05e7953be 100644 --- a/SmartDeviceLink/SDLTouchEvent.h +++ b/SmartDeviceLink/SDLTouchEvent.h @@ -4,11 +4,7 @@ #import "SDLRPCMessage.h" -@interface SDLTouchEvent : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLTouchEvent : SDLRPCStruct /** A touch's unique identifier. The application can track the current touch events by id. diff --git a/SmartDeviceLink/SDLTouchEvent.m b/SmartDeviceLink/SDLTouchEvent.m index e54e8b79e..4f3b97176 100644 --- a/SmartDeviceLink/SDLTouchEvent.m +++ b/SmartDeviceLink/SDLTouchEvent.m @@ -9,18 +9,6 @@ @implementation SDLTouchEvent -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setTouchEventId:(NSNumber *)touchEventId { if (touchEventId != nil) { [store setObject:touchEventId forKey:NAMES_id]; @@ -60,7 +48,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTouchCoord alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTouchCoord alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLTouchEventCapabilities.h b/SmartDeviceLink/SDLTouchEventCapabilities.h index 6d346d874..e8aadf97f 100644 --- a/SmartDeviceLink/SDLTouchEventCapabilities.h +++ b/SmartDeviceLink/SDLTouchEventCapabilities.h @@ -4,11 +4,7 @@ #import "SDLRPCMessage.h" -@interface SDLTouchEventCapabilities : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLTouchEventCapabilities : SDLRPCStruct @property (strong) NSNumber *pressAvailable; @property (strong) NSNumber *multiTouchAvailable; diff --git a/SmartDeviceLink/SDLTouchEventCapabilities.m b/SmartDeviceLink/SDLTouchEventCapabilities.m index 4fc71cfec..acbc88c63 100644 --- a/SmartDeviceLink/SDLTouchEventCapabilities.m +++ b/SmartDeviceLink/SDLTouchEventCapabilities.m @@ -8,18 +8,6 @@ @implementation SDLTouchEventCapabilities -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setPressAvailable:(NSNumber *)pressAvailable { if (pressAvailable != nil) { [store setObject:pressAvailable forKey:NAMES_pressAvailable]; diff --git a/SmartDeviceLink/SDLTurn.h b/SmartDeviceLink/SDLTurn.h index ef2cf9ebe..ddd43b04f 100644 --- a/SmartDeviceLink/SDLTurn.h +++ b/SmartDeviceLink/SDLTurn.h @@ -6,11 +6,7 @@ @class SDLImage; -@interface SDLTurn : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLTurn : SDLRPCStruct @property (strong) NSString *navigationText; @property (strong) SDLImage *turnIcon; diff --git a/SmartDeviceLink/SDLTurn.m b/SmartDeviceLink/SDLTurn.m index 875fa2e73..a91ab68fd 100644 --- a/SmartDeviceLink/SDLTurn.m +++ b/SmartDeviceLink/SDLTurn.m @@ -9,18 +9,6 @@ @implementation SDLTurn -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setNavigationText:(NSString *)navigationText { if (navigationText != nil) { [store setObject:navigationText forKey:NAMES_navigationText]; @@ -46,7 +34,7 @@ if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLUnregisterAppInterface.h b/SmartDeviceLink/SDLUnregisterAppInterface.h index d35d40193..21c006127 100644 --- a/SmartDeviceLink/SDLUnregisterAppInterface.h +++ b/SmartDeviceLink/SDLUnregisterAppInterface.h @@ -19,18 +19,6 @@ * * See SDLRegisterAppInterface SDLOnAppInterfaceUnregistered */ -@interface SDLUnregisterAppInterface : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLUnregisterAppInterface object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLUnregisterAppInterface object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLUnregisterAppInterface : SDLRPCRequest @end diff --git a/SmartDeviceLink/SDLUnregisterAppInterface.m b/SmartDeviceLink/SDLUnregisterAppInterface.m index 88039631d..363796983 100644 --- a/SmartDeviceLink/SDLUnregisterAppInterface.m +++ b/SmartDeviceLink/SDLUnregisterAppInterface.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.h b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.h index 8ebbb46af..1c6420f8e 100644 --- a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.h +++ b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.h @@ -9,18 +9,6 @@ * * @since SmartDeviceLink 1.0 */ -@interface SDLUnregisterAppInterfaceResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLUnregisterAppInterfaceResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLUnregisterAppInterfaceResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLUnregisterAppInterfaceResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m index 6bebbe83d..5e8ef6e4a 100644 --- a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m +++ b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLUnsubscribeButton.h b/SmartDeviceLink/SDLUnsubscribeButton.h index bb16f43f5..297879415 100644 --- a/SmartDeviceLink/SDLUnsubscribeButton.h +++ b/SmartDeviceLink/SDLUnsubscribeButton.h @@ -19,19 +19,7 @@ * @since SmartDeviceLink 1.0<br/> * See SDLSubscribeButton */ -@interface SDLUnsubscribeButton : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLUnsubscribeButton object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLUnsubscribeButton object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLUnsubscribeButton : SDLRPCRequest /** * @abstract A name of the button to unsubscribe from diff --git a/SmartDeviceLink/SDLUnsubscribeButton.m b/SmartDeviceLink/SDLUnsubscribeButton.m index 9853fa9da..e81d1c8e5 100644 --- a/SmartDeviceLink/SDLUnsubscribeButton.m +++ b/SmartDeviceLink/SDLUnsubscribeButton.m @@ -16,12 +16,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setButtonName:(SDLButtonName *)buttonName { if (buttonName != nil) { [parameters setObject:buttonName forKey:NAMES_buttonName]; diff --git a/SmartDeviceLink/SDLUnsubscribeButtonResponse.h b/SmartDeviceLink/SDLUnsubscribeButtonResponse.h index 62011539f..8dc43fad7 100644 --- a/SmartDeviceLink/SDLUnsubscribeButtonResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeButtonResponse.h @@ -9,18 +9,6 @@ * * @since SmartDeviceLink 1.0 */ -@interface SDLUnsubscribeButtonResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLUnsubscribeButtonResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLUnsubscribeButtonResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLUnsubscribeButtonResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLUnsubscribeButtonResponse.m b/SmartDeviceLink/SDLUnsubscribeButtonResponse.m index a28cf2768..70285c507 100644 --- a/SmartDeviceLink/SDLUnsubscribeButtonResponse.m +++ b/SmartDeviceLink/SDLUnsubscribeButtonResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.h b/SmartDeviceLink/SDLUnsubscribeVehicleData.h index 389173256..2b6d2ee8b 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.h @@ -16,20 +16,7 @@ * @since SmartDeviceLink 2.0<br/> * See SDLSubscribeVehicleData SDLGetVehicleData */ -@interface SDLUnsubscribeVehicleData : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLUnsubscribeVehicleData object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLUnsubscribeVehicleData object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLUnsubscribeVehicleData : SDLRPCRequest /** * @abstract A boolean value. If true, unsubscribes Gps data diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m index 11aa044e1..91484fc7e 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m @@ -14,12 +14,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setGps:(NSNumber *)gps { if (gps != nil) { [parameters setObject:gps forKey:NAMES_gps]; diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h index beb1b93e2..eecce7b75 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h @@ -11,20 +11,7 @@ * * @since SmartDeviceLink 2.0 */ -@interface SDLUnsubscribeVehicleDataResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLUnsubscribeVehicleDataResponse object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLUnsubscribeVehicleDataResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLUnsubscribeVehicleDataResponse : SDLRPCResponse /** * @abstract A SDLVehicleDataResult* value. See GPSData. diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m index ec4916447..667c3c373 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m @@ -16,12 +16,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setGps:(SDLVehicleDataResult *)gps { if (gps != nil) { [parameters setObject:gps forKey:NAMES_gps]; @@ -35,7 +29,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -52,7 +46,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -69,7 +63,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -86,7 +80,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -103,7 +97,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -120,7 +114,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -137,7 +131,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -154,7 +148,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -171,7 +165,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -188,7 +182,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -205,7 +199,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -222,7 +216,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -239,7 +233,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -256,7 +250,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -273,7 +267,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -290,7 +284,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -307,7 +301,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -324,7 +318,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -341,7 +335,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -358,7 +352,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -375,7 +369,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -392,7 +386,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -409,7 +403,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } @@ -426,7 +420,7 @@ if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLUpdateTurnList.h b/SmartDeviceLink/SDLUpdateTurnList.h index d5d9daf6a..a0038e019 100644 --- a/SmartDeviceLink/SDLUpdateTurnList.h +++ b/SmartDeviceLink/SDLUpdateTurnList.h @@ -9,11 +9,7 @@ *<p> * @since SmartDeviceLink 2.0 */ -@interface SDLUpdateTurnList : SDLRPCRequest { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLUpdateTurnList : SDLRPCRequest /** * Optional, SDLTurn, 1 - 100 entries diff --git a/SmartDeviceLink/SDLUpdateTurnList.m b/SmartDeviceLink/SDLUpdateTurnList.m index 7063c9c29..4e1ba9964 100644 --- a/SmartDeviceLink/SDLUpdateTurnList.m +++ b/SmartDeviceLink/SDLUpdateTurnList.m @@ -16,12 +16,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setTurnList:(NSMutableArray *)turnList { if (turnList != nil) { [parameters setObject:turnList forKey:NAMES_turnList]; @@ -37,7 +31,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTurn alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTurn alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -58,7 +52,7 @@ } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLUpdateTurnListResponse.h b/SmartDeviceLink/SDLUpdateTurnListResponse.h index c02c912e9..ab2d87231 100644 --- a/SmartDeviceLink/SDLUpdateTurnListResponse.h +++ b/SmartDeviceLink/SDLUpdateTurnListResponse.h @@ -7,10 +7,6 @@ /** SDLUpdateTurnListResponse is sent, when SDLUpdateTurnList has been called. * Since<b>SmartDeviceLink 2.0</b> */ -@interface SDLUpdateTurnListResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLUpdateTurnListResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLUpdateTurnListResponse.m b/SmartDeviceLink/SDLUpdateTurnListResponse.m index 18e04082b..744a89fa6 100644 --- a/SmartDeviceLink/SDLUpdateTurnListResponse.m +++ b/SmartDeviceLink/SDLUpdateTurnListResponse.m @@ -14,10 +14,4 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - @end diff --git a/SmartDeviceLink/SDLVehicleDataResult.h b/SmartDeviceLink/SDLVehicleDataResult.h index 9a03e5d07..4db6cc60d 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.h +++ b/SmartDeviceLink/SDLVehicleDataResult.h @@ -7,11 +7,7 @@ @class SDLVehicleDataResultCode; -@interface SDLVehicleDataResult : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLVehicleDataResult : SDLRPCStruct @property (strong) SDLVehicleDataType *dataType; @property (strong) SDLVehicleDataResultCode *resultCode; diff --git a/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink/SDLVehicleDataResult.m index e395717eb..1df062153 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.m +++ b/SmartDeviceLink/SDLVehicleDataResult.m @@ -10,18 +10,6 @@ @implementation SDLVehicleDataResult -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setDataType:(SDLVehicleDataType *)dataType { if (dataType != nil) { [store setObject:dataType forKey:NAMES_dataType]; diff --git a/SmartDeviceLink/SDLVehicleType.h b/SmartDeviceLink/SDLVehicleType.h index 1a934b5eb..aceb40b72 100644 --- a/SmartDeviceLink/SDLVehicleType.h +++ b/SmartDeviceLink/SDLVehicleType.h @@ -9,19 +9,7 @@ * * @since SDL 2.0 */ -@interface SDLVehicleType : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLVehicleType object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLVehicleType object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLVehicleType : SDLRPCStruct /** * @abstract The make of the vehicle diff --git a/SmartDeviceLink/SDLVehicleType.m b/SmartDeviceLink/SDLVehicleType.m index ebee2de7f..dbe3d1ef4 100644 --- a/SmartDeviceLink/SDLVehicleType.m +++ b/SmartDeviceLink/SDLVehicleType.m @@ -8,18 +8,6 @@ @implementation SDLVehicleType -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setMake:(NSString *)make { if (make != nil) { [store setObject:make forKey:NAMES_make]; diff --git a/SmartDeviceLink/SDLVrHelpItem.h b/SmartDeviceLink/SDLVrHelpItem.h index a46c1301b..de4fb6088 100644 --- a/SmartDeviceLink/SDLVrHelpItem.h +++ b/SmartDeviceLink/SDLVrHelpItem.h @@ -6,11 +6,7 @@ @class SDLImage; -@interface SDLVRHelpItem : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLVRHelpItem : SDLRPCStruct @property (strong) NSString *text; @property (strong) SDLImage *image; diff --git a/SmartDeviceLink/SDLVrHelpItem.m b/SmartDeviceLink/SDLVrHelpItem.m index 4ed2c1409..5d27d5f52 100644 --- a/SmartDeviceLink/SDLVrHelpItem.m +++ b/SmartDeviceLink/SDLVrHelpItem.m @@ -9,18 +9,6 @@ @implementation SDLVRHelpItem -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setText:(NSString *)text { if (text != nil) { [store setObject:text forKey:NAMES_text]; @@ -46,7 +34,7 @@ if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } |