diff options
author | Muller, Alexander (A.) <amulle19@ford.com> | 2016-09-21 12:13:36 -0700 |
---|---|---|
committer | Muller, Alexander (A.) <amulle19@ford.com> | 2016-09-21 12:13:36 -0700 |
commit | be7622fe60babba90276101db79a515597a9fea1 (patch) | |
tree | 8bbcc0a3433ae8e42fa2204c9a36712cce0203ca /SmartDeviceLink/SDLGPSData.m | |
parent | e6e84cc8c23609ab286c64a2c6a3037313f29908 (diff) | |
download | sdl_ios-be7622fe60babba90276101db79a515597a9fea1.tar.gz |
Initial conversion of all enum objects to SDLEnum typedef.
Diffstat (limited to 'SmartDeviceLink/SDLGPSData.m')
-rw-r--r-- | SmartDeviceLink/SDLGPSData.m | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/SmartDeviceLink/SDLGPSData.m b/SmartDeviceLink/SDLGPSData.m index 1cec52112..d84ac9aa5 100644 --- a/SmartDeviceLink/SDLGPSData.m +++ b/SmartDeviceLink/SDLGPSData.m @@ -3,8 +3,6 @@ #import "SDLGPSData.h" -#import "SDLCompassDirection.h" -#import "SDLDimension.h" #import "SDLNames.h" @@ -118,7 +116,7 @@ return [store objectForKey:NAMES_utcSeconds]; } -- (void)setCompassDirection:(SDLCompassDirection *)compassDirection { +- (void)setCompassDirection:(SDLCompassDirection)compassDirection { if (compassDirection != nil) { [store setObject:compassDirection forKey:NAMES_compassDirection]; } else { @@ -126,13 +124,9 @@ } } -- (SDLCompassDirection *)compassDirection { +- (SDLCompassDirection)compassDirection { NSObject *obj = [store objectForKey:NAMES_compassDirection]; - if (obj == nil || [obj isKindOfClass:SDLCompassDirection.class]) { - return (SDLCompassDirection *)obj; - } else { - return [SDLCompassDirection valueOf:(NSString *)obj]; - } + return (SDLCompassDirection)obj; } - (void)setPdop:(NSNumber *)pdop { @@ -195,7 +189,7 @@ return [store objectForKey:NAMES_satellites]; } -- (void)setDimension:(SDLDimension *)dimension { +- (void)setDimension:(SDLDimension)dimension { if (dimension != nil) { [store setObject:dimension forKey:NAMES_dimension]; } else { @@ -203,13 +197,9 @@ } } -- (SDLDimension *)dimension { +- (SDLDimension)dimension { NSObject *obj = [store objectForKey:NAMES_dimension]; - if (obj == nil || [obj isKindOfClass:SDLDimension.class]) { - return (SDLDimension *)obj; - } else { - return [SDLDimension valueOf:(NSString *)obj]; - } + return (SDLDimension)obj; } - (void)setAltitude:(NSNumber *)altitude { |