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

libaurum: Fix indentation and clean code up

Change-Id: Idb5cd19e866da6d9471b052424cd32af6b8b2f51
---

diff --git a/libaurum/inc/Comparer.h b/libaurum/inc/Comparer.h
index a86c3a8..5ca1029 100644
--- a/libaurum/inc/Comparer.h
+++ b/libaurum/inc/Comparer.h
@@ -36,7 +36,7 @@ public:
      * @brief TBD
      * @since_tizen 5.5
      */
-    static std::shared_ptr<AccessibleNode>             findObject(const std::shared_ptr<UiDevice> device,
+    static std::shared_ptr<AccessibleNode>          findObject(const std::shared_ptr<UiDevice> device,
                                                     const std::shared_ptr<UiSelector> selector,
                                                     const std::shared_ptr<AccessibleNode> root);
 
diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h
index 2f854c5..89ddb5d 100644
--- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h
+++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h
@@ -92,5 +92,5 @@ private:
      * @brief TBD
      * @since_tizen 5.5
      */
-    AtspiAccessible* mNode;
+    AtspiAccessible *mNode;
 };
\ No newline at end of file
diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h
index 2e36672..5c1f9b2 100644
--- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h
+++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h
@@ -40,37 +40,37 @@ public:
      * @brief TBD
      * @since_tizen 5.5
      */
-    virtual void onWindowActivated(AtspiAccessible* node, WindowActivateInfoType type) = 0;
+    virtual void onWindowActivated(AtspiAccessible *node, WindowActivateInfoType type) = 0;
 
     /**
      * @brief TBD
      * @since_tizen 5.5
      */
-    virtual void onWindowDeactivated(AtspiAccessible* node) = 0;
+    virtual void onWindowDeactivated(AtspiAccessible *node) = 0;
 
     /**
      * @brief TBD
      * @since_tizen 5.5
      */
-    virtual void onWindowCreated(AtspiAccessible* node) = 0;
+    virtual void onWindowCreated(AtspiAccessible *node) = 0;
 
     /**
      * @brief TBD
      * @since_tizen 5.5
      */
-    virtual void onWindowDestroyed(AtspiAccessible* node) = 0;
+    virtual void onWindowDestroyed(AtspiAccessible *node) = 0;
 
     /**
      * @brief TBD
      * @since_tizen 5.5
      */
-    virtual void onVisibilityChanged(AtspiAccessible* node, bool visible) = 0;
+    virtual void onVisibilityChanged(AtspiAccessible *node, bool visible) = 0;
 
     /**
      * @brief TBD
      * @since_tizen 5.5
      */
-    virtual void onObjectDefunct(AtspiAccessible* node) = 0;
+    virtual void onObjectDefunct(AtspiAccessible *node) = 0;
 };
 
 
@@ -115,37 +115,37 @@ public:
      * @brief TBD
      * @since_tizen 5.5
      */
-    void onWindowActivated(AtspiAccessible* node, WindowActivateInfoType type) override;
+    void onWindowActivated(AtspiAccessible *node, WindowActivateInfoType type) override;
 
     /**
      * @brief TBD
      * @since_tizen 5.5
      */
-    void onWindowDeactivated(AtspiAccessible* node) override;
+    void onWindowDeactivated(AtspiAccessible *node) override;
 
     /**
      * @brief TBD
      * @since_tizen 5.5
      */
-    void onWindowCreated(AtspiAccessible* node) override;
+    void onWindowCreated(AtspiAccessible *node) override;
 
     /**
      * @brief TBD
      * @since_tizen 5.5
      */
-    void onWindowDestroyed(AtspiAccessible* node) override;
+    void onWindowDestroyed(AtspiAccessible *node) override;
 
     /**
      * @brief TBD
      * @since_tizen 5.5
      */
-    void onVisibilityChanged(AtspiAccessible* node, bool visible) override;
+    void onVisibilityChanged(AtspiAccessible *node, bool visible) override;
 
     /**
      * @brief TBD
      * @since_tizen 5.5
      */
