summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Fischer <joeljfischer@gmail.com>2015-12-16 08:51:46 -0500
committerJoel Fischer <joeljfischer@gmail.com>2015-12-16 08:51:46 -0500
commit9a97350051f9cb2bf1c1c5477fa82307bc3b6476 (patch)
treed46d8641ef969e2a1e16fb3e7c359ca971bae2ab
parent523e8a072241d8c9adbd26c92b5ae616b2d4ac9a (diff)
downloadsdl_ios-feature/remote_control.tar.gz
Follow constant names naming conventionfeature/remote_control
-rw-r--r--SmartDeviceLink-iOS/SmartDeviceLink/SDLInteriorZone.m18
-rw-r--r--SmartDeviceLink-iOS/SmartDeviceLink/SDLNames.h6
2 files changed, 12 insertions, 12 deletions
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLInteriorZone.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLInteriorZone.m
index d56460766..5c768d3cb 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLInteriorZone.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLInteriorZone.m
@@ -51,38 +51,38 @@
- (void)setColumnSpan:(NSNumber *)columnSpan {
if (columnSpan != nil) {
- [store setObject:columnSpan forKey:NAMES_colSpan];
+ [store setObject:columnSpan forKey:NAMES_colspan];
} else {
- [store removeObjectForKey:NAMES_colSpan];
+ [store removeObjectForKey:NAMES_colspan];
}
}
- (NSNumber *)columnSpan {
- return [store objectForKey:NAMES_colSpan];
+ return [store objectForKey:NAMES_colspan];
}
- (void)setRowSpan:(NSNumber *)rowSpan {
if (rowSpan != nil) {
- [store setObject:rowSpan forKey:NAMES_rowSpan];
+ [store setObject:rowSpan forKey:NAMES_rowspan];
} else {
- [store removeObjectForKey:NAMES_rowSpan];
+ [store removeObjectForKey:NAMES_rowspan];
}
}
- (NSNumber *)rowSpan {
- return [store objectForKey:NAMES_rowSpan];
+ return [store objectForKey:NAMES_rowspan];
}
- (void)setLevelSpan:(NSNumber *)levelSpan {
if (levelSpan != nil) {
- [store setObject:levelSpan forKey:NAMES_levelSpan];
+ [store setObject:levelSpan forKey:NAMES_levelspan];
} else {
- [store removeObjectForKey:NAMES_levelSpan];
+ [store removeObjectForKey:NAMES_levelspan];
}
}
- (NSNumber *)levelSpan {
- return [store objectForKey:NAMES_levelSpan];
+ return [store objectForKey:NAMES_levelspan];
}
@end
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLNames.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLNames.h
index db5f053a8..00a514cdf 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLNames.h
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLNames.h
@@ -58,7 +58,7 @@
#define NAMES_cmdIcon @"cmdIcon"
#define NAMES_cmdID @"cmdID"
#define NAMES_col @"col"
-#define NAMES_colSpan @"colspan"
+#define NAMES_colspan @"colspan"
#define NAMES_compassDirection @"compassDirection"
#define NAMES_correlationID @"correlationID"
#define NAMES_CreateInteractionChoiceSet @"CreateInteractionChoiceSet"
@@ -185,7 +185,7 @@
#define NAMES_leftRow3BuckleBelted @"leftRow3BuckleBelted"
#define NAMES_length @"length"
#define NAMES_level @"level"
-#define NAMES_levelSpan @"levelspan"
+#define NAMES_levelspan @"levelspan"
#define NAMES_limitedCharacterList @"limitedCharacterList"
#define NAMES_ListFiles @"ListFiles"
#define NAMES_locationDescription @"locationDescription"
@@ -335,7 +335,7 @@
#define NAMES_rolloverEvent @"rolloverEvent"
#define NAMES_row @"row"
#define NAMES_rows @"rows"
-#define NAMES_rowSpan @"rowspan"
+#define NAMES_rowspan @"rowspan"
#define NAMES_rpcName @"rpcName"
#define NAMES_rpm @"rpm"
#define NAMES_RT @"RT"