From: Woochanlee <wc0917.lee@samsung.com>
Date: Fri, 9 Jul 2021 06:13:47 +0000 (+0900)
Subject: bootstrap: Fix indentation and code clean up
X-Git-Tag: submit/tizen/20210709.081442~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14e4b207f70b8d4d0e6d7b27d8514af98a75fa70;p=platform%2Fcore%2Fuifw%2Faurum.git

bootstrap: Fix indentation and code clean up

Change-Id: I813501c1222bed9292a983fecc0b6c5bfabdf7ca
---

diff --git a/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h b/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h
index 10577af..cbd4145 100644
--- a/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h
+++ b/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h
@@ -13,80 +13,80 @@ protected:
     ::grpc::Status execute(Command *cmd, bool clean);
 
 public:
-    ::grpc::Status killServer(::grpc::ServerContext *  context,
+    ::grpc::Status killServer(::grpc::ServerContext *context,
                               const ::aurum::ReqEmpty *request,
-                              ::aurum::RspEmpty *      response) override;
+                              ::aurum::RspEmpty *response) override;
 
-    ::grpc::Status findElement(::grpc::ServerContext *        context,
+    ::grpc::Status findElement(::grpc::ServerContext *context,
                                const ::aurum::ReqFindElement *request,
                                ::aurum::RspFindElement *response) override;
 
-    ::grpc::Status getValue(::grpc::ServerContext *     context,
+    ::grpc::Status getValue(::grpc::ServerContext *context,
                             const ::aurum::ReqGetValue *request,
-                            ::aurum::RspGetValue *      response) override;
-    ::grpc::Status setValue(::grpc::ServerContext *     context,
+                            ::aurum::RspGetValue *response) override;
+    ::grpc::Status setValue(::grpc::ServerContext *context,
                             const ::aurum::ReqSetValue *request,
-                            ::aurum::RspSetValue *      response) override;
-    ::grpc::Status getAttribute(::grpc::ServerContext *         context,
+                            ::aurum::RspSetValue *response) override;
+    ::grpc::Status getAttribute(::grpc::ServerContext *context,
                                 const ::aurum::ReqGetAttribute *request,
                                 ::aurum::RspGetAttribute *response) override;
-    ::grpc::Status getSize(::grpc::ServerContext *    context,
+    ::grpc::Status getSize(::grpc::ServerContext *context,
                            const ::aurum::ReqGetSize *request,
-                           ::aurum::RspGetSize *      response) override;
-    ::grpc::Status clear(::grpc::ServerContext *  context,
+                           ::aurum::RspGetSize *response) override;
+    ::grpc::Status clear(::grpc::ServerContext *context,
                          const ::aurum::ReqClear *request,
-                         ::aurum::RspClear *      response) override;
+                         ::aurum::RspClear *response) override;
     ::grpc::Status installApp(
-        ::grpc::ServerContext *                        context,
+        ::grpc::ServerContext *context,
         ::grpc::ServerReader< ::aurum::ReqInstallApp> *reader,
-        ::aurum::RspInstallApp *                       response) override;
-    ::grpc::Status removeApp(::grpc::ServerContext *      context,
+        ::aurum::RspInstallApp *response) override;
+    ::grpc::Status removeApp(::grpc::ServerContext *context,
                              const ::aurum::ReqRemoveApp *request,
-                             ::aurum::RspRemoveApp *      response) override;
-    ::grpc::Status getAppInfo(::grpc::ServerContext *       context,
+                             ::aurum::RspRemoveApp *response) override;
+    ::grpc::Status getAppInfo(::grpc::ServerContext *context,
                               const ::aurum::ReqGetAppInfo *request,
-                              ::aurum::RspGetAppInfo *      response) override;
-    ::grpc::Status launchApp(::grpc::ServerContext *      context,
+                              ::aurum::RspGetAppInfo *response) override;
+    ::grpc::Status launchApp(::grpc::ServerContext *context,
                              const ::aurum::ReqLaunchApp *request,
-                             ::aurum::RspLaunchApp *      response) override;
-    ::grpc::Status closeApp(::grpc::ServerContext *     context,
+                             ::aurum::RspLaunchApp *response) override;
+    ::grpc::Status closeApp(::grpc::ServerContext *context,
                             const ::aurum::ReqCloseApp *request,
-                            ::aurum::RspCloseApp *      response) override;
+                            ::aurum::RspCloseApp *response) override;
 
-    ::grpc::Status click(::grpc::ServerContext *  context,
+    ::grpc::Status click(::grpc::ServerContext *context,
                          const ::aurum::ReqClick *request,
-                         ::aurum::RspClick *      response) override;
-    ::grpc::Status longClick(::grpc::ServerContext *  context,
+                         ::aurum::RspClick *response) override;
+    ::grpc::Status longClick(::grpc::ServerContext *context,
                              const ::aurum::ReqClick *request,
-                             ::aurum::RspClick *      response) override;
-    ::grpc::Status flick(::grpc::ServerContext *  context,
+                             ::aurum::RspClick *response) override;
+    ::grpc::Status flick(::grpc::ServerContext *context,
                          const ::aurum::ReqFlick *request,
-                         ::aurum::RspFlick *      response) override;
+                         ::aurum::RspFlick *response) override;
 
-    ::grpc::Status touchDown(::grpc::ServerContext *      context,
+    ::grpc::Status touchDown(::grpc::ServerContext *context,
                              const ::aurum::ReqTouchDown *request,
-                             ::aurum::RspTouchDown *      response) override;
-    ::grpc::Status touchUp(::grpc::ServerContext *    context,
+                             ::aurum::RspTouchDown *response) override;
+    ::grpc::Status touchUp(::grpc::ServerContext *context,
                            const ::aurum::ReqTouchUp *request,
-                           ::aurum::RspTouchUp *      response) override;
-    ::grpc::Status touchMove(::grpc::ServerContext *      context,
+                           ::aurum::RspTouchUp *response) override;
+    ::grpc::Status touchMove(::grpc::ServerContext *context,
                              const ::aurum::ReqTouchMove *request,
-                             ::aurum::RspTouchMove *      response) override;
-    ::grpc::Status getDeviceTime(::grpc::ServerContext *          context,
+                             ::aurum::RspTouchMove *response) override;
+    ::grpc::Status getDeviceTime(::grpc::ServerContext *context,
                                  const ::aurum::ReqGetDeviceTime *request,
                                  ::aurum::RspGetDeviceTime *response) override;
-    ::grpc::Status getLocation(::grpc::ServerContext *        context,
+    ::grpc::Status getLocation(::grpc::ServerContext *context,
                                const ::aurum::ReqGetLocation *request,
                                ::aurum::RspGetLocation *response) override;
     ::grpc::Status sendKey(::grpc::ServerContext *context,
                            const ::aurum::ReqKey *request,
-                           ::aurum::RspKey *      response) override;
+                           ::aurum::RspKey *response) override;
 
     ::grpc::Status takeScreenshot(::grpc::ServerContext *context,
-                            const ::aurum::ReqTakeScreenshot *                 request,
-                            ::grpc::ServerWriter< ::aurum::RspTakeScreenshot>* writer) override;
+                            const ::aurum::ReqTakeScreenshot *request,
+                            ::grpc::ServerWriter< ::aurum::RspTakeScreenshot> *writer) override;
 
     ::grpc::Status dumpObjectTree(::grpc::ServerContext *context,
                             const ::aurum::ReqDumpObjectTree *request,
-                            ::aurum::RspDumpObjectTree *      response) override;
+                            ::aurum::RspDumpObjectTree *response) override;
 };
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h
index 5a9391c..21fc670 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h
@@ -9,11 +9,11 @@
 
 class ClearCommand : public Command {
 private:
-    const ::aurum::ReqClear* mRequest;
-    ::aurum::RspClear*       mResponse;
+    const ::aurum::ReqClear *mRequest;
+    ::aurum::RspClear *mResponse;
 
 public:
-    ClearCommand(const ::aurum::ReqClear* request, ::aurum::RspClear* response);
+    ClearCommand(const ::aurum::ReqClear *request, ::aurum::RspClear *response);
     ::grpc::Status execute() override;
 
 protected:
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h
index aafaf97..9d62d34 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h
@@ -8,13 +8,13 @@
 #include "config.h"
 class ClickCommand : public Command {
 protected:
-    const ::aurum::ReqClick* mRequest;
-    ::aurum::RspClick*       mResponse;
+    const ::aurum::ReqClick *mRequest;
+    ::aurum::RspClick *mResponse;
 
 public:
-    ClickCommand(const ::aurum::ReqClick* request, ::aurum::RspClick* response);
+    ClickCommand(const ::aurum::ReqClick *request, ::aurum::RspClick *response);
     ::grpc::Status execute() override;
-    static std::unique_ptr<ClickCommand> createCommand(const ::aurum::ReqClick* request, ::aurum::RspClick* response);
+    static std::unique_ptr<ClickCommand> createCommand(const ::aurum::ReqClick *request, ::aurum::RspClick *response);
 };
 
 class ClickElementCommand : public ClickCommand {
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/CloseAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/CloseAppCommand.h
index 81bc6c4..a3074ce 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/CloseAppCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/CloseAppCommand.h
@@ -9,12 +9,12 @@
 
 class CloseAppCommand : public Command {
 private:
-    const ::aurum::ReqCloseApp* mRequest;
-    ::aurum::RspCloseApp*       mResponse;
+    const ::aurum::ReqCloseApp *mRequest;
+    ::aurum::RspCloseApp *mResponse;
 
 public:
-    CloseAppCommand(const ::aurum::ReqCloseApp* request,
-                    ::aurum::RspCloseApp*       response);
+    CloseAppCommand(const ::aurum::ReqCloseApp *request,
+                    ::aurum::RspCloseApp *response);
     ::grpc::Status execute() override;
     ::grpc::Status executePost() override;
 };
\ No newline at end of file
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/DumpObjectTreeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/DumpObjectTreeCommand.h
index 1e320fa..e09bd7d 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/DumpObjectTreeCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/DumpObjectTreeCommand.h
@@ -10,15 +10,15 @@
 
 class DumpObjectTreeCommand: public Command {
 protected:
-    const ::aurum::ReqDumpObjectTree* mRequest;
-    ::aurum::RspDumpObjectTree*       mResponse;
+    const ::aurum::ReqDumpObjectTree *mRequest;
+    ::aurum::RspDumpObjectTree *mResponse;
 
 protected:
-    ObjectMapper* mObjMap;
+    ObjectMapper *mObjMap;
 
 public:
-    DumpObjectTreeCommand(const ::aurum::ReqDumpObjectTree* request,
-                       ::aurum::RspDumpObjectTree*       response);
+    DumpObjectTreeCommand(const ::aurum::ReqDumpObjectTree *request,
+                       ::aurum::RspDumpObjectTree *response);
     ::grpc::Status execute() override;
 
 private:
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/FindElementCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/FindElementCommand.h
index cc52270..202ede2 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/FindElementCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/FindElementCommand.h
@@ -9,15 +9,15 @@
 
 class FindElementCommand : public Command {
 protected:
-    const ::aurum::ReqFindElement* mRequest;
-    ::aurum::RspFindElement*       mResponse;
+    const ::aurum::ReqFindElement *mRequest;
+    ::aurum::RspFindElement *mResponse;
 
 protected:
-    ObjectMapper* mObjMap;
+    ObjectMapper *mObjMap;
 
 public:
-    FindElementCommand(const ::aurum::ReqFindElement* request,
-                       ::aurum::RspFindElement*       response);
+    FindElementCommand(const ::aurum::ReqFindElement *request,
+                       ::aurum::RspFindElement *response);
     ::grpc::Status execute() override;
 protected:
     virtual std::shared_ptr<ISearchable> getSearchableTop(void);
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h
index 1a6d5c5..ac3f177 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h
@@ -9,12 +9,12 @@
 
 class FlickCommand : public Command {
 private:
-    const ::aurum::ReqFlick* mRequest;
-    ::aurum::RspFlick*       mResponse;
+    const ::aurum::ReqFlick *mRequest;
+    ::aurum::RspFlick *mResponse;
     const unsigned int MINIMUM_TOUCHEVENT_INTV_MS = 25;
 
 public:
-    FlickCommand(const ::aurum::ReqFlick* request, ::aurum::RspFlick* response);
+    FlickCommand(const ::aurum::ReqFlick *request, ::aurum::RspFlick *response);
     ;
     ::grpc::Status execute() override;
 };
\ No newline at end of file
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h
index 7bdd8a6..4e94c54 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h
@@ -9,12 +9,12 @@
 
 class GetAppInfoCommand : public Command {
 private:
-    const ::aurum::ReqGetAppInfo* mRequest;
-    ::aurum::RspGetAppInfo*       mResponse;
+    const ::aurum::ReqGetAppInfo *mRequest;
+    ::aurum::RspGetAppInfo *mResponse;
 
 public:
-    GetAppInfoCommand(const ::aurum::ReqGetAppInfo* request,
-                      ::aurum::RspGetAppInfo*       response);
+    GetAppInfoCommand(const ::aurum::ReqGetAppInfo *request,
+                      ::aurum::RspGetAppInfo *response);
     ;
     ::grpc::Status execute() override;
 };
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetAttributeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetAttributeCommand.h
index f1e3d7b..749156b 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/GetAttributeCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/GetAttributeCommand.h
@@ -9,16 +9,16 @@
 
 class GetAttributeCommand : public Command {
 protected:
-    const ::aurum::ReqGetAttribute* mRequest;
-    ::aurum::RspGetAttribute*       mResponse;
-    ObjectMapper* mObjMap;
+    const ::aurum::ReqGetAttribute *mRequest;
+    ::aurum::RspGetAttribute *mResponse;
+    ObjectMapper *mObjMap;
 
 public:
-    GetAttributeCommand(const ::aurum::ReqGetAttribute* request,
-                        ::aurum::RspGetAttribute*       response);
+    GetAttributeCommand(const ::aurum::ReqGetAttribute *request,
+                        ::aurum::RspGetAttribute *response);
     ::grpc::Status execute() override;
-    static std::unique_ptr<GetAttributeCommand> createCommand(const ::aurum::ReqGetAttribute* request,
-                                                              ::aurum::RspGetAttribute*       response);
+    static std::unique_ptr<GetAttributeCommand> createCommand(const ::aurum::ReqGetAttribute *request,
+                                                              ::aurum::RspGetAttribute *response);
 };
 
 class GetVisibleAttributeCommand : public GetAttributeCommand {
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h
index a366961..d261d2c 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h
@@ -9,12 +9,12 @@
 
 class GetDeviceTimeCommand : public Command {
 private:
-    const ::aurum::ReqGetDeviceTime* mRequest;
-    ::aurum::RspGetDeviceTime*       mResponse;
+    const ::aurum::ReqGetDeviceTime *mRequest;
+    ::aurum::RspGetDeviceTime *mResponse;
 
 public:
-    GetDeviceTimeCommand(const ::aurum::ReqGetDeviceTime* request,
-                         ::aurum::RspGetDeviceTime*       response);
+    GetDeviceTimeCommand(const ::aurum::ReqGetDeviceTime *request,
+                         ::aurum::RspGetDeviceTime *response);
     ;
     ::grpc::Status execute() override;
 };
\ No newline at end of file
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h
index 1591233..e153a43 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h
@@ -9,12 +9,12 @@
 
 class GetLocationCommand : public Command {
 private:
-    const ::aurum::ReqGetLocation* mRequest;
-    ::aurum::RspGetLocation*       mResponse;
+    const ::aurum::ReqGetLocation *mRequest;
+    ::aurum::RspGetLocation *mResponse;
 
 public:
-    GetLocationCommand(const ::aurum::ReqGetLocation* request,
-                       ::aurum::RspGetLocation*       response);
+    GetLocationCommand(const ::aurum::ReqGetLocation *request,
+                       ::aurum::RspGetLocation *response);
     ;
     ::grpc::Status execute() override;
 };
\ No newline at end of file
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h
index eae1ceb..ad2a528 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h
@@ -9,12 +9,12 @@
 
 class GetSizeCommand : public Command {
 private:
-    const ::aurum::ReqGetSize* mRequest;
-    ::aurum::RspGetSize*       mResponse;
+    const ::aurum::ReqGetSize *mRequest;
+    ::aurum::RspGetSize *mResponse;
 
 public:
-    GetSizeCommand(const ::aurum::ReqGetSize* request,
-                   ::aurum::RspGetSize*       response);
+    GetSizeCommand(const ::aurum::ReqGetSize *request,
+                   ::aurum::RspGetSize *response);
     ;
     ::grpc::Status execute() override;
 };
\ No newline at end of file
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h
index 09617ec..22ab0db 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h
@@ -9,12 +9,12 @@
 
 class GetValueCommand : public Command {
 private:
-    const ::aurum::ReqGetValue* mRequest;
-    ::aurum::RspGetValue*       mResponse;
+    const ::aurum::ReqGetValue *mRequest;
+    ::aurum::RspGetValue *mResponse;
 
 public:
-    GetValueCommand(const ::aurum::ReqGetValue* request,
-                    ::aurum::RspGetValue*       response);
+    GetValueCommand(const ::aurum::ReqGetValue *request,
+                    ::aurum::RspGetValue *response);
     ;
     ::grpc::Status execute() override;
 };
\ No newline at end of file
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/InstallAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/InstallAppCommand.h
index 7ef0c32..1c2e6b2 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/InstallAppCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/InstallAppCommand.h
@@ -9,12 +9,12 @@
 
 class InstallAppCommand : public Command {
 private:
-    ::grpc::ServerReader< ::aurum::ReqInstallApp>* mRequest;
-    ::aurum::RspInstallApp*                        mResponse;
+    ::grpc::ServerReader< ::aurum::ReqInstallApp> *mRequest;
+    ::aurum::RspInstallApp *mResponse;
 
 public:
-    InstallAppCommand(::grpc::ServerReader< ::aurum::ReqInstallApp>* request,
-                      ::aurum::RspInstallApp*                        response);
+    InstallAppCommand(::grpc::ServerReader< ::aurum::ReqInstallApp> *request,
+                      ::aurum::RspInstallApp *response);
     ::grpc::Status execute() override;
     ::grpc::Status executePost() override;
 };
\ No newline at end of file
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h
index a8cc9e4..50ff081 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h
@@ -9,12 +9,12 @@
 
 class KillServerCommand : public Command {
 private:
-    const ::aurum::ReqEmpty* mRequest;
-    ::aurum::RspEmpty*       mResponse;
+    const ::aurum::ReqEmpty *mRequest;
+    ::aurum::RspEmpty *mResponse;
 
 public:
-    KillServerCommand(const ::aurum::ReqEmpty* request,
-                      ::aurum::RspEmpty*       response);
+    KillServerCommand(const ::aurum::ReqEmpty *request,
+                      ::aurum::RspEmpty *response);
     ;
     ::grpc::Status execute() override;
 };
\ No newline at end of file
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/LaunchAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/LaunchAppCommand.h
index 9702917..a08d30c 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/LaunchAppCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/LaunchAppCommand.h
@@ -9,12 +9,12 @@
 
 class LaunchAppCommand : public Command {
 private:
-    const ::aurum::ReqLaunchApp* mRequest;
-    ::aurum::RspLaunchApp*       mResponse;
+    const ::aurum::ReqLaunchApp *mRequest;
+    ::aurum::RspLaunchApp *mResponse;
 
 public:
-    LaunchAppCommand(const ::aurum::ReqLaunchApp* request,
-                     ::aurum::RspLaunchApp*       response);
+    LaunchAppCommand(const ::aurum::ReqLaunchApp *request,
+                     ::aurum::RspLaunchApp *response);
     ::grpc::Status execute() override;
     ::grpc::Status executePost() override;
 };
\ No newline at end of file
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/LongClickCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/LongClickCommand.h
index 12fa17f..5b25ab9 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/LongClickCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/LongClickCommand.h
@@ -9,12 +9,12 @@
 
 class LongClickCommand : public Command {
 private:
-    const ::aurum::ReqClick* mRequest;
-    ::aurum::RspClick*       mResponse;
+    const ::aurum::ReqClick *mRequest;
+    ::aurum::RspClick *mResponse;
 
 public:
-    LongClickCommand(const ::aurum::ReqClick* request,
-                     ::aurum::RspClick*       response);
+    LongClickCommand(const ::aurum::ReqClick *request,
+                     ::aurum::RspClick *response);
     ::grpc::Status execute() override;
 private:
     const static unsigned int LOGNCLICK_INTERVAL = 50;
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h
index f45ff5a..4351629 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h
@@ -9,12 +9,12 @@
 
 class RemoveAppCommand : public Command {
 private:
-    const ::aurum::ReqRemoveApp* mRequest;
-    ::aurum::RspRemoveApp*       mResponse;
+    const ::aurum::ReqRemoveApp *mRequest;
+    ::aurum::RspRemoveApp *mResponse;
 
 public:
-    RemoveAppCommand(const ::aurum::ReqRemoveApp* request,
-                     ::aurum::RspRemoveApp*       response);
+    RemoveAppCommand(const ::aurum::ReqRemoveApp *request,
+                     ::aurum::RspRemoveApp *response);
     ;
     ::grpc::Status execute() override;
     ::grpc::Status executePost() override;
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h
index 1a7678a..4efb6d9 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h
@@ -9,10 +9,10 @@
 
 class SendKeyCommand : public Command {
 private:
-    const ::aurum::ReqKey* mRequest;
-    ::aurum::RspKey*       mResponse;
+    const ::aurum::ReqKey *mRequest;
+    ::aurum::RspKey *mResponse;
 
 public:
-    SendKeyCommand(const ::aurum::ReqKey* request, ::aurum::RspKey* response);
+    SendKeyCommand(const ::aurum::ReqKey *request, ::aurum::RspKey *response);
     ::grpc::Status execute() override;
 };
\ No newline at end of file
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/SetValueCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/SetValueCommand.h
index 2bc5dd5..7a37943 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/SetValueCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/SetValueCommand.h
@@ -9,11 +9,11 @@
 
 class SetValueCommand : public Command {
 private:
-    const ::aurum::ReqSetValue* mRequest;
-    ::aurum::RspSetValue*       mResponse;
+    const ::aurum::ReqSetValue *mRequest;
+    ::aurum::RspSetValue *mResponse;
 
 public:
-    SetValueCommand(const ::aurum::ReqSetValue* request,
-                    ::aurum::RspSetValue*       response);
+    SetValueCommand(const ::aurum::ReqSetValue *request,
+                    ::aurum::RspSetValue *response);
     ::grpc::Status execute() override;
 };
\ No newline at end of file
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/TakeScreenshotCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/TakeScreenshotCommand.h
index 41e0a8e..d67c889 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/TakeScreenshotCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/TakeScreenshotCommand.h
@@ -9,11 +9,11 @@
 
 class TakeScreenshotCommand : public Command {
 private:
-    const ::aurum::ReqTakeScreenshot*                  mRequest;
-    ::grpc::ServerWriter< ::aurum::RspTakeScreenshot>* mWriter;
+    const ::aurum::ReqTakeScreenshot *mRequest;
+    ::grpc::ServerWriter< ::aurum::RspTakeScreenshot> *mWriter;
 
 public:
-    TakeScreenshotCommand(const ::aurum::ReqTakeScreenshot*                  request,
-                          ::grpc::ServerWriter< ::aurum::RspTakeScreenshot>* writer);
+    TakeScreenshotCommand(const ::aurum::ReqTakeScreenshot *request,
+                          ::grpc::ServerWriter< ::aurum::RspTakeScreenshot> *writer);
     ::grpc::Status execute() override;
 };
\ No newline at end of file
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/TouchDownCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/TouchDownCommand.h
index acd0f1b..b9c6b84 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/TouchDownCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/TouchDownCommand.h
@@ -9,11 +9,11 @@
 
 class TouchDownCommand : public Command {
 private:
-    const ::aurum::ReqTouchDown* mRequest;
-    ::aurum::RspTouchDown*       mResponse;
+    const ::aurum::ReqTouchDown *mRequest;
+    ::aurum::RspTouchDown *mResponse;
 
 public:
-    TouchDownCommand(const ::aurum::ReqTouchDown* request,
-                     ::aurum::RspTouchDown*       response);
+    TouchDownCommand(const ::aurum::ReqTouchDown *request,
+                     ::aurum::RspTouchDown *response);
     ::grpc::Status execute() override;
 };
\ No newline at end of file
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/TouchMoveCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/TouchMoveCommand.h
index 2182e3b..b8f6e01 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/TouchMoveCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/TouchMoveCommand.h
@@ -9,11 +9,11 @@
 
 class TouchMoveCommand : public Command {
 private:
-    const ::aurum::ReqTouchMove* mRequest;
-    ::aurum::RspTouchMove*       mResponse;
+    const ::aurum::ReqTouchMove *mRequest;
+    ::aurum::RspTouchMove *mResponse;
 
 public:
-    TouchMoveCommand(const ::aurum::ReqTouchMove* request,
-                     ::aurum::RspTouchMove*       response);
+    TouchMoveCommand(const ::aurum::ReqTouchMove *request,
+                     ::aurum::RspTouchMove *response);
     ::grpc::Status execute() override;
 };
\ No newline at end of file
diff --git a/org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h
index ed746ac..9210b31 100644
--- a/org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h
+++ b/org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h
@@ -9,11 +9,11 @@
 
 class TouchUpCommand : public Command {
 private:
-    const ::aurum::ReqTouchUp* mRequest;
-    ::aurum::RspTouchUp*       mResponse;
+    const ::aurum::ReqTouchUp *mRequest;
+    ::aurum::RspTouchUp *mResponse;
 
 public:
-    TouchUpCommand(const ::aurum::ReqTouchUp* request,
-                   ::aurum::RspTouchUp*       response);
+    TouchUpCommand(const ::aurum::ReqTouchUp *request,
+                   ::aurum::RspTouchUp *response);
     ::grpc::Status execute() override;
 };
\ No newline at end of file
diff --git a/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc b/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc
index bf12ff8..586bac5 100644
--- a/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc
+++ b/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc
@@ -17,7 +17,7 @@ aurumServiceImpl::aurumServiceImpl()
     AccessibleWatcher::getInstance();
 }
 
-::grpc::Status aurumServiceImpl::execute(Command* cmd, bool clean)
+::grpc::Status aurumServiceImpl::execute(Command *cmd, bool clean)
 {
     std::unique_ptr<PreCommand>  proxyPreCmd  = std::make_unique<PreCommand>(cmd);
     std::unique_ptr<PostCommand> proxyPostCmd = std::make_unique<PostCommand>(proxyPreCmd.get());
@@ -32,177 +32,177 @@ aurumServiceImpl::~aurumServiceImpl()
 }
 
 ::grpc::Status aurumServiceImpl::aurumServiceImpl::killServer(
-    ::grpc::ServerContext* context, const ::aurum::ReqEmpty* request,
-    ::aurum::RspEmpty* response)
+    ::grpc::ServerContext *context, const ::aurum::ReqEmpty *request,
+    ::aurum::RspEmpty *response)
 {
     std::unique_ptr<KillServerCommand> cmd = std::make_unique<KillServerCommand>(request, response);
     return execute(cmd.get(), false);
 }
 
 ::grpc::Status aurumServiceImpl::aurumServiceImpl::findElement(
-    ::grpc::ServerContext* context, const ::aurum::ReqFindElement* request,
-    ::aurum::RspFindElement* response)
+    ::grpc::ServerContext *context, const ::aurum::ReqFindElement *request,
+    ::aurum::RspFindElement *response)
 {
     std::unique_ptr<FindElementCommand> cmd = std::make_unique<FindElementCommand>(request, response);
     return execute(cmd.get(), true);
 }
 
 ::grpc::Status aurumServiceImpl::aurumServiceImpl::click(
-    ::grpc::ServerContext* context, const ::aurum::ReqClick* request,
-    ::aurum::RspClick* response)
+    ::grpc::ServerContext *context, const ::aurum::ReqClick *request,
+    ::aurum::RspClick *response)
 {
     std::unique_ptr<ClickCommand> cmd = ClickCommand::createCommand(request, response);
     return execute(cmd.get(), true);
 }
 
-::grpc::Status aurumServiceImpl::getValue(::grpc::ServerContext*      context,
-                                          const ::aurum::ReqGetValue* request,
-                                          ::aurum::RspGetValue*       response)
+::grpc::Status aurumServiceImpl::getValue(::grpc::ServerContext *context,
+                                          const ::aurum::ReqGetValue *request,
+                                          ::aurum::RspGetValue *response)
 {
     std::unique_ptr<GetValueCommand> cmd = std::make_unique<GetValueCommand>(request, response);
     return execute(cmd.get(), true);
 }
 
-::grpc::Status aurumServiceImpl::setValue(::grpc::ServerContext*      context,
-                                          const ::aurum::ReqSetValue* request,
-                                          ::aurum::RspSetValue*       response)
+::grpc::Status aurumServiceImpl::setValue(::grpc::ServerContext *context,
+                                          const ::aurum::ReqSetValue *request,
+                                          ::aurum::RspSetValue *response)
 {
     std::unique_ptr<SetValueCommand> cmd = std::make_unique<SetValueCommand>(request, response);
     return execute(cmd.get(), true);
 }
 
 ::grpc::Status aurumServiceImpl::getAttribute(
-    ::grpc::ServerContext* context, const ::aurum::ReqGetAttribute* request,
-    ::aurum::RspGetAttribute* response)
+    ::grpc::ServerContext *context, const ::aurum::ReqGetAttribute *request,
+    ::aurum::RspGetAttribute *response)
 {
     std::unique_ptr<GetAttributeCommand> cmd = GetAttributeCommand::createCommand(request, response);
     return execute(cmd.get(), true);
 }
 
-::grpc::Status aurumServiceImpl::getSize(::grpc::ServerContext*     context,
-                                         const ::aurum::ReqGetSize* request,
-                                         ::aurum::RspGetSize*       response)
+::grpc::Status aurumServiceImpl::getSize(::grpc::ServerContext *context,
+                                         const ::aurum::ReqGetSize *request,
+                                         ::aurum::RspGetSize *response)
 {
     std::unique_ptr<GetSizeCommand> cmd = std::make_unique<GetSizeCommand>(request, response);
     return execute(cmd.get(), true);
 }
 
-::grpc::Status aurumServiceImpl::clear(::grpc::ServerContext*   context,
-                                       const ::aurum::ReqClear* request,
-                                       ::aurum::RspClear*       response)
+::grpc::Status aurumServiceImpl::clear(::grpc::ServerContext *context,
+                                       const ::aurum::ReqClear *request,
+                                       ::aurum::RspClear *response)
 {
     std::unique_ptr<ClearCommand> cmd = std::make_unique<ClearCommand>(request, response);
     return execute(cmd.get(), true);
 }
 
 ::grpc::Status aurumServiceImpl::installApp(
-    ::grpc::ServerContext*                         context,
-    ::grpc::ServerReader< ::aurum::ReqInstallApp>* request,
-    ::aurum::RspInstallApp*                        response)
+    ::grpc::ServerContext *context,
+    ::grpc::ServerReader< ::aurum::ReqInstallApp> *request,
+    ::aurum::RspInstallApp *response)
 {
     std::unique_ptr<InstallAppCommand> cmd = std::make_unique<InstallAppCommand>(request, response);
     return execute(cmd.get(), false);
 }
 
-::grpc::Status aurumServiceImpl::removeApp(::grpc::ServerContext*       context,
-                                           const ::aurum::ReqRemoveApp* request,
-                                           ::aurum::RspRemoveApp* response)
+::grpc::Status aurumServiceImpl::removeApp(::grpc::ServerContext *context,
+                                           const ::aurum::ReqRemoveApp *request,
+                                           ::aurum::RspRemoveApp *response)
 {
     std::unique_ptr<RemoveAppCommand> cmd = std::make_unique<RemoveAppCommand>(request, response);
     return execute(cmd.get(), false);
 }
 
 ::grpc::Status aurumServiceImpl::getAppInfo(
-    ::grpc::ServerContext* context, const ::aurum::ReqGetAppInfo* request,
-    ::aurum::RspGetAppInfo* response)
+    ::grpc::ServerContext *context, const ::aurum::ReqGetAppInfo *request,
+    ::aurum::RspGetAppInfo *response)
 {
     std::unique_ptr<GetAppInfoCommand> cmd = std::make_unique<GetAppInfoCommand>(request, response);
     return execute(cmd.get(), false);
 }
 