-    void onObjectDefunct(AtspiAccessible* node) override;
+    void onObjectDefunct(AtspiAccessible *node) override;
 
     /**
      * @brief TBD
diff --git a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h
index d817884..869ba6a 100644
--- a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h
+++ b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h
@@ -5,28 +5,28 @@
 
 class AtspiWrapper {
 public:
-    static GArray* Atspi_state_set_get_states(AtspiStateSet *set);
-    static GArray* Atspi_accessible_get_interfaces(AtspiAccessible *node);
-    static gchar* Atspi_accessible_get_name(AtspiAccessible *node, GError **error);
-    static AtspiAccessible* Atspi_get_desktop(int n);
+    static GArray *Atspi_state_set_get_states(AtspiStateSet *set);
+    static GArray *Atspi_accessible_get_interfaces(AtspiAccessible *node);
+    static gchar *Atspi_accessible_get_name(AtspiAccessible *node, GError **error);
+    static AtspiAccessible *Atspi_get_desktop(int n);
     static int Atspi_accessible_get_child_count(AtspiAccessible *node, GError **error);
-    static AtspiAccessible* Atspi_accessible_get_child_at_index(AtspiAccessible *node, int index, GError **error);
-    static AtspiAccessible* Atspi_accessible_get_parent(AtspiAccessible *node, GError **error);
-    static AtspiStateSet* Atspi_accessible_get_state_set(AtspiAccessible *node);
+    static AtspiAccessible *Atspi_accessible_get_child_at_index(AtspiAccessible *node, int index, GError **error);
+    static AtspiAccessible *Atspi_accessible_get_parent(AtspiAccessible *node, GError **error);
+    static AtspiStateSet *Atspi_accessible_get_state_set(AtspiAccessible *node);
     static gboolean Atspi_state_set_contains(AtspiStateSet *set , AtspiStateType state);
-    static gchar* Atspi_accessible_get_role_name(AtspiAccessible *node, GError **error);
-    static gchar* Atspi_accessible_get_unique_id(AtspiAccessible *node, GError **error);
-    static GHashTable* Atspi_accessible_get_attributes(AtspiAccessible *node, GError **error);
-    static AtspiComponent* Atspi_accessible_get_component_iface(AtspiAccessible *node);
-    static AtspiRect* Atspi_component_get_extents(AtspiComponent *obj, AtspiCoordType ctype, GError **error);
-    static AtspiAction* Atspi_accessible_get_action_iface(AtspiAccessible *node);
-    static int Atspi_action_get_n_actions(AtspiAction* action, GError **error);
-    static gchar* Atspi_action_get_action_name(AtspiAction* action, int index, GError **error);
+    static gchar *Atspi_accessible_get_role_name(AtspiAccessible *node, GError **error);
+    static gchar *Atspi_accessible_get_unique_id(AtspiAccessible *node, GError **error);
+    static GHashTable *Atspi_accessible_get_attributes(AtspiAccessible *node, GError **error);
+    static AtspiComponent *Atspi_accessible_get_component_iface(AtspiAccessible *node);
+    static AtspiRect *Atspi_component_get_extents(AtspiComponent *obj, AtspiCoordType ctype, GError **error);
+    static AtspiAction *Atspi_accessible_get_action_iface(AtspiAccessible *node);
+    static int Atspi_action_get_n_actions(AtspiAction *action, GError **error);
+    static gchar *Atspi_action_get_action_name(AtspiAction *action, int index, GError **error);
     static gboolean Atspi_action_do_action(AtspiAction *action, int index, GError **error);
-    static AtspiEditableText* Atspi_accessible_get_editable_text(AtspiAccessible *node);
-    static gboolean Atspi_editable_text_delete_text(AtspiEditableText*, int start, int end, GError **error);
-    static gboolean Atspi_editable_text_insert_text(AtspiEditableText*, int pos, const gchar *text, int len, GError **error);
-    static AtspiAccessible* Atspi_accessible_get_application (AtspiAccessible *node, GError **error);
+    static AtspiEditableText *Atspi_accessible_get_editable_text(AtspiAccessible *node);
+    static gboolean Atspi_editable_text_delete_text(AtspiEditableText *, int start, int end, GError **error);
+    static gboolean Atspi_editable_text_insert_text(AtspiEditableText *, int pos, const gchar *text, int len, GError **error);
+    static AtspiAccessible *Atspi_accessible_get_application (AtspiAccessible *node, GError **error);
     static void Atspi_accessible_clear_cache (AtspiAccessible *node);
 
     static void lock();
diff --git a/libaurum/inc/UiDevice.h b/libaurum/inc/UiDevice.h
index ae16a63..dbda79c 100644
--- a/libaurum/inc/UiDevice.h
+++ b/libaurum/inc/UiDevice.h
@@ -222,7 +222,7 @@ private:
     /**
      * @brief TBD
      */
-    IDevice *     mDeviceImpl;
+    IDevice *mDeviceImpl;
     /**
      * @brief TBD
      */
diff --git a/libaurum/inc/UiObject.h b/libaurum/inc/UiObject.h
index 8da6376..b764fb5 100644
--- a/libaurum/inc/UiObject.h
+++ b/libaurum/inc/UiObject.h
@@ -325,7 +325,7 @@ private:
     /**
      * @brief TBD
      */
-    const Waiter *        mWaiter;
+    const Waiter *mWaiter;
 
     /**
      * @brief TBD
diff --git a/libaurum/inc/Waiter.h b/libaurum/inc/Waiter.h
index 135ccc3..ae33f60 100644
--- a/libaurum/inc/Waiter.h
+++ b/libaurum/inc/Waiter.h
@@ -21,7 +21,7 @@ public:
      * @since_tizen 5.5
      */
     Waiter(const ISearchable *searchableObject,
-           const UiObject *   uiObject = nullptr);  // : mObject{object}
+           const UiObject *uiObject = nullptr);  // : mObject{object}
 
     /**
      * @brief TBD
@@ -55,7 +55,7 @@ private:
      * @brief TBD
      * @since_tizen 5.5
      */
