Use enum class in logger-config as it is possible to serialize now.

[Bug/Feature]   N/A
[Cause]         To keep things clean and consistent
[Solution]      N/A
[Verification]  Build, run the junk tester

Change-Id: I75e55448a5f7c559882c6433dc82fae60ab2083b

diff --git a/libs/lxcpp/guard/guard.cpp b/libs/lxcpp/guard/guard.cpp
index f96fe7a..bc5f112 100644 (file)
--- a/libs/lxcpp/guard/guard.cpp
+++ b/libs/lxcpp/guard/guard.cpp
@@ -63,9 +63,9 @@ Guard::Guard(const int channelFD)
     mChannel.setCloseOnExec(true);
     config::loadFromFD(mChannel.getFD(), mConfig);
 
-    logger::setupLogger(mConfig.mLogger.getType(),
-                        mConfig.mLogger.getLevel(),
-                        mConfig.mLogger.getArg());
+    logger::setupLogger(mConfig.mLogger.mType,
+                        mConfig.mLogger.mLevel,
+                        mConfig.mLogger.mArg);
 
     LOGD("Config & logging restored");
 

diff --git a/libs/lxcpp/logger-config.cpp b/libs/lxcpp/logger-config.cpp
index 3aed302..ff0e407 100644 (file)
--- a/libs/lxcpp/logger-config.cpp
+++ b/libs/lxcpp/logger-config.cpp
@@ -39,8 +39,8 @@ void LoggerConfig::set(const logger::LogType type,
         }
     }
 
-    mType = static_cast<int>(type);
-    mLevel = static_cast<int>(level);
+    mType = type;
+    mLevel = level;
     mArg = arg;
 }
 

diff --git a/libs/lxcpp/logger-config.hpp b/libs/lxcpp/logger-config.hpp
index 8312623..52f0514 100644 (file)
--- a/libs/lxcpp/logger-config.hpp
+++ b/libs/lxcpp/logger-config.hpp
@@ -35,21 +35,16 @@ namespace lxcpp {
 /**
  * Logger configuration
  */
-struct LoggerConfig {
-private:
-    int mType;
-    int mLevel;
+struct LoggerConfig
+{
+    logger::LogType mType;
+    logger::LogLevel mLevel;
     std::string mArg;
 
-public:
     void set(const logger::LogType type,
              const logger::LogLevel level,
              const std::string &arg = "");
 
-    logger::LogType getType() const {return static_cast<logger::LogType>(mType);}
-    logger::LogLevel getLevel() const {return static_cast<logger::LogLevel>(mLevel);}
-    std::string getArg() const {return mArg;}
-
     CONFIG_REGISTER
     (
         mType,