-::grpc::Status aurumServiceImpl::launchApp(::grpc::ServerContext*       context,
-                                           const ::aurum::ReqLaunchApp* request,
-                                           ::aurum::RspLaunchApp* response)
+::grpc::Status aurumServiceImpl::launchApp(::grpc::ServerContext *context,
+                                           const ::aurum::ReqLaunchApp *request,
+                                           ::aurum::RspLaunchApp *response)
 {
     std::unique_ptr<LaunchAppCommand> cmd = std::make_unique<LaunchAppCommand>(request, response);
     return execute(cmd.get(), false);
 }
 
-::grpc::Status aurumServiceImpl::closeApp(::grpc::ServerContext*      context,
-                                          const ::aurum::ReqCloseApp* request,
-                                          ::aurum::RspCloseApp*       response)
+::grpc::Status aurumServiceImpl::closeApp(::grpc::ServerContext *context,
+                                          const ::aurum::ReqCloseApp *request,
+                                          ::aurum::RspCloseApp *response)
 {
     std::unique_ptr<CloseAppCommand> cmd = std::make_unique<CloseAppCommand>(request, response);
     return execute(cmd.get(), false);
 }
 
-::grpc::Status aurumServiceImpl::touchDown(::grpc::ServerContext*       context,
-                                           const ::aurum::ReqTouchDown* request,
-                                           ::aurum::RspTouchDown* response)
+::grpc::Status aurumServiceImpl::touchDown(::grpc::ServerContext *context,
+                                           const ::aurum::ReqTouchDown *request,
+                                           ::aurum::RspTouchDown *response)
 {
     std::unique_ptr<TouchDownCommand> cmd = std::make_unique<TouchDownCommand>(request, response);
     return execute(cmd.get(), false);
 }
 