-    const UiObject *   mUiObject;
+    const UiObject *mUiObject;
 
     /**
      * @brief TBD
diff --git a/libaurum/src/Accessibility/AccessibleNode.cc b/libaurum/src/Accessibility/AccessibleNode.cc
index 070d97c..791913d 100644
--- a/libaurum/src/Accessibility/AccessibleNode.cc
+++ b/libaurum/src/Accessibility/AccessibleNode.cc
@@ -19,6 +19,7 @@ AccessibleNode::AccessibleNode()
 
 std::string AccessibleNode::description() {
     std::stringstream ss{};
+
     ss << "{";
     ss << "\"mId\":\"" << this->mId << "\", ";
     ss << "\"mAutomationId\":\"" << this->mAutomationId << "\", ";
@@ -27,39 +28,8 @@ std::string AccessibleNode::description() {
     ss << "\"mPkg\":\"" << this->mPkg << "\", ";
     ss << "\"mType\":\"" << this->mType << "\", ";
     ss << "\"mStyle\":\"" << this->mStyle << "\", ";
-    /*
-    if(this->mMatchId) ss << "\"mMatchId\":\"" << ((*this->mMatchId)?"true":"false") << "\", ";
-    if(this->mMatchAutomationId) ss << "\"mMatchAutomationId\":\"" << ((*this->mMatchAutomationId)?"true":"false") << "\", ";
-    if(this->mMatchRole) ss << "\"mMatchRole\":\"" << ((*this->mMatchRole)?"true":"false") << "\", ";
-    if(this->mMatchText) ss << "\"mMatchText\":\"" << ((*this->mMatchText)?"true":"false") << "\", ";
-    if(this->mMatchPkg) ss << "\"mMatchPkg\":\"" << ((*this->mMatchPkg)?"true":"false") << "\", ";
-    if(this->mMatchType) ss << "\"mMatchType\":\"" << ((*this->mMatchType)?"true":"false") << "\", ";
-    if(this->mMatchStyle) ss << "\"mMatchStyle\":\"" << ((*this->mMatchStyle)?"true":"false" )<< "\", ";
-    if(this->mMinDepth) ss << "\"mMinDepth\":\"" << *this->mMinDepth << "\", ";
-    if(this->mMaxDepth) ss << "\"mMaxDepth\":\"" << *this->mMaxDepth << "\", ";
-    if(this->mIschecked) ss << "\"mIschecked\":\"" << ((*this->mIschecked)?"true":"false") << "\", ";
-    if(this->mIscheckable) ss << "\"mIscheckable\":\"" << ((*this->mIscheckable)?"true":"false") << "\", ";
-    if(this->mIsclickable) ss << "\"mIsclickable\":\"" << ((*this->mIsclickable)?"true":"false") << "\", ";
-    if(this->mIsenabled) ss << "\"mIsenabled\":\"" << ((*this->mIsenabled)?"true":"false") << "\", ";
-    if(this->mIsfocused) ss << "\"mIsfocused\":\"" << ((*this->mIsfocused)?"true":"false") << "\", ";
-    if(this->mIsfocusable) ss << "\"mIsfocusable\":\"" << ((*this->mIsfocusable)?"true":"false") << "\", ";
-    if(this->mIsscrollable) ss << "\"mIsscrollable\":\"" << ((*this->mIsscrollable)?"true":"false") << "\", ";
-    if(this->mIsselected) ss << "\"mIsselected\":\"" << ((*this->mIsselected)?"true":"false") << "\", ";
-    if(this->mIsshowing) ss << "\"mIsshowing\":\"" << ((*this->mIsshowing)?"true":"false") << "\", ";
-    if(this->mIsactive) ss << "\"mIsactive\":\"" << ((*this->mIsactive)?"true":"false") << "\", ";
-    if(this->mIsvisible) ss << "\"mIsvisible\":\"" << ((*this->mIsvisible)?"true":"false") << "\", ";
-    if(this->mIsselectable) ss << "\"mIsselectable\":\"" << ((*this->mIsselectable)?"true":"false") << "\", ";
-    if(this->mParent) {
-        ss << "\"mParent\":" << this->mParent->description();
-    }
-    ss << "\"mChild\":[";
-    for ( auto child = mChild.begin(); child != mChild.end(); child++) {
-        ss << (*child)->description();
-        if (child+1 != mChild.end()) ss << ", " ;
-    }
-    ss << "]";
-    */
     ss << "}";
+
     return ss.str();
 }
 
