Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Converting SDLNames Defines to Constants #446

Merged
merged 13 commits into from
Sep 27, 2016
+3,734 −3,307
Merged

Converting SDLNames Defines to Constants #446

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dd05e50
Replaced all defines with constant strings of the SDLName typedef. Al…
asm09fsu Sep 21, 2016
3590d69
Reverted SDLNames to Project instead of Public.
asm09fsu Sep 22, 2016
9ea32a7
Removed extensibility from SDLName
asm09fsu Sep 22, 2016
ea5beb1
Updated naming of some constant.
asm09fsu Sep 22, 2016
90c51bf
Fixed issue with tests not passing
asm09fsu Sep 22, 2016
8676a8a
Updated SDLFunctionID to be a singleton.
asm09fsu Sep 22, 2016
a194d52
Fixed remaining failing tests.
asm09fsu Sep 22, 2016
56dd436
Updated SDLFunctionID to be private.
asm09fsu Sep 22, 2016
aac4fe7
Merge branch 'develop' into feature/issue_3_constant_names
joeljfischer Sep 23, 2016
1ce65ed
Merge branch 'develop' of https://github.com/smartdevicelink/sdl_ios …
asm09fsu Sep 23, 2016
120b92f
Updated SDLFunctionID to project instead of private.
asm09fsu Sep 23, 2016
7246055
Fixed accidental function renaming.
asm09fsu Sep 27, 2016
2f587e1
reverting function renaming in SDLRPCMessage.
asm09fsu Sep 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .xctool-args
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
"-project", "SmartDeviceLink-iOS.xcodeproj",
"-scheme", "SmartDeviceLink",
"-scheme", "SmartDeviceLinkTests",
"-sdk", "iphonesimulator",
"ONLY_ACTIVE_ARCH=NO",
"RUN_CLANG_STATIC_ANALYZER=NO"
Expand Down
6 changes: 5 additions & 1 deletion SmartDeviceLink-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@
5D61FCF91A84238C00846EE7 /* SDLMenuParams.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FB0C1A84238A00846EE7 /* SDLMenuParams.m */; };
5D61FCFA1A84238C00846EE7 /* SDLMyKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FB0D1A84238A00846EE7 /* SDLMyKey.h */; settings = {ATTRIBUTES = (Public, ); }; };
5D61FCFB1A84238C00846EE7 /* SDLMyKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FB0E1A84238A00846EE7 /* SDLMyKey.m */; };
5D61FCFC1A84238C00846EE7 /* SDLNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FB0F1A84238A00846EE7 /* SDLNames.h */; };
5D61FCFC1A84238C00846EE7 /* SDLNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FB0F1A84238A00846EE7 /* SDLNames.h */; settings = {ATTRIBUTES = (Public, ); }; };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this have to be public now?