-::grpc::Status aurumServiceImpl::touchUp(::grpc::ServerContext*     context,
-                                         const ::aurum::ReqTouchUp* request,
-                                         ::aurum::RspTouchUp*       response)
+::grpc::Status aurumServiceImpl::touchUp(::grpc::ServerContext *context,
+                                         const ::aurum::ReqTouchUp *request,
+                                         ::aurum::RspTouchUp *response)
 {
     std::unique_ptr<TouchUpCommand> cmd = std::make_unique<TouchUpCommand>(request, response);
     return execute(cmd.get(), false);
 }
 
-::grpc::Status aurumServiceImpl::touchMove(::grpc::ServerContext*       context,
-                                           const ::aurum::ReqTouchMove* request,
-                                           ::aurum::RspTouchMove* response)
+::grpc::Status aurumServiceImpl::touchMove(::grpc::ServerContext *context,
+                                           const ::aurum::ReqTouchMove *request,
+                                           ::aurum::RspTouchMove *response)
 {
     std::unique_ptr<TouchMoveCommand> cmd = std::make_unique<TouchMoveCommand>(request, response);
     return execute(cmd.get(), false);
 }
 
-::grpc::Status aurumServiceImpl::longClick(::grpc::ServerContext*   context,
-                                           const ::aurum::ReqClick* request,
-                                           ::aurum::RspClick*       response)
+::grpc::Status aurumServiceImpl::longClick(::grpc::ServerContext *context,
+                                           const ::aurum::ReqClick *request,
+                                           ::aurum::RspClick * response)
 {
     std::unique_ptr<LongClickCommand> cmd = std::make_unique<LongClickCommand>(request, response);
     return execute(cmd.get(), false);
 }
 