diff --git a/libaurum/src/Comparer.cc b/libaurum/src/Comparer.cc
index f7300ce..1aee954 100644
--- a/libaurum/src/Comparer.cc
+++ b/libaurum/src/Comparer.cc
@@ -79,7 +79,7 @@ std::vector<std::shared_ptr<AccessibleNode>> Comparer::findObjects(
             }
         }
     } else {
-        LOGI("Abort searching! No need to search children(maxDepth limit overflow, %d < %d < %d)", mSelector->mMinDepth?*(mSelector->mMinDepth):-1, depth, mSelector->mMaxDepth?*(mSelector->mMaxDepth):9999999);
+        LOGI("Abort searching! No need to search children(maxDepth limit overflow, %d < %d < %d)", mSelector->mMinDepth? * (mSelector->mMinDepth): -1, depth, mSelector->mMaxDepth?*(mSelector->mMaxDepth):9999999);
     }
 
     if (currentMatch && currentMatch->finalizeMatch()){
diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc
index 2b165d2..a5641f9 100644
--- a/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc
+++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc
@@ -5,12 +5,10 @@
 
 #include <gio/gio.h>
 
-//std::map<AtspiAccessible *, AccessibleNode *> AccessibleNode::mNodeMap{};
-
 AtspiAccessibleNode::AtspiAccessibleNode(AtspiAccessible *node)
 : mNode{node}
 {
-    const auto trickDontRemove = std::shared_ptr<AtspiAccessibleNode>( this, [](AtspiAccessibleNode*){} );
+    const auto trickDontRemove = std::shared_ptr<AtspiAccessibleNode>( this, [](AtspiAccessibleNode *){} );
     auto watcher = AccessibleWatcher::getInstance();
     watcher->attach(shared_from_this());
 
@@ -93,7 +91,7 @@ bool AtspiAccessibleNode::isValid() const
 
 void* AtspiAccessibleNode::getRawHandler(void) const
 {
-    return static_cast<void*>(mNode);
+    return static_cast<void *>(mNode);
 }
 
 void AtspiAccessibleNode::refresh()
diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc
index 04b21b1..a58a89f 100644
--- a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc
+++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc
@@ -60,7 +60,7 @@ findActiveNode(AtspiAccessible *node, int depth,
 
     LOGI("findActiveNode node %p has %d children", node, nchild);
     for (int i = 0; i < nchild; i++) {
-        AtspiAccessible* child = AtspiWrapper::Atspi_accessible_get_child_at_index(node, i, NULL);
+        AtspiAccessible *child = AtspiWrapper::Atspi_accessible_get_child_at_index(node, i, NULL);
         LOGI("a child found @ %d : %p", i, child);
         std::vector<AtspiAccessible *> childRet = findActiveNode(child, depth + 1, max_depth);
         ret.insert(ret.end(), childRet.begin(), childRet.end());
@@ -73,7 +73,7 @@ findActiveNode(AtspiAccessible *node, int depth,
 static gpointer _event_thread_loop (gpointer data)
 {
     LOGI("event thread start");
-    AtspiEventListener * listener =
+    AtspiEventListener *listener =
         atspi_event_listener_new(AtspiAccessibleWatcher::onAtspiEvents, data, NULL);
 
     atspi_event_listener_register(listener, "window:", NULL);
@@ -93,7 +93,7 @@ AtspiAccessibleWatcher::AtspiAccessibleWatcher()
 : mDbusProxy{nullptr}
 {
     GVariant *enabled_variant = nullptr, *result = nullptr;
-    GError *  error = nullptr;
+    GError *error = nullptr;
     atspi_set_main_context (g_main_context_default ());
     atspi_init();
 
@@ -119,7 +119,7 @@ AtspiAccessibleWatcher::AtspiAccessibleWatcher()
 AtspiAccessibleWatcher::~AtspiAccessibleWatcher()
 {
     GVariant *enabled_variant = nullptr, *result = nullptr;
-    GError *  error = nullptr;
+    GError *error = nullptr;
 
     enabled_variant = g_variant_new_boolean(false);
     result = g_dbus_proxy_call_sync(
@@ -244,7 +244,7 @@ std::shared_ptr<AccessibleApplication> AtspiAccessibleWatcher::getApplicationAt(
 {
     AtspiWrapper::lock();
     AtspiAccessible *root = AtspiWrapper::Atspi_get_desktop(0);
-    AtspiAccessible* child = AtspiWrapper::Atspi_accessible_get_child_at_index(root, index, NULL);
+    AtspiAccessible *child = AtspiWrapper::Atspi_accessible_get_child_at_index(root, index, NULL);
     g_object_unref(root);
     AtspiWrapper::unlock();
     return std::make_shared<AtspiAccessibleApplication>(std::make_shared<AtspiAccessibleNode>(child));
@@ -263,7 +263,7 @@ std::vector<std::shared_ptr<AccessibleApplication>> AtspiAccessibleWatcher::getA
     }
 
     for (int i = 0; i < nchild; i++){
-        AtspiAccessible* child = AtspiWrapper::Atspi_accessible_get_child_at_index(root, i, NULL);
+        AtspiAccessible *child = AtspiWrapper::Atspi_accessible_get_child_at_index(root, i, NULL);
         if (child) {
             ret.push_back(std::make_shared<AtspiAccessibleApplication>(std::make_shared<AtspiAccessibleNode>(child)));
         }
diff --git a/libaurum/src/Impl/Accessibility/AtspiWrapper.cc b/libaurum/src/Impl/Accessibility/AtspiWrapper.cc
index 69e47c6..cf76dcd 100644
--- a/libaurum/src/Impl/Accessibility/AtspiWrapper.cc
+++ b/libaurum/src/Impl/Accessibility/AtspiWrapper.cc
@@ -3,25 +3,25 @@
 std::recursive_mutex AtspiWrapper::mMutex = std::recursive_mutex{};
 //std::unique_lock<std::mutex> AtspiWrapper::mLock = std::unique_lock<std::mutex>(mMutex, std::defer_lock);
 
-GArray* AtspiWrapper::Atspi_state_set_get_states(AtspiStateSet *set)
+GArray *AtspiWrapper::Atspi_state_set_get_states(AtspiStateSet *set)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_state_set_get_states(set);
 }
 
-GArray* AtspiWrapper::Atspi_accessible_get_interfaces(AtspiAccessible *node)
+GArray *AtspiWrapper::Atspi_accessible_get_interfaces(AtspiAccessible *node)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_accessible_get_interfaces(node);
 }
 
-gchar* AtspiWrapper::Atspi_accessible_get_name(AtspiAccessible *node, GError **error)
+gchar *AtspiWrapper::Atspi_accessible_get_name(AtspiAccessible *node, GError **error)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_accessible_get_name(node, error);
 }
 
-AtspiAccessible* AtspiWrapper::Atspi_get_desktop(int n)
+AtspiAccessible *AtspiWrapper::Atspi_get_desktop(int n)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_get_desktop(n);
@@ -33,19 +33,19 @@ int AtspiWrapper::Atspi_accessible_get_child_count(AtspiAccessible *node, GError
     return atspi_accessible_get_child_count(node, error);
 }
 
-AtspiAccessible* AtspiWrapper::Atspi_accessible_get_child_at_index(AtspiAccessible *node, int index, GError **error)
+AtspiAccessible *AtspiWrapper::Atspi_accessible_get_child_at_index(AtspiAccessible *node, int index, GError **error)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_accessible_get_child_at_index(node, index, error);
 }
 
-AtspiAccessible* AtspiWrapper::Atspi_accessible_get_parent(AtspiAccessible *node, GError **error)
+AtspiAccessible *AtspiWrapper::Atspi_accessible_get_parent(AtspiAccessible *node, GError **error)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_accessible_get_parent(node, error);
 }
 
-AtspiStateSet* AtspiWrapper::Atspi_accessible_get_state_set(AtspiAccessible *node)
+AtspiStateSet *AtspiWrapper::Atspi_accessible_get_state_set(AtspiAccessible *node)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_accessible_get_state_set(node);
@@ -57,49 +57,49 @@ gboolean AtspiWrapper::Atspi_state_set_contains(AtspiStateSet *set , AtspiStateT
     return atspi_state_set_contains(set , state);
 }
 
-gchar* AtspiWrapper::Atspi_accessible_get_role_name(AtspiAccessible *node, GError **error)
+gchar *AtspiWrapper::Atspi_accessible_get_role_name(AtspiAccessible *node, GError **error)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_accessible_get_role_name(node, error);
 }
 
-gchar* AtspiWrapper::Atspi_accessible_get_unique_id(AtspiAccessible *node, GError **error)
+gchar *AtspiWrapper::Atspi_accessible_get_unique_id(AtspiAccessible *node, GError **error)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_accessible_get_unique_id(node, error);
 }
 
-GHashTable* AtspiWrapper::Atspi_accessible_get_attributes(AtspiAccessible *node, GError **error)
+GHashTable *AtspiWrapper::Atspi_accessible_get_attributes(AtspiAccessible *node, GError **error)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_accessible_get_attributes(node, error);
 }
 
-AtspiComponent* AtspiWrapper::Atspi_accessible_get_component_iface(AtspiAccessible *node)
+AtspiComponent *AtspiWrapper::Atspi_accessible_get_component_iface(AtspiAccessible *node)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_accessible_get_component_iface(node);
 }
 
-AtspiRect* AtspiWrapper::Atspi_component_get_extents(AtspiComponent *obj, AtspiCoordType ctype, GError **error)
+AtspiRect *AtspiWrapper::Atspi_component_get_extents(AtspiComponent *obj, AtspiCoordType ctype, GError **error)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_component_get_extents(obj, ctype, error);
 }
 
-AtspiAction* AtspiWrapper::Atspi_accessible_get_action_iface(AtspiAccessible *node)
+AtspiAction *AtspiWrapper::Atspi_accessible_get_action_iface(AtspiAccessible *node)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_accessible_get_action_iface(node);
 }
 
