From 2865d230645b5781aeb38175ca7dab24978d555b Mon Sep 17 00:00:00 2001
From: Daniel Lim Wee Soong <weesoong.lim@gmail.com>
Date: Thu, 7 Jun 2018 23:07:02 +0800
Subject: [PATCH] core/frontend: Replace logging macros

---
 src/core/frontend/camera/factory.cpp | 4 ++--
 src/core/frontend/camera/factory.h   | 2 +-
 src/core/frontend/input.h            | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/frontend/camera/factory.cpp b/src/core/frontend/camera/factory.cpp
index f0434cdad..4abbd9ff7 100644
--- a/src/core/frontend/camera/factory.cpp
+++ b/src/core/frontend/camera/factory.cpp
@@ -24,7 +24,7 @@ std::unique_ptr<CameraInterface> CreateCamera(const std::string& name, const std
     }
 
     if (name != "blank") {
-        LOG_ERROR(Service_CAM, "Unknown camera \"%s\"", name.c_str());
+        NGLOG_ERROR(Service_CAM, "Unknown camera \"{}\"", name);
     }
     return std::make_unique<BlankCamera>();
 }
@@ -38,7 +38,7 @@ std::unique_ptr<CameraInterface> CreateCameraPreview(const std::string& name,
     }
 
     if (name != "blank") {
-        LOG_ERROR(Service_CAM, "Unknown camera \"%s\"", name.c_str());
+        NGLOG_ERROR(Service_CAM, "Unknown camera \"{}\"", name);
     }
     return std::make_unique<BlankCamera>();
 }
diff --git a/src/core/frontend/camera/factory.h b/src/core/frontend/camera/factory.h
index 840be7022..cf09b7bb0 100644
--- a/src/core/frontend/camera/factory.h
+++ b/src/core/frontend/camera/factory.h
@@ -28,7 +28,7 @@ public:
      *               meaning of this string.
      * @returns a unique_ptr to the created camera object.
      * Note: The default implementation for this is to call Create(). Derived classes may have other
-     *       Implementations. For example, A dialog may be used instead of LOG_ERROR when error
+     *       Implementations. For example, A dialog may be used instead of NGLOG_ERROR when error
      * occurs.
      */
     virtual std::unique_ptr<CameraInterface> CreatePreview(const std::string& config, int width,
diff --git a/src/core/frontend/input.h b/src/core/frontend/input.h
index 8c256beb5..26e9f6597 100644
--- a/src/core/frontend/input.h
+++ b/src/core/frontend/input.h
@@ -59,7 +59,7 @@ template <typename InputDeviceType>
 void RegisterFactory(const std::string& name, std::shared_ptr<Factory<InputDeviceType>> factory) {
     auto pair = std::make_pair(name, std::move(factory));
     if (!Impl::FactoryList<InputDeviceType>::list.insert(std::move(pair)).second) {
-        LOG_ERROR(Input, "Factory %s already registered", name.c_str());
+        NGLOG_ERROR(Input, "Factory {} already registered", name);
     }
 }
 
@@ -71,7 +71,7 @@ void RegisterFactory(const std::string& name, std::shared_ptr<Factory<InputDevic
 template <typename InputDeviceType>
 void UnregisterFactory(const std::string& name) {
     if (Impl::FactoryList<InputDeviceType>::list.erase(name) == 0) {
-        LOG_ERROR(Input, "Factory %s not registered", name.c_str());
+        NGLOG_ERROR(Input, "Factory {} not registered", name);
     }
 }
 
@@ -88,7 +88,7 @@ std::unique_ptr<InputDeviceType> CreateDevice(const std::string& params) {
     const auto pair = factory_list.find(engine);
     if (pair == factory_list.end()) {
         if (engine != "null") {
-            LOG_ERROR(Input, "Unknown engine name: %s", engine.c_str());
+            NGLOG_ERROR(Input, "Unknown engine name: {}", engine);
         }
         return std::make_unique<InputDeviceType>();
     }