-::grpc::Status aurumServiceImpl::flick(::grpc::ServerContext*   context,
-                                       const ::aurum::ReqFlick* request,
-                                       ::aurum::RspFlick*       response)
+::grpc::Status aurumServiceImpl::flick(::grpc::ServerContext *context,
+                                       const ::aurum::ReqFlick *request,
+                                       ::aurum::RspFlick *response)
 {
     std::unique_ptr<FlickCommand> cmd = std::make_unique<FlickCommand>(request, response);
     return execute(cmd.get(), false);
 }
 
 ::grpc::Status aurumServiceImpl::getDeviceTime(
-    ::grpc::ServerContext* context, const ::aurum::ReqGetDeviceTime* request,
-    ::aurum::RspGetDeviceTime* response)
+    ::grpc::ServerContext *context, const ::aurum::ReqGetDeviceTime *request,
+    ::aurum::RspGetDeviceTime *response)
 {
     std::unique_ptr<GetDeviceTimeCommand> cmd = std::make_unique<GetDeviceTimeCommand>(request, response);
     return execute(cmd.get(), false);
 }
 
 ::grpc::Status aurumServiceImpl::getLocation(
-    ::grpc::ServerContext* context, const ::aurum::ReqGetLocation* request,
-    ::aurum::RspGetLocation* response)
+    ::grpc::ServerContext *context, const ::aurum::ReqGetLocation *request,
+    ::aurum::RspGetLocation *response)
 {
     std::unique_ptr<GetLocationCommand> cmd = std::make_unique<GetLocationCommand>(request, response);
     return execute(cmd.get(), false);
 }
 