-int AtspiWrapper::Atspi_action_get_n_actions(AtspiAction* action, GError **error)
+int AtspiWrapper::Atspi_action_get_n_actions(AtspiAction *action, GError **error)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_action_get_n_actions(action, error);
 }
 
-gchar* AtspiWrapper::Atspi_action_get_action_name(AtspiAction* action, int index, GError **error)
+gchar *AtspiWrapper::Atspi_action_get_action_name(AtspiAction *action, int index, GError **error)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_action_get_action_name(action, index, error);
@@ -111,25 +111,25 @@ gboolean AtspiWrapper::Atspi_action_do_action(AtspiAction *action, int index, GE
     return atspi_action_do_action(action, index, error);
 }
 
-AtspiEditableText* AtspiWrapper::Atspi_accessible_get_editable_text(AtspiAccessible *node)
+AtspiEditableText *AtspiWrapper::Atspi_accessible_get_editable_text(AtspiAccessible *node)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_accessible_get_editable_text(node);
 }
 
-gboolean AtspiWrapper::Atspi_editable_text_delete_text(AtspiEditableText* iface, int start, int end, GError **error)
+gboolean AtspiWrapper::Atspi_editable_text_delete_text(AtspiEditableText *iface, int start, int end, GError **error)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_editable_text_delete_text(iface, start, end, error);
 }
 