5D61FCFD1A84238C00846EE7 /* SDLObjectWithPriority.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FB101A84238A00846EE7 /* SDLObjectWithPriority.h */; };
5D61FCFE1A84238C00846EE7 /* SDLObjectWithPriority.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FB111A84238A00846EE7 /* SDLObjectWithPriority.m */; };
5D61FCFF1A84238C00846EE7 /* SDLOnAppInterfaceUnregistered.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FB121A84238B00846EE7 /* SDLOnAppInterfaceUnregistered.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -895,6 +895,7 @@
DA4353EA1D2721680099B8C4 /* SDLTouchManagerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4353E71D2721680099B8C4 /* SDLTouchManagerSpec.m */; };
DA4353EB1D2721680099B8C4 /* SDLTouchSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4353E81D2721680099B8C4 /* SDLTouchSpec.m */; };
DA96C0661D4D4F730022F520 /* SDLAppInfoSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA96C0651D4D4F730022F520 /* SDLAppInfoSpec.m */; };
DAB5378A1D9319E8008EB556 /* SDLNames.m in Sources */ = {isa = PBXBuildFile; fileRef = DAB537891D9319E8008EB556 /* SDLNames.m */; };
DAC572571D1067270004288B /* SDLTouchManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DAC572551D1067270004288B /* SDLTouchManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
DAC572581D1067270004288B /* SDLTouchManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DAC572561D1067270004288B /* SDLTouchManager.m */; };
DAC5725B1D10B81E0004288B /* SDLTouch.m in Sources */ = {isa = PBXBuildFile; fileRef = DAC572591D10B81E0004288B /* SDLTouch.m */; };
Expand Down Expand Up @@ -1881,6 +1882,7 @@
DA4353E71D2721680099B8C4 /* SDLTouchManagerSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLTouchManagerSpec.m; path = UtilitiesSpecs/Touches/SDLTouchManagerSpec.m; sourceTree = "<group>"; };
DA4353E81D2721680099B8C4 /* SDLTouchSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLTouchSpec.m; path = UtilitiesSpecs/Touches/SDLTouchSpec.m; sourceTree = "<group>"; };
DA96C0651D4D4F730022F520 /* SDLAppInfoSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAppInfoSpec.m; sourceTree = "<group>"; };
DAB537891D9319E8008EB556 /* SDLNames.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLNames.m; sourceTree = "<group>"; };
DAC572551D1067270004288B /* SDLTouchManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTouchManager.h; sourceTree = "<group>"; };
DAC572561D1067270004288B /* SDLTouchManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTouchManager.m; sourceTree = "<group>"; };
DAC572591D10B81E0004288B /* SDLTouch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTouch.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2960,6 +2962,7 @@
E9C32B8E1AB20BA200F283AF /* SDLTimer.h */,
E9C32B8F1AB20BA200F283AF /* SDLTimer.m */,
5D61FB0F1A84238A00846EE7 /* SDLNames.h */,
DAB537891D9319E8008EB556 /* SDLNames.m */,
5D535DC31B72473800CF7760 /* SDLGlobals.h */,
5D535DC41B72473800CF7760 /* SDLGlobals.m */,
);
Expand Down Expand Up @@ -4334,6 +4337,7 @@
5D61FE001A84238C00846EE7 /* SDLVehicleDataEventStatus.m in Sources */,
5D61FDC41A84238C00846EE7 /* SDLTBTState.m in Sources */,
5D61FDA61A84238C00846EE7 /* SDLSpeak.m in Sources */,
DAB5378A1D9319E8008EB556 /* SDLNames.m in Sources */,
5D61FDDE1A84238C00846EE7 /* SDLTTSChunk.m in Sources */,
5D61FD9E1A84238C00846EE7 /* SDLSliderResponse.m in Sources */,
5D61FC5C1A84238C00846EE7 /* SDLChangeRegistration.m in Sources */,
Expand Down
28 changes: 14 additions & 14 deletions SmartDeviceLink/SDLAddCommand.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

#import "SDLImage.h"
#import "SDLMenuParams.h"
#import "SDLNames.h"



@implementation SDLAddCommand

