c++: code refactoring.

use auto specifier for simplifying code.

Change-Id: I48ca7cfd2a4aa55a9f83be8af46de989f9590370

diff --git a/src/examples/efl/cpp/page12.h b/src/examples/efl/cpp/page12.h
index 6342ee603c88a04503ad3aa21dc1c11f0edeb9c8..9de4d0f6cf7425c0f4d5daf2c37f42c074edbd6a 100644 (file)
--- a/src/examples/efl/cpp/page12.h
+++ b/src/examples/efl/cpp/page12.h
@@ -53,7 +53,7 @@ protected:
                evas_object_smart_callback_add(rightBtn, "clicked",
                                [](void *data, Evas_Object *obj, void *event_info) -> void
                                {
-                                       page12 *view = static_cast<page12 *>(data);
+                                       auto view = static_cast<page12 *>(data);
                                        view->createPopup();
                                },
                                this);

diff --git a/src/examples/efl/cpp/page16.h b/src/examples/efl/cpp/page16.h
index f4e7a20edd8a294634fb2fddee5bda7c4f556d7f..0f311a00f4b758f23bd30350e6a33f6c962f054c 100644 (file)
--- a/src/examples/efl/cpp/page16.h
+++ b/src/examples/efl/cpp/page16.h
@@ -40,25 +40,25 @@ protected:
                                //Title Show Button Callback
                                [](void *data, Evas_Object *obj, void *event_info) -> void
                                {
-                                       UiStandardView *view = static_cast<UiStandardView *>(data);
+                                       auto view = static_cast<UiStandardView *>(data);
                                        view->setTitleVisible(true, false);
                                },
                                //Title Hide Button Callback
                                [](void *data, Evas_Object *obj, void *event_info) -> void
                                {
-                                       UiStandardView *view = static_cast<UiStandardView *>(data);
+                                       auto view = static_cast<UiStandardView *>(data);
                                        view->setTitleVisible(false, false);
                                },
                                //Title Show Anim Button Callback
                                [](void *data, Evas_Object *obj, void *event_info) -> void
                                {
-                                       UiStandardView *view = static_cast<UiStandardView *>(data);
+                                       auto view = static_cast<UiStandardView *>(data);
                                        view->setTitleVisible(true, true);
                                },
                                //Title Hide Anim Button Callback
                                [](void *data, Evas_Object *obj, void *event_info) -> void
                                {
-                                       UiStandardView *view = static_cast<UiStandardView *>(data);
+                                       auto view = static_cast<UiStandardView *>(data);
                                        view->setTitleVisible(false, true);
                                }, this);
 

diff --git a/src/lib/efl/UiBaseKeyListener.cpp b/src/lib/efl/UiBaseKeyListener.cpp
index 174ed16bce1013e866671842eef0b294c8ac32d3..34ea818f245d6f9914566ead68d1148209d7e949 100644 (file)
--- a/src/lib/efl/UiBaseKeyListener.cpp
+++ b/src/lib/efl/UiBaseKeyListener.cpp
@@ -101,8 +101,8 @@ bool UiBaseKeyListenerImpl::init()
 
        evas_object_event_callback_add(keyGrabRect, EVAS_CALLBACK_KEY_UP, [](void *data, Evas *e, Evas_Object *obj, void *event_info) -> void
        {
-               Evas_Event_Key_Down *ev = static_cast<Evas_Event_Key_Down *>(event_info);
-               UiBaseKeyListenerImpl *keyListener = static_cast<UiBaseKeyListenerImpl *>(data);
+               auto ev = static_cast<Evas_Event_Key_Down *>(event_info);
+               auto keyListener = static_cast<UiBaseKeyListenerImpl *>(data);
                _keyGrabRectKeyUpCb(keyListener, ev);
        }, this);
 

diff --git a/src/lib/efl/mobile/UiKeyListener.cpp b/src/lib/efl/mobile/UiKeyListener.cpp
index 3be92d148c07a64d438e89f9930a1aa338e07f22..7490309cee8ad7b814621f4fbf7057c20cadadc9 100644 (file)
--- a/src/lib/efl/mobile/UiKeyListener.cpp
+++ b/src/lib/efl/mobile/UiKeyListener.cpp
@@ -30,7 +30,7 @@ UiKeyListener::UiKeyListener(UiViewmgr *viewmgr)
 void UiKeyListener::extendEventProc(UiBaseView *view, Evas_Event_Key_Down *ev)
 {
        if (strcmp(ev->keyname, KEY_MENU) && strcmp(ev->keyname, KEY_MENU2)) return;
-       UiView *v = dynamic_cast<UiView *>(view);
+       auto v = dynamic_cast<UiView *>(view);
        UiMenu *menu = v->onMenuPre();
        if (!menu) return;
 

diff --git a/src/lib/efl/mobile/UiMenu.cpp b/src/lib/efl/mobile/UiMenu.cpp
index b53f6a0b75afc0cdd7c1329c10d02b341def18ec..7adac3db791eff882f291c480a596d7e4bcb6c28 100644 (file)
--- a/src/lib/efl/mobile/UiMenu.cpp
+++ b/src/lib/efl/mobile/UiMenu.cpp
@@ -26,7 +26,7 @@ static void _ctxpopupDismissedCb(void *data, Evas_Object *obj, void *event_info)
 
 static void _ctxpopupDelCb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-       UiMenu *menu = static_cast<UiMenu *>(data);
+       auto menu = static_cast<UiMenu *>(data);
        menu->unsetContent();
 }
 
@@ -61,7 +61,7 @@ static bool _updateMenu(UiMenu *menu)
 
 static void _winResizeCb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-       UiMenu *menu = static_cast<UiMenu *>(data);
+       auto menu = static_cast<UiMenu *>(data);
        if (!menu->isActivated()) return;
 
        _updateMenu(menu);

diff --git a/src/lib/efl/mobile/UiPopup.cpp b/src/lib/efl/mobile/UiPopup.cpp
index c121a4c77fd5f42e14916af5cfc2c01a81c835ce..8c7a6155240506941f1029ecb7346dee870e4c0d 100644 (file)
--- a/src/lib/efl/mobile/UiPopup.cpp
+++ b/src/lib/efl/mobile/UiPopup.cpp
@@ -39,7 +39,7 @@ static void _popupDismissedCb(void *data, Evas_Object *obj, void *event_info)
 
 static void _popupDelCb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-       UiPopup *popup = static_cast<UiPopup *>(data);
+       auto popup = static_cast<UiPopup *>(data);
        popup->unsetContent();
 }
 

diff --git a/src/lib/efl/mobile/c/ui_standard_view.cpp b/src/lib/efl/mobile/c/ui_standard_view.cpp
index 1f2386ca26f58690f40b7ee34aa0db0c16e69a66..589f44ac7094b0cc155416a3a8fe2a4440f0a320 100644 (file)
--- a/src/lib/efl/mobile/c/ui_standard_view.cpp
+++ b/src/lib/efl/mobile/c/ui_standard_view.cpp
@@ -139,7 +139,7 @@ static ui_standard_view_capi *validate_view(ui_standard_view *view)
                return nullptr;
        }
 
-       ui_standard_view_capi *capi_view = dynamic_cast<ui_standard_view_capi *>(view);
+       auto capi_view = dynamic_cast<ui_standard_view_capi *>(view);
        if (!capi_view)
        {
                LOGE("Invalid ui_standard_view = %p. Probably, you passed ui_view, not ui_standard_view.", view);