-gboolean AtspiWrapper::Atspi_editable_text_insert_text(AtspiEditableText* iface, int pos, const gchar *text, int len, GError **error)
+gboolean AtspiWrapper::Atspi_editable_text_insert_text(AtspiEditableText *iface, int pos, const gchar *text, int len, GError **error)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_editable_text_insert_text(iface, pos, text, len, error);
 }
 
-AtspiAccessible* AtspiWrapper::Atspi_accessible_get_application (AtspiAccessible *node, GError **error)
+AtspiAccessible *AtspiWrapper::Atspi_accessible_get_application (AtspiAccessible *node, GError **error)
 {
     std::unique_lock<std::recursive_mutex> lock(mMutex);
     return atspi_accessible_get_application(node, error);
diff --git a/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc b/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc
index 121c31d..9e3a8e6 100644
--- a/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc
+++ b/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc
@@ -8,7 +8,7 @@ MockAccessibleNode::MockAccessibleNode(std::shared_ptr<AccessibleNode> parent, s
 : mParentNode(parent), mChildrenList{}, mActionSet{}
 {
     printf("%s:%d / %s\n",__FILE__, __LINE__, __PRETTY_FUNCTION__);
-    const auto trickDontRemove = std::shared_ptr<MockAccessibleNode>( this, [](MockAccessibleNode*){} );
+    const auto trickDontRemove = std::shared_ptr<MockAccessibleNode>( this, [](MockAccessibleNode *){} );
 
     setProperties(text,pkg,role,res,type,style,automationId, boundingBox, supportingIfaces, featureProperty);
     auto watcher = AccessibleWatcher::getInstance();
diff --git a/libaurum/src/Impl/MockDeviceImpl.cc b/libaurum/src/Impl/MockDeviceImpl.cc
index 0184b44..855ceb3 100644
--- a/libaurum/src/Impl/MockDeviceImpl.cc
+++ b/libaurum/src/Impl/MockDeviceImpl.cc
@@ -15,6 +15,9 @@
 #include <chrono>
 #include <thread>
 
+#define NANO_SEC 1000000000.0
+#define MICRO_SEC 1000000
+
 MockDeviceImpl::MockDeviceImpl()
 :tStart{}, isTimerStarted{false}, mTouchRelease{}, mTouchDown{}, mKeyDevice{}, mWheelDevice{0}
 {
@@ -104,7 +107,7 @@ bool MockDeviceImpl::wheelUp(int amount, const int durationMs)
 {
     for (int i = 0; i < amount; i++){
         mWheelDevice++;
-        usleep(durationMs*MSEC_PER_SEC/amount);
+        usleep(durationMs * MSEC_PER_SEC/amount);
     }
 
     return true;
@@ -114,7 +117,7 @@ bool MockDeviceImpl::wheelDown(int amount, const int durationMs)
 {
     for (int i = 0; i < amount; i++){
         mWheelDevice--;
-        usleep(durationMs*MSEC_PER_SEC/(double)amount);
+        usleep(durationMs * MSEC_PER_SEC/(double)amount);
     }
 
     return true;
@@ -180,7 +183,7 @@ long long MockDeviceImpl::getSystemTime(TimeRequestType type)
         clock_gettime(CLOCK_REALTIME, &t);
     }
 
-    return (long long)t.tv_sec * 1000L + (long long)(t.tv_nsec / 1000000);
+    return (long long)t.tv_sec * 1000L + (long long)(t.tv_nsec / MICRO_SEC);
 }
 
 bool MockDeviceImpl::strokeKeyCode(std::string keycode, unsigned int intv)
@@ -220,13 +223,13 @@ int MockDeviceImpl::stopTimer(void)
     if (!isTimerStarted) return 0;
     isTimerStarted = false;
     clock_gettime(CLOCK_MONOTONIC, &tEnd);
-    return ((tEnd.tv_sec + tEnd.tv_nsec/1000000000.0) - (tStart.tv_sec + tStart.tv_nsec/1000000000.0)) * 1000000;
+    return ((tEnd.tv_sec + tEnd.tv_nsec/NANO_SEC) - (tStart.tv_sec + tStart.tv_nsec/NANO_SEC)) * MICRO_SEC;
 }
 
 long long MockDeviceImpl::timeStamp(void)
 {
     struct timespec t;
     clock_gettime(CLOCK_MONOTONIC, &t);
-    long long rtn = (t.tv_sec + t.tv_nsec/1000000000.0) * 1000000;
+    long long rtn = (t.tv_sec + t.tv_nsec/NANO_SEC) * MICRO_SEC;
     return rtn;
 }
diff --git a/libaurum/src/Impl/TizenDeviceImpl.cc b/libaurum/src/Impl/TizenDeviceImpl.cc
index 446d041..ea0792a 100644
--- a/libaurum/src/Impl/TizenDeviceImpl.cc
+++ b/libaurum/src/Impl/TizenDeviceImpl.cc
@@ -22,7 +22,7 @@ TizenDeviceImpl::TizenDeviceImpl()
 : mFakeTouchHandle{0}, mFakeKeyboardHandle{0}, mFakeWheelHandle{0}, tStart{}, isTimerStarted{false}, mTouchSeq{}
 {
     LOGI("device implementation init");
-    TizenDeviceImpl *obj = static_cast<TizenDeviceImpl*>(this);
+    TizenDeviceImpl *obj = static_cast<TizenDeviceImpl *>(this);
     obj->mFakeTouchHandle = efl_util_input_initialize_generator(EFL_UTIL_INPUT_DEVTYPE_TOUCHSCREEN);
     obj->mFakeKeyboardHandle =
        efl_util_input_initialize_generator(EFL_UTIL_INPUT_DEVTYPE_KEYBOARD);
@@ -30,7 +30,7 @@ TizenDeviceImpl::TizenDeviceImpl()
 
 TizenDeviceImpl::~TizenDeviceImpl()
 {
-   TizenDeviceImpl *obj = static_cast<TizenDeviceImpl*>(this);
+   TizenDeviceImpl *obj = static_cast<TizenDeviceImpl *>(this);
    efl_util_input_deinitialize_generator(obj->mFakeTouchHandle);
    efl_util_input_deinitialize_generator(obj->mFakeKeyboardHandle);
 }
@@ -58,7 +58,7 @@ int TizenDeviceImpl::touchDown(const int x, const int y)
     int seq = grabTouchSeqNumber();
     LOGI("touch down %d %d , seq:%d", x, y, seq);
     if (seq >= 0) {
-         TizenDeviceImpl *obj = static_cast<TizenDeviceImpl*>(this);
+         TizenDeviceImpl *obj = static_cast<TizenDeviceImpl *>(this);
          long result = (long)efl_util_input_generate_touch(obj->mFakeTouchHandle, seq, EFL_UTIL_INPUT_TOUCH_BEGIN,
                                                            x, y);
 
@@ -74,7 +74,7 @@ bool TizenDeviceImpl::touchMove(const int x, const int y, const int seq)
 {
     LOGI("touch move %d %d, seq:%d", x, y, seq);
     if (seq >= 0) {
-         TizenDeviceImpl *obj = static_cast<TizenDeviceImpl*>(this);
+         TizenDeviceImpl *obj = static_cast<TizenDeviceImpl *>(this);
          long result = (long)efl_util_input_generate_touch(obj->mFakeTouchHandle, seq, EFL_UTIL_INPUT_TOUCH_UPDATE,
                                                            x, y);
          return result == EFL_UTIL_ERROR_NONE;
@@ -86,7 +86,7 @@ bool TizenDeviceImpl::touchUp(const int x, const int y, const int seq)
 {
    LOGI("touch up %d %d, seq:%d", x, y, seq);
    if (seq >= 0) {
-        TizenDeviceImpl *obj = static_cast<TizenDeviceImpl*>(this);
+        TizenDeviceImpl *obj = static_cast<TizenDeviceImpl *>(this);
         long result = (long)efl_util_input_generate_touch(obj->mFakeTouchHandle, seq, EFL_UTIL_INPUT_TOUCH_END,
                                                           x, y);
         return releaseTouchSeqNumber(seq) && result == EFL_UTIL_ERROR_NONE;
@@ -98,12 +98,12 @@ bool TizenDeviceImpl::wheelUp(int amount, const int durationMs)
 {
     LOGI("wheel up %d for %d", amount, durationMs);
     long result = -1;
-    TizenDeviceImpl *obj = static_cast<TizenDeviceImpl*>(this);
+    TizenDeviceImpl *obj = static_cast<TizenDeviceImpl *>(this);
     obj->mFakeWheelHandle = efl_util_input_initialize_generator_with_sync(EFL_UTIL_INPUT_DEVTYPE_POINTER, NULL);
     for (int i = 0; i < amount; i++){
-         TizenDeviceImpl *obj = static_cast<TizenDeviceImpl*>(this);
+         TizenDeviceImpl *obj = static_cast<TizenDeviceImpl *>(this);
          result = (long)efl_util_input_generate_wheel(obj->mFakeWheelHandle, EFL_UTIL_INPUT_POINTER_WHEEL_HORZ, 1);
-         usleep(durationMs*MSEC_PER_SEC/amount);
+         usleep(durationMs * MSEC_PER_SEC/amount);
     }
     efl_util_input_deinitialize_generator(obj->mFakeWheelHandle);
 
@@ -114,12 +114,12 @@ bool TizenDeviceImpl::wheelDown(int amount, const int durationMs)
 {
     LOGI("wheel down %d for %d", amount, durationMs);
     long result = -1;
-    TizenDeviceImpl *obj = static_cast<TizenDeviceImpl*>(this);
+    TizenDeviceImpl *obj = static_cast<TizenDeviceImpl *>(this);
     obj->mFakeWheelHandle = efl_util_input_initialize_generator_with_sync(EFL_UTIL_INPUT_DEVTYPE_POINTER, NULL);
     for (int i = 0; i < amount; i++){
-        TizenDeviceImpl *obj = static_cast<TizenDeviceImpl*>(this);
+        TizenDeviceImpl *obj = static_cast<TizenDeviceImpl *>(this);
         result = (long)efl_util_input_generate_wheel(obj->mFakeWheelHandle, EFL_UTIL_INPUT_POINTER_WHEEL_HORZ, -1);
-        usleep(durationMs*MSEC_PER_SEC/amount);
+        usleep(durationMs * MSEC_PER_SEC/amount);
     }
     efl_util_input_deinitialize_generator(obj->mFakeWheelHandle);
 
@@ -231,14 +231,14 @@ bool TizenDeviceImpl::strokeKeyCode(std::string keycode, unsigned int intv)
 
 bool TizenDeviceImpl::pressKeyCode(std::string keycode)
 {
-   TizenDeviceImpl *obj = static_cast<TizenDeviceImpl*>(this);
+   TizenDeviceImpl *obj = static_cast<TizenDeviceImpl *>(this);
    long result = (long)efl_util_input_generate_key(obj->mFakeKeyboardHandle, keycode.c_str(), 1);
    return result == EFL_UTIL_ERROR_NONE;
 }
 
 bool TizenDeviceImpl::releaseKeyCode(std::string keycode)
 {
-   TizenDeviceImpl *obj = static_cast<TizenDeviceImpl*>(this);
+   TizenDeviceImpl *obj = static_cast<TizenDeviceImpl *>(this);
     long result = (long)efl_util_input_generate_key(obj->mFakeKeyboardHandle, keycode.c_str(), 0);
     return result == EFL_UTIL_ERROR_NONE;
 }
@@ -280,7 +280,7 @@ public:
     virtual long long getTime() = 0;
 protected:
     long long convertTime(struct timespec t){
-        return (long long)t.tv_sec * 1000L + (long long)(t.tv_nsec / 1000000);
+        return (long long)t.tv_sec * 1000L + (long long)(t.tv_nsec / MICRO_SEC);
     }
 };
 
diff --git a/libaurum/src/UiObject.cc b/libaurum/src/UiObject.cc
index db48098..f802b6a 100644
--- a/libaurum/src/UiObject.cc
+++ b/libaurum/src/UiObject.cc
@@ -17,7 +17,7 @@ UiObject::UiObject(const std::shared_ptr<UiDevice> device, const std::shared_ptr
                    const AccessibleNode *node)
     : mDevice(device),
       mSelector(selector),
-      mNode(std::shared_ptr<AccessibleNode>(const_cast<AccessibleNode*>(node))),
+      mNode(std::shared_ptr<AccessibleNode>(const_cast<AccessibleNode *>(node))),
       mWaiter(new Waiter{this, this})
 {
 }
diff --git a/libaurum/src/UiScrollable.cc b/libaurum/src/UiScrollable.cc
index 7c4ca8a..cae156d 100644
--- a/libaurum/src/UiScrollable.cc
+++ b/libaurum/src/UiScrollable.cc
@@ -38,11 +38,7 @@ bool UiScrollable::scrollForward()
 bool UiScrollable::scrollForward(int steps)
 {
 
-/*
-    화면 크기 확인 
-    scroll to 
-
-*/
+    //TODO Check Scree Size here
     return true;
 
 }
diff --git a/libaurum/src/UiSelector.cc b/libaurum/src/UiSelector.cc
index 5caad3d..ae83625 100644
--- a/libaurum/src/UiSelector.cc
+++ b/libaurum/src/UiSelector.cc
@@ -58,20 +58,6 @@ std::string UiSelector::description()
     return ss.str();
 }
 
-/*
-UiSelector::UiSelector(const UiSelector &src)
-{
-    // 복사 생성자
-}
-
-UiSelector& UiSelector::operator= (const UiSelector& src)
-{
-    // = 오버라이드
-    if (this == &src) return *this; // 자기 대입 방지
-    return *this;
-}
-*/
-
 UiSelector *UiSelector::text(std::string text, bool match)
 {
     this->mText = std::make_unique<std::string>(text);