summaryrefslogtreecommitdiff
path: root/SmartDeviceLink
diff options
context:
space:
mode:
authorJoel Fischer <joeljfischer@gmail.com>2016-08-29 16:49:47 -0400
committerJoel Fischer <joeljfischer@gmail.com>2016-08-29 16:49:47 -0400
commitc9e77a95ab8d298f620cd7cd6c4d8b7d4b6f86b0 (patch)
tree77781d8274516bbdd4dbd1ccb09387fb2616b2c4 /SmartDeviceLink
parent204f636612aa7b9e90c90fcecc1f14e03323e9ef (diff)
downloadsdl_ios-c9e77a95ab8d298f620cd7cd6c4d8b7d4b6f86b0.tar.gz
SDLLogging type changed to SDLLogOutput
Diffstat (limited to 'SmartDeviceLink')
-rw-r--r--SmartDeviceLink/SDLLifecycleConfiguration.h12
-rw-r--r--SmartDeviceLink/SDLLifecycleConfiguration.m2
-rw-r--r--SmartDeviceLink/SDLLifecycleManager.m8
3 files changed, 11 insertions, 11 deletions
diff --git a/SmartDeviceLink/SDLLifecycleConfiguration.h b/SmartDeviceLink/SDLLifecycleConfiguration.h
index 90498298e..dce7d87e4 100644
--- a/SmartDeviceLink/SDLLifecycleConfiguration.h
+++ b/SmartDeviceLink/SDLLifecycleConfiguration.h
@@ -18,11 +18,11 @@
@protocol SDLSecurityType;
-typedef NS_OPTIONS(NSUInteger, SDLLogging) {
- SDLLoggingNone = 0,
- SDLLoggingConsole = 1 << 0,
- SDLLoggingFile = 1 << 1,
- SDLLoggingSiphon = 1 << 2
+typedef NS_OPTIONS(NSUInteger, SDLLogOutput) {
+ SDLLogOutputNone = 0,
+ SDLLogOutputConsole = 1 << 0,
+ SDLLogOutputFile = 1 << 1,
+ SDLLogOutputSiphon = 1 << 2
};
@@ -135,7 +135,7 @@ NS_ASSUME_NONNULL_BEGIN
/**
* Which logging capabilities are currently enabled. The default is Console logging only.
*/
-@property (assign, nonatomic) SDLLogging logFlags;
+@property (assign, nonatomic) SDLLogOutput logFlags;
@end
diff --git a/SmartDeviceLink/SDLLifecycleConfiguration.m b/SmartDeviceLink/SDLLifecycleConfiguration.m
index 62fe08225..638306a45 100644
--- a/SmartDeviceLink/SDLLifecycleConfiguration.m
+++ b/SmartDeviceLink/SDLLifecycleConfiguration.m
@@ -51,7 +51,7 @@ NS_ASSUME_NONNULL_BEGIN
_shortAppName = nil;
_ttsName = nil;
_voiceRecognitionCommandNames = nil;
- _logFlags = SDLLoggingConsole;
+ _logFlags = SDLLogOutputConsole;
return self;
}
diff --git a/SmartDeviceLink/SDLLifecycleManager.m b/SmartDeviceLink/SDLLifecycleManager.m
index 6df4c35cb..defec9486 100644
--- a/SmartDeviceLink/SDLLifecycleManager.m
+++ b/SmartDeviceLink/SDLLifecycleManager.m
@@ -420,14 +420,14 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
return YES;
}
-+ (void)sdl_updateLoggingWithFlags:(SDLLogging)logFlags {
++ (void)sdl_updateLoggingWithFlags:(SDLLogOutput)logFlags {
[SDLDebugTool disable];
- if ((logFlags & SDLLoggingConsole) == SDLLoggingConsole) {
+ if ((logFlags & SDLLogOutputConsole) == SDLLogOutputConsole) {
[SDLDebugTool enable];
}
- if ((logFlags & SDLLoggingFile) == SDLLoggingFile) {
+ if ((logFlags & SDLLogOutputFile) == SDLLogOutputFile) {
[SDLDebugTool enableDebugToLogFile];
} else {
[SDLDebugTool disableDebugToLogFile];
@@ -435,7 +435,7 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ((logFlags & SDLLoggingSiphon) == SDLLoggingSiphon) {
+ if ((logFlags & SDLLogOutputSiphon) == SDLLogOutputSiphon) {
[SDLProxy enableSiphonDebug];
} else {
[SDLProxy disableSiphonDebug];