-::grpc::Status aurumServiceImpl::sendKey(::grpc::ServerContext* context,
-                                         const ::aurum::ReqKey* request,
-                                         ::aurum::RspKey*       response)
+::grpc::Status aurumServiceImpl::sendKey(::grpc::ServerContext *context,
+                                         const ::aurum::ReqKey *request,
+                                         ::aurum::RspKey *response)
 {
     std::unique_ptr<SendKeyCommand> cmd = std::make_unique<SendKeyCommand>(request, response);
     return execute(cmd.get(), false);
 }
 
-::grpc::Status aurumServiceImpl::takeScreenshot(::grpc::ServerContext* context,
-                                                const ::aurum::ReqTakeScreenshot* request,
-                                                ::grpc::ServerWriter< ::aurum::RspTakeScreenshot>* writer)
+::grpc::Status aurumServiceImpl::takeScreenshot(::grpc::ServerContext *context,
+                                                const ::aurum::ReqTakeScreenshot *request,
+                                                ::grpc::ServerWriter< ::aurum::RspTakeScreenshot> *writer)
 {
     std::unique_ptr<TakeScreenshotCommand> cmd = std::make_unique<TakeScreenshotCommand>(request, writer);
     return execute(cmd.get(), false);
@@ -210,7 +210,7 @@ aurumServiceImpl::~aurumServiceImpl()
 
 ::grpc::Status aurumServiceImpl::dumpObjectTree(::grpc::ServerContext *context,
                            const ::aurum::ReqDumpObjectTree *request,
-                           ::aurum::RspDumpObjectTree *      response)
+                           ::aurum::RspDumpObjectTree *response)
 {
     std::unique_ptr<DumpObjectTreeCommand> cmd = std::make_unique<DumpObjectTreeCommand>(request, response);
     return execute(cmd.get(), true);
diff --git a/org.tizen.aurum-bootstrap/src/BootstrapServer.cc b/org.tizen.aurum-bootstrap/src/BootstrapServer.cc
index 0edd35d..7255afd 100644
--- a/org.tizen.aurum-bootstrap/src/BootstrapServer.cc
+++ b/org.tizen.aurum-bootstrap/src/BootstrapServer.cc
@@ -15,14 +15,14 @@ using namespace grpc;
 
 typedef struct _ServiceContext {
     GMainLoop *loop;
-    GThread   *thread;
+    GThread *thread;
     std::unique_ptr<Server> server;
 } ServiceContext;
 
 static gpointer
 _grpc_thread_func (gpointer data)
 {
-    ServiceContext *ctx = (ServiceContext*)data;
+    ServiceContext *ctx = (ServiceContext *)data;
     std::string binding("0.0.0.0:50051");
     aurumServiceImpl service;
     ServerBuilder builder;
@@ -38,7 +38,7 @@ _grpc_thread_func (gpointer data)
 
 static bool _service_app_create(void *data)
 {
-    ServiceContext *ctx = (ServiceContext*)data;
+    ServiceContext *ctx = (ServiceContext *)data;
 
     ctx->loop = g_main_loop_new ( NULL , FALSE );
     ctx->thread = g_thread_new("grpc_thread", _grpc_thread_func, ctx);
@@ -48,7 +48,7 @@ static bool _service_app_create(void *data)
 
 static void _service_app_terminate(void *data)
 {
-    ServiceContext *ctx = (ServiceContext*)data;
+    ServiceContext *ctx = (ServiceContext *)data;
     ctx->server->Shutdown();
     g_main_loop_unref(ctx->loop);
     g_thread_join(ctx->thread);
@@ -56,7 +56,7 @@ static void _service_app_terminate(void *data)
 
 static void _service_app_control(app_control_h app_control, void *data)
 {
-    ServiceContext *ctx = (ServiceContext*)data;
+    ServiceContext *ctx = (ServiceContext *)data;
     if (!ctx)
         LOGE("Service context is empty!");
 }
diff --git a/org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc
index 3b80401..c48bcdb 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc
@@ -2,8 +2,8 @@
 #include "ClearCommand.h"
 #include <string>
 
-ClearCommand::ClearCommand(const ::aurum::ReqClear* request,
-                           ::aurum::RspClear*       response)
+ClearCommand::ClearCommand(const ::aurum::ReqClear *request,
+                           ::aurum::RspClear *response)
     : mRequest{request}, mResponse{response}
 {
 }
@@ -25,7 +25,7 @@ bool ClearCommand::hasHintText(std::shared_ptr<UiObject> obj)
 ::grpc::Status ClearCommand::execute()
 {
     LOGI("Clear --------------- ");
-    ObjectMapper* mObjMap = ObjectMapper::getInstance();
+    ObjectMapper *mObjMap = ObjectMapper::getInstance();
     std::shared_ptr<UiObject> obj = mObjMap->getElement(mRequest->elementid());
 
     if (obj) {
@@ -44,4 +44,4 @@ bool ClearCommand::hasHintText(std::shared_ptr<UiObject> obj)
     }
 
     return grpc::Status::OK;
-}
\ No newline at end of file
+}
diff --git a/org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc
index 0b74527..cc7a30e 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc
@@ -3,8 +3,8 @@
 #include "UiObject.h"
 #include "UiDevice.h"
 
-ClickCommand::ClickCommand(const ::aurum::ReqClick* request,
-                           ::aurum::RspClick*       response)
+ClickCommand::ClickCommand(const ::aurum::ReqClick *request,
+                           ::aurum::RspClick *response)
     : mRequest{request}, mResponse{response}
 {
 }
@@ -14,7 +14,7 @@ ClickCommand::ClickCommand(const ::aurum::ReqClick* request,
    return grpc::Status::CANCELLED;
 }
 
-std::unique_ptr<ClickCommand> ClickCommand::createCommand(const ::aurum::ReqClick* request, ::aurum::RspClick* response)
+std::unique_ptr<ClickCommand> ClickCommand::createCommand(const ::aurum::ReqClick *request, ::aurum::RspClick *response)
 {
     ::aurum::ReqClick_RequestType type = request->type();
 
@@ -30,7 +30,7 @@ std::unique_ptr<ClickCommand> ClickCommand::createCommand(const ::aurum::ReqClic
 
 ::grpc::Status ClickElementCommand::execute()
 {
-    ObjectMapper* mObjMap = ObjectMapper::getInstance();
+    ObjectMapper *mObjMap = ObjectMapper::getInstance();
     std::shared_ptr<UiObject> obj = mObjMap->getElement(mRequest->elementid());
     LOGI("ClickElementCommand execute %p", obj.get());
 
@@ -55,7 +55,7 @@ std::unique_ptr<ClickCommand> ClickCommand::createCommand(const ::aurum::ReqClic
 
 ::grpc::Status ClickAtspiCommand::execute()
 {
-    ObjectMapper* mObjMap = ObjectMapper::getInstance();
+    ObjectMapper *mObjMap = ObjectMapper::getInstance();
     std::shared_ptr<UiObject> obj = mObjMap->getElement(mRequest->elementid());
 
     LOGI("ClickAtspiCommand execute %p", obj.get());
diff --git a/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc
index e1d0b51..c1073f4 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc
@@ -6,8 +6,8 @@
 #include <app_manager_extension.h>
 #endif
 
-CloseAppCommand::CloseAppCommand(const ::aurum::ReqCloseApp* request,
-                                 ::aurum::RspCloseApp*       response)
+CloseAppCommand::CloseAppCommand(const ::aurum::ReqCloseApp *request,
+                                 ::aurum::RspCloseApp *response)
     : mRequest{request}, mResponse{response}
 {
 }
@@ -42,4 +42,4 @@ CloseAppCommand::CloseAppCommand(const ::aurum::ReqCloseApp* request,
     LOGI("Wait for 1500ms");
     std::this_thread::sleep_for(std::chrono::milliseconds{1500});
     return grpc::Status::OK;
-}
\ No newline at end of file
+}
diff --git a/org.tizen.aurum-bootstrap/src/Commands/DumpObjectTreeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/DumpObjectTreeCommand.cc
index b8b7c71..84f0002 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/DumpObjectTreeCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/DumpObjectTreeCommand.cc
@@ -6,8 +6,8 @@
 #include "Sel.h"
 #include "ISearchable.h"
 
-DumpObjectTreeCommand::DumpObjectTreeCommand(const ::aurum::ReqDumpObjectTree* request,
-                                                   ::aurum::RspDumpObjectTree* response)
+DumpObjectTreeCommand::DumpObjectTreeCommand(const ::aurum::ReqDumpObjectTree *request,
+                                                   ::aurum::RspDumpObjectTree *response)
     : mRequest{request}, mResponse{response}
 {
     mObjMap = ObjectMapper::getInstance();
@@ -55,7 +55,7 @@ void DumpObjectTreeCommand::traverse(::aurum::Element *root, std::shared_ptr<Nod
     root->set_isselectable(obj->isSelectable());
 
     for( auto && childNode : node->mChildren) {
-        ::aurum::Element* child = root->add_child();
+        ::aurum::Element *child = root->add_child();
         traverse(child, childNode, depth+1);
     }
 }
@@ -69,7 +69,7 @@ void DumpObjectTreeCommand::traverse(::aurum::Element *root, std::shared_ptr<Nod
         if (!obj) return grpc::Status::OK;;
 
         auto node = obj->getDescendant();
-        ::aurum::Element* root = mResponse->add_roots();
+        ::aurum::Element *root = mResponse->add_roots();
         traverse(root, node, 0);
     }
     return grpc::Status::OK;
diff --git a/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc
index 1238b8b..ee8f6ff 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc
@@ -6,8 +6,8 @@
 #include "Sel.h"
 #include "ISearchable.h"
 
-FindElementCommand::FindElementCommand(const ::aurum::ReqFindElement* request,
-                                       ::aurum::RspFindElement*       response)
+FindElementCommand::FindElementCommand(const ::aurum::ReqFindElement *request,
+                                       ::aurum::RspFindElement *response)
     : mRequest{request}, mResponse{response}
 {
     mObjMap = ObjectMapper::getInstance();
@@ -64,14 +64,14 @@ std::vector<std::shared_ptr<UiSelector>> FindElementCommand::getSelectors(void)
 
     if (founds.size() > 0) {
         for (auto& found : founds) {
-            UiObject*   obj = found.get();
+            UiObject *obj = found.get();
             std::string key{};
             key = mObjMap->getElement(found);
             if (key.length() <= 0)
               key = mObjMap->addElement(std::move(found));
             LOGI("found object : %s key:%s",
                   obj->getAutomationId().c_str(), key.c_str());
-            ::aurum::Element* elm = mResponse->add_elements();
+            ::aurum::Element *elm = mResponse->add_elements();
             elm->set_elementid(key);
             elm->set_package(obj->getApplicationPackage());
 
diff --git a/org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc
index d1703be..14fcf66 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc
@@ -3,7 +3,7 @@
 #include "UiDevice.h"
 
 FlickCommand::FlickCommand(const ::aurum::ReqFlick *request,
-                           ::aurum::RspFlick *      response)
+                           ::aurum::RspFlick *response)
     : mRequest{request}, mResponse{response}
 {
 }
diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc
index 219211d..cf14e32 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc
@@ -5,8 +5,8 @@
 #include <package_manager.h>
 #endif
 
-GetAppInfoCommand::GetAppInfoCommand(const ::aurum::ReqGetAppInfo* request,
-                                     ::aurum::RspGetAppInfo*       response)
+GetAppInfoCommand::GetAppInfoCommand(const ::aurum::ReqGetAppInfo *request,
+                                     ::aurum::RspGetAppInfo *response)
     : mRequest{request}, mResponse{response}
 {
 }
@@ -21,7 +21,7 @@ GetAppInfoCommand::GetAppInfoCommand(const ::aurum::ReqGetAppInfo* request,
     package_info_h package_info;
     app_state_e    appState;
 
-    char* label = nullptr;
+    char *label = nullptr;
 
     mResponse->set_status(::aurum::RspStatus::OK);
     mResponse->set_isinstalled(false);
diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc
index cba8037..1d54967 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc
@@ -4,7 +4,7 @@
 #include "UiDevice.h"
 
 GetAttributeCommand::GetAttributeCommand(
-    const ::aurum::ReqGetAttribute* request, ::aurum::RspGetAttribute* response)
+    const ::aurum::ReqGetAttribute *request, ::aurum::RspGetAttribute *response)
     : mRequest{request}, mResponse{response},  mObjMap{ObjectMapper::getInstance()}
 {
 }
@@ -14,8 +14,8 @@ GetAttributeCommand::GetAttributeCommand(
     return grpc::Status::CANCELLED;
 }
 
-std::unique_ptr<GetAttributeCommand> GetAttributeCommand::createCommand(const ::aurum::ReqGetAttribute* request,
-                                                                        ::aurum::RspGetAttribute*       response)
+std::unique_ptr<GetAttributeCommand> GetAttributeCommand::createCommand(const ::aurum::ReqGetAttribute *request,
+                                                                        ::aurum::RspGetAttribute*response)
 {
     LOGI("GetAttribute --------------- ");
     ::aurum::ReqGetAttribute_RequestType type = request->attribute();
diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetDeviceTimeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetDeviceTimeCommand.cc
index 8403dc8..11b05e3 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/GetDeviceTimeCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/GetDeviceTimeCommand.cc
@@ -9,8 +9,8 @@
 #define BUFSIZE 64
 
 GetDeviceTimeCommand::GetDeviceTimeCommand(
-    const ::aurum::ReqGetDeviceTime* request,
-    ::aurum::RspGetDeviceTime*       response)
+    const ::aurum::ReqGetDeviceTime *request,
+    ::aurum::RspGetDeviceTime *response)
     : mRequest{request}, mResponse{response}
 {
 }
diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc
index dc85706..303d763 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc
@@ -1,8 +1,8 @@
 #include "bootstrap.h"
 #include "GetLocationCommand.h"
 
-GetLocationCommand::GetLocationCommand(const ::aurum::ReqGetLocation* request,
-                                       ::aurum::RspGetLocation*       response)
+GetLocationCommand::GetLocationCommand(const ::aurum::ReqGetLocation *request,
+                                       ::aurum::RspGetLocation *response)
     : mRequest{request}, mResponse{response}
 {
 }
@@ -10,7 +10,6 @@ GetLocationCommand::GetLocationCommand(const ::aurum::ReqGetLocation* request,
 ::grpc::Status GetLocationCommand::execute()
 {
     LOGI("GetLocation --------------- ");
-    // ObjectMapper *mObjMap = ObjectMapper::getInstance();
 
     mResponse->set_alt(-1);
     mResponse->set_lat(-1);
diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetSizeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetSizeCommand.cc
index 88c7b00..cb7280a 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/GetSizeCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/GetSizeCommand.cc
@@ -2,8 +2,8 @@
 #include "GetSizeCommand.h"
 #include "UiObject.h"
 
-GetSizeCommand::GetSizeCommand(const ::aurum::ReqGetSize* request,
-                               ::aurum::RspGetSize*       response)
+GetSizeCommand::GetSizeCommand(const ::aurum::ReqGetSize *request,
+                               ::aurum::RspGetSize *response)
     : mRequest{request}, mResponse{response}
 {
 }
diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetValueCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetValueCommand.cc
index 410af95..61c81d9 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/GetValueCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/GetValueCommand.cc
@@ -2,8 +2,8 @@
 #include "GetValueCommand.h"
 #include "UiObject.h"
 
-GetValueCommand::GetValueCommand(const ::aurum::ReqGetValue* request,
-                                 ::aurum::RspGetValue*       response)
+GetValueCommand::GetValueCommand(const ::aurum::ReqGetValue *request,
+                                 ::aurum::RspGetValue *response)
     : mRequest{request}, mResponse{response}
 {
 }
@@ -11,7 +11,7 @@ GetValueCommand::GetValueCommand(const ::aurum::ReqGetValue* request,
 ::grpc::Status GetValueCommand::execute()
 {
     LOGI("GetValue --------------- ");
-    ObjectMapper* mObjMap = ObjectMapper::getInstance();
+    ObjectMapper *mObjMap = ObjectMapper::getInstance();
     std::shared_ptr<UiObject> obj = mObjMap->getElement(mRequest->elementid());
 
     if (obj) {
@@ -21,4 +21,4 @@ GetValueCommand::GetValueCommand(const ::aurum::ReqGetValue* request,
     }
 
     return grpc::Status::OK;
-}
\ No newline at end of file
+}
diff --git a/org.tizen.aurum-bootstrap/src/Commands/KillServerCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/KillServerCommand.cc
index 72f9e3f..c14297a 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/KillServerCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/KillServerCommand.cc
@@ -1,8 +1,8 @@
 #include "bootstrap.h"
 #include "KillServerCommand.h"
 
-KillServerCommand::KillServerCommand(const ::aurum::ReqEmpty* request,
-                                     ::aurum::RspEmpty*       response)
+KillServerCommand::KillServerCommand(const ::aurum::ReqEmpty *request,
+                                     ::aurum::RspEmpty *response)
     : mRequest{request}, mResponse{response}
 {
 }
diff --git a/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc
index 2d2ab15..f7c30ed 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc
@@ -7,8 +7,8 @@
 #include <app_control.h>
 #endif
 
-LaunchAppCommand::LaunchAppCommand(const ::aurum::ReqLaunchApp* request,
-                                   ::aurum::RspLaunchApp*       response)
+LaunchAppCommand::LaunchAppCommand(const ::aurum::ReqLaunchApp *request,
+                                   ::aurum::RspLaunchApp *response)
     : mRequest{request}, mResponse{response}
 {
 }
diff --git a/org.tizen.aurum-bootstrap/src/Commands/LongClickCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/LongClickCommand.cc
index 22148b5..3312c70 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/LongClickCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/LongClickCommand.cc
@@ -3,8 +3,8 @@
 #include "UiObject.h"
 #include "UiDevice.h"
 
-LongClickCommand::LongClickCommand(const ::aurum::ReqClick* request,
-                                   ::aurum::RspClick*       response)
+LongClickCommand::LongClickCommand(const ::aurum::ReqClick *request,
+                                   ::aurum::RspClick *response)
     : mRequest{request}, mResponse{response}
 {
 }
@@ -13,7 +13,7 @@ LongClickCommand::LongClickCommand(const ::aurum::ReqClick* request,
 {
     LOGI("LongClick --------------- ");
 
-    ObjectMapper* mObjMap = ObjectMapper::getInstance();
+    ObjectMapper *mObjMap = ObjectMapper::getInstance();
     ::aurum::ReqClick_RequestType type = mRequest->type();
 
     if (type == ::aurum::ReqClick_RequestType_ELEMENTID) {
diff --git a/org.tizen.aurum-bootstrap/src/Commands/SendKeyCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/SendKeyCommand.cc
index 52e137f..b2ba222 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/SendKeyCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/SendKeyCommand.cc
@@ -2,8 +2,8 @@
 #include "SendKeyCommand.h"
 #include "UiDevice.h"
 
-SendKeyCommand::SendKeyCommand(const ::aurum::ReqKey* request,
-                               ::aurum::RspKey*       response)
+SendKeyCommand::SendKeyCommand(const ::aurum::ReqKey *request,
+                               ::aurum::RspKey *response)
     : mRequest{request}, mResponse{response}
 {
 }
diff --git a/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc
index 30538fe..77ace73 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc
@@ -11,8 +11,9 @@ SetValueCommand::SetValueCommand(const ::aurum::ReqSetValue* request,
 {
     LOGI("SetValue --------------- ");
     LOGI("text:%s", mRequest->stringvalue().c_str());
-    ObjectMapper* mObjMap = ObjectMapper::getInstance();
+
+    ObjectMapper *mObjMap = ObjectMapper::getInstance();
     std::shared_ptr<UiObject> obj = mObjMap->getElement(mRequest->elementid());
     if (obj) obj->setText(const_cast<std::string&>(mRequest->stringvalue()));
     return grpc::Status::OK;
-}
\ No newline at end of file
+}
diff --git a/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc
index 6d0177c..e3cc296 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc
@@ -5,8 +5,8 @@
 #include "UiDevice.h"
 
 TakeScreenshotCommand::TakeScreenshotCommand(
-    const ::aurum::ReqTakeScreenshot*                  request,
-    ::grpc::ServerWriter< ::aurum::RspTakeScreenshot>* writer)
+    const ::aurum::ReqTakeScreenshot *request,
+    ::grpc::ServerWriter< ::aurum::RspTakeScreenshot> *writer)
     : mRequest{request}, mWriter{writer}
 {
 }
diff --git a/org.tizen.aurum-bootstrap/src/Commands/TouchDownCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TouchDownCommand.cc
index c148b8a..fa42062 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/TouchDownCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/TouchDownCommand.cc
@@ -2,8 +2,8 @@
 #include "TouchDownCommand.h"
 #include "UiDevice.h"
 
-TouchDownCommand::TouchDownCommand(const ::aurum::ReqTouchDown* request,
-                                   ::aurum::RspTouchDown*       response)
+TouchDownCommand::TouchDownCommand(const ::aurum::ReqTouchDown *request,
+                                   ::aurum::RspTouchDown *response)
     : mRequest{request}, mResponse{response}
 {
 }
diff --git a/org.tizen.aurum-bootstrap/src/Commands/TouchMoveCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TouchMoveCommand.cc
index 2bb0423..951e4de 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/TouchMoveCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/TouchMoveCommand.cc
@@ -2,8 +2,8 @@
 #include "TouchMoveCommand.h"
 #include "UiDevice.h"
 
-TouchMoveCommand::TouchMoveCommand(const ::aurum::ReqTouchMove* request,
-                                   ::aurum::RspTouchMove*       response)
+TouchMoveCommand::TouchMoveCommand(const ::aurum::ReqTouchMove *request,
+                                   ::aurum::RspTouchMove *response)
     : mRequest{request}, mResponse{response}
 {
 }
diff --git a/org.tizen.aurum-bootstrap/src/Commands/TouchUpCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TouchUpCommand.cc
index 4fd946b..432e972 100644
--- a/org.tizen.aurum-bootstrap/src/Commands/TouchUpCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/TouchUpCommand.cc
@@ -2,8 +2,8 @@
 #include "TouchUpCommand.h"
 #include "UiDevice.h"
 
-TouchUpCommand::TouchUpCommand(const ::aurum::ReqTouchUp* request,
-                               ::aurum::RspTouchUp*       response)
+TouchUpCommand::TouchUpCommand(const ::aurum::ReqTouchUp *request,
+                               ::aurum::RspTouchUp *response)
     : mRequest{request}, mResponse{response}
 {
 }
diff --git a/org.tizen.aurum-bootstrap/src/ObjectMapper.cc b/org.tizen.aurum-bootstrap/src/ObjectMapper.cc
index 0e7b7b6..40c68d1 100644
--- a/org.tizen.aurum-bootstrap/src/ObjectMapper.cc
+++ b/org.tizen.aurum-bootstrap/src/ObjectMapper.cc
@@ -74,11 +74,9 @@ bool ObjectMapper::removeElement(std::shared_ptr<UiObject> object)
 
 void ObjectMapper::cleanUp()
 {
-    std::stringstream ss{};
-
     LOGI("clean up object map");
     for(auto iter = mObjectMapReverse.begin(); iter != mObjectMapReverse.end(); ) {
-	auto obj = mObjectMap[iter->second];
+        auto obj = mObjectMap[iter->second];
         if (obj && !obj->isValid()) {
             iter = mObjectMapReverse.erase(iter);
         } else {