- (instancetype)init {
if (self = [super initWithName:NAMES_AddCommand]) {
if (self = [super initWithName:SDLNameAddCommand]) {
}
return self;
}
Expand All @@ -36,26 +36,26 @@ - (instancetype)initWithDictionary:(NSMutableDictionary *)dict {

- (void)setCmdID:(NSNumber *)cmdID {
if (cmdID != nil) {
[parameters setObject:cmdID forKey:NAMES_cmdID];
[parameters setObject:cmdID forKey:SDLNameCommandId];
} else {
[parameters removeObjectForKey:NAMES_cmdID];
[parameters removeObjectForKey:SDLNameCommandId];
}
}

- (NSNumber *)cmdID {
return [parameters objectForKey:NAMES_cmdID];
return [parameters objectForKey:SDLNameCommandId];
}

- (void)setMenuParams:(SDLMenuParams *)menuParams {
if (menuParams != nil) {
[parameters setObject:menuParams forKey:NAMES_menuParams];
[parameters setObject:menuParams forKey:SDLNameMenuParams];
} else {
[parameters removeObjectForKey:NAMES_menuParams];
[parameters removeObjectForKey:SDLNameMenuParams];
}
}

- (SDLMenuParams *)menuParams {
NSObject *obj = [parameters objectForKey:NAMES_menuParams];
NSObject *obj = [parameters objectForKey:SDLNameMenuParams];
if (obj == nil || [obj isKindOfClass:SDLMenuParams.class]) {
return (SDLMenuParams *)obj;
} else {
Expand All @@ -65,26 +65,26 @@ - (SDLMenuParams *)menuParams {

- (void)setVrCommands:(NSMutableArray *)vrCommands {
if (vrCommands != nil) {
[parameters setObject:vrCommands forKey:NAMES_vrCommands];
[parameters setObject:vrCommands forKey:SDLNameVrCommands];
} else {
[parameters removeObjectForKey:NAMES_vrCommands];
[parameters removeObjectForKey:SDLNameVrCommands];
}
}

- (NSMutableArray *)vrCommands {
return [parameters objectForKey:NAMES_vrCommands];
return [parameters objectForKey:SDLNameVrCommands];
}

- (void)setCmdIcon:(SDLImage *)cmdIcon {
if (cmdIcon != nil) {
[parameters setObject:cmdIcon forKey:NAMES_cmdIcon];
[parameters setObject:cmdIcon forKey:SDLNameCommandIcon];
} else {
[parameters removeObjectForKey:NAMES_cmdIcon];
[parameters removeObjectForKey:SDLNameCommandIcon];
}
}

- (SDLImage *)cmdIcon {
NSObject *obj = [parameters objectForKey:NAMES_cmdIcon];
NSObject *obj = [parameters objectForKey:SDLNameCommandIcon];
if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
return (SDLImage *)obj;
} else {
Expand Down
4 changes: 2 additions & 2 deletions SmartDeviceLink/SDLAddCommandResponse.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

#import "SDLAddCommandResponse.h"

#import "SDLNames.h"


@implementation SDLAddCommandResponse

- (instancetype)init {
if (self = [super initWithName:NAMES_AddCommand]) {
if (self = [super initWithName:SDLNameAddCommand]) {
}
return self;
}
Expand Down
22 changes: 11 additions & 11 deletions SmartDeviceLink/SDLAddSubMenu.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

#import "SDLAddSubMenu.h"

#import "SDLNames.h"


@implementation SDLAddSubMenu

- (instancetype)init {
if (self = [super initWithName:NAMES_AddSubMenu]) {
if (self = [super initWithName:SDLNameAddSubMenu]) {
}
return self;
}
Expand All @@ -20,38 +20,38 @@ - (instancetype)initWithDictionary:(NSMutableDictionary *)dict {

- (void)setMenuID:(NSNumber *)menuID {
if (menuID != nil) {
[parameters setObject:menuID forKey:NAMES_menuID];
[parameters setObject:menuID forKey:SDLNameMenuId];
} else {
[parameters removeObjectForKey:NAMES_menuID];
[parameters removeObjectForKey:SDLNameMenuId];
}
}

- (NSNumber *)menuID {
return [parameters objectForKey:NAMES_menuID];
return [parameters objectForKey:SDLNameMenuId];
}

- (void)setPosition:(NSNumber *)position {
if (position != nil) {
[parameters setObject:position forKey:NAMES_position];
[parameters setObject:position forKey:SDLNamePosition];
} else {
[parameters removeObjectForKey:NAMES_position];
[parameters removeObjectForKey:SDLNamePosition];
}
}

- (NSNumber *)position {
return [parameters objectForKey:NAMES_position];
return [parameters objectForKey:SDLNamePosition];
}

- (void)setMenuName:(NSString *)menuName {
if (menuName != nil) {
[parameters setObject:menuName forKey:NAMES_menuName];
[parameters setObject:menuName forKey:SDLNameMenuName];
} else {
[parameters removeObjectForKey:NAMES_menuName];
[parameters removeObjectForKey:SDLNameMenuName];
}
}

- (NSString *)menuName {
return [parameters objectForKey:NAMES_menuName];
return [parameters objectForKey:SDLNameMenuName];
}

@end
4 changes: 2 additions & 2 deletions SmartDeviceLink/SDLAddSubMenuResponse.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

#import "SDLAddSubMenuResponse.h"

#import "SDLNames.h"


@implementation SDLAddSubMenuResponse

- (instancetype)init {
if (self = [super initWithName:NAMES_AddSubMenu]) {
if (self = [super initWithName:SDLNameAddSubMenu]) {
}
return self;
}
Expand Down
50 changes: 25 additions & 25 deletions SmartDeviceLink/SDLAirbagStatus.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#import "SDLAirbagStatus.h"

#import "SDLNames.h"

#import "SDLVehicleDataEventStatus.h"


Expand All @@ -22,14 +22,14 @@ - (instancetype)initWithDictionary:(NSMutableDictionary *)dict {

- (void)setDriverAirbagDeployed:(SDLVehicleDataEventStatus *)driverAirbagDeployed {
if (driverAirbagDeployed != nil) {
[store setObject:driverAirbagDeployed forKey:NAMES_driverAirbagDeployed];
[store setObject:driverAirbagDeployed forKey:SDLNameDriverAirbagDeployed];
} else {
[store removeObjectForKey:NAMES_driverAirbagDeployed];
[store removeObjectForKey:SDLNameDriverAirbagDeployed];
}
}

- (SDLVehicleDataEventStatus *)driverAirbagDeployed {
NSObject *obj = [store objectForKey:NAMES_driverAirbagDeployed];
NSObject *obj = [store objectForKey:SDLNameDriverAirbagDeployed];
if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
return (SDLVehicleDataEventStatus *)obj;
} else {
Expand All @@ -39,14 +39,14 @@ - (SDLVehicleDataEventStatus *)driverAirbagDeployed {

- (void)setDriverSideAirbagDeployed:(SDLVehicleDataEventStatus *)driverSideAirbagDeployed {
if (driverSideAirbagDeployed != nil) {
[store setObject:driverSideAirbagDeployed forKey:NAMES_driverSideAirbagDeployed];
[store setObject:driverSideAirbagDeployed forKey:SDLNameDriverSideAirbagDeployed];
} else {
[store removeObjectForKey:NAMES_driverSideAirbagDeployed];
[store removeObjectForKey:SDLNameDriverSideAirbagDeployed];
}
}

- (SDLVehicleDataEventStatus *)driverSideAirbagDeployed {
NSObject *obj = [store objectForKey:NAMES_driverSideAirbagDeployed];
NSObject *obj = [store objectForKey:SDLNameDriverSideAirbagDeployed];
if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
return (SDLVehicleDataEventStatus *)obj;
} else {
Expand All @@ -56,14 +56,14 @@ - (SDLVehicleDataEventStatus *)driverSideAirbagDeployed {

- (void)setDriverCurtainAirbagDeployed:(SDLVehicleDataEventStatus *)driverCurtainAirbagDeployed {
if (driverCurtainAirbagDeployed != nil) {
[store setObject:driverCurtainAirbagDeployed forKey:NAMES_driverCurtainAirbagDeployed];
[store setObject:driverCurtainAirbagDeployed forKey:SDLNameDriverCurtainAirbagDeployed];
} else {
[store removeObjectForKey:NAMES_driverCurtainAirbagDeployed];
[store removeObjectForKey:SDLNameDriverCurtainAirbagDeployed];
}
}

- (SDLVehicleDataEventStatus *)driverCurtainAirbagDeployed {
NSObject *obj = [store objectForKey:NAMES_driverCurtainAirbagDeployed];
NSObject *obj = [store objectForKey:SDLNameDriverCurtainAirbagDeployed];
if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
return (SDLVehicleDataEventStatus *)obj;
} else {
Expand All @@ -73,14 +73,14 @@ - (SDLVehicleDataEventStatus *)driverCurtainAirbagDeployed {

- (void)setPassengerAirbagDeployed:(SDLVehicleDataEventStatus *)passengerAirbagDeployed {
if (passengerAirbagDeployed != nil) {
[store setObject:passengerAirbagDeployed forKey:NAMES_passengerAirbagDeployed];
[store setObject:passengerAirbagDeployed forKey:SDLNamePassengerAirbagDeployed];
} else {
[store removeObjectForKey:NAMES_passengerAirbagDeployed];
[store removeObjectForKey:SDLNamePassengerAirbagDeployed];
}
}

- (SDLVehicleDataEventStatus *)passengerAirbagDeployed {
NSObject *obj = [store objectForKey:NAMES_passengerAirbagDeployed];
NSObject *obj = [store objectForKey:SDLNamePassengerAirbagDeployed];
if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
return (SDLVehicleDataEventStatus *)obj;
} else {
Expand All @@ -90,14 +90,14 @@ - (SDLVehicleDataEventStatus *)passengerAirbagDeployed {

- (void)setPassengerCurtainAirbagDeployed:(SDLVehicleDataEventStatus *)passengerCurtainAirbagDeployed {
if (passengerCurtainAirbagDeployed != nil) {
[store setObject:passengerCurtainAirbagDeployed forKey:NAMES_passengerCurtainAirbagDeployed];
[store setObject:passengerCurtainAirbagDeployed forKey:SDLNamePassengerCurtainAirbagDeployed];
} else {
[store removeObjectForKey:NAMES_passengerCurtainAirbagDeployed];
[store removeObjectForKey:SDLNamePassengerCurtainAirbagDeployed];
}
}

- (SDLVehicleDataEventStatus *)passengerCurtainAirbagDeployed {
NSObject *obj = [store objectForKey:NAMES_passengerCurtainAirbagDeployed];
NSObject *obj = [store objectForKey:SDLNamePassengerCurtainAirbagDeployed];
if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
return (SDLVehicleDataEventStatus *)obj;
} else {
Expand All @@ -107,14 +107,14 @@ - (SDLVehicleDataEventStatus *)passengerCurtainAirbagDeployed {

- (void)setDriverKneeAirbagDeployed:(SDLVehicleDataEventStatus *)driverKneeAirbagDeployed {
if (driverKneeAirbagDeployed != nil) {
[store setObject:driverKneeAirbagDeployed forKey:NAMES_driverKneeAirbagDeployed];
[store setObject:driverKneeAirbagDeployed forKey:SDLNameDriverKneeAirbagDeployed];
} else {
[store removeObjectForKey:NAMES_driverKneeAirbagDeployed];
[store removeObjectForKey:SDLNameDriverKneeAirbagDeployed];
}
}

- (SDLVehicleDataEventStatus *)driverKneeAirbagDeployed {
NSObject *obj = [store objectForKey:NAMES_driverKneeAirbagDeployed];
NSObject *obj = [store objectForKey:SDLNameDriverKneeAirbagDeployed];
if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
return (SDLVehicleDataEventStatus *)obj;
} else {
Expand All @@ -124,14 +124,14 @@ - (SDLVehicleDataEventStatus *)driverKneeAirbagDeployed {

- (void)setPassengerSideAirbagDeployed:(SDLVehicleDataEventStatus *)passengerSideAirbagDeployed {
if (passengerSideAirbagDeployed != nil) {
[store setObject:passengerSideAirbagDeployed forKey:NAMES_passengerSideAirbagDeployed];
[store setObject:passengerSideAirbagDeployed forKey:SDLNamePassengerSideAirbagDeployed];
} else {
[store removeObjectForKey:NAMES_passengerSideAirbagDeployed];
[store removeObjectForKey:SDLNamePassengerSideAirbagDeployed];
}
}

- (SDLVehicleDataEventStatus *)passengerSideAirbagDeployed {
NSObject *obj = [store objectForKey:NAMES_passengerSideAirbagDeployed];
NSObject *obj = [store objectForKey:SDLNamePassengerSideAirbagDeployed];
if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
return (SDLVehicleDataEventStatus *)obj;
} else {
Expand All @@ -141,14 +141,14 @@ - (SDLVehicleDataEventStatus *)passengerSideAirbagDeployed {

- (void)setPassengerKneeAirbagDeployed:(SDLVehicleDataEventStatus *)passengerKneeAirbagDeployed {
if (passengerKneeAirbagDeployed != nil) {
[store setObject:passengerKneeAirbagDeployed forKey:NAMES_passengerKneeAirbagDeployed];
[store setObject:passengerKneeAirbagDeployed forKey:SDLNamePassengerKneeAirbagDeployed];
} else {
[store removeObjectForKey:NAMES_passengerKneeAirbagDeployed];
[store removeObjectForKey:SDLNamePassengerKneeAirbagDeployed];
}
}

- (SDLVehicleDataEventStatus *)passengerKneeAirbagDeployed {
NSObject *obj = [store objectForKey:NAMES_passengerKneeAirbagDeployed];
NSObject *obj = [store objectForKey:SDLNamePassengerKneeAirbagDeployed];
if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
return (SDLVehicleDataEventStatus *)obj;
} else {
Expand Down
Loading