c++: clean up code. 81/92281/1
authorHermet Park <hermet@hermet.pe.kr>
Fri, 14 Oct 2016 08:31:56 +0000 (17:31 +0900)
committerHermet Park <hermet@hermet.pe.kr>
Fri, 14 Oct 2016 08:31:56 +0000 (17:31 +0900)
Skip return types in the lamda expressions for simplifying code.

Change-Id: Ic65134a3448eb499b936be34caaff7c5246176a5

19 files changed:
src/examples/efl/cpp/page1.h
src/examples/efl/cpp/page10.h
src/examples/efl/cpp/page11.h
src/examples/efl/cpp/page12.h
src/examples/efl/cpp/page13.h
src/examples/efl/cpp/page14.h
src/examples/efl/cpp/page15.h
src/examples/efl/cpp/page16.h
src/examples/efl/cpp/page2.h
src/examples/efl/cpp/page3.h
src/examples/efl/cpp/page4.h
src/examples/efl/cpp/page5.h
src/examples/efl/cpp/page6.h
src/examples/efl/cpp/page7.h
src/examples/efl/cpp/page8.h
src/examples/efl/cpp/page9.h
src/lib/efl/UiBaseKeyListener.cpp
src/lib/efl/UiBaseViewmgr.cpp
src/lib/efl/mobile/UiStandardView.cpp

index 7166016ba4c614ddb48dcce05079ce607cdfd703..3e225fce3d949d6ee5ece80510f9c645cccfe6ba 100644 (file)
@@ -29,12 +29,12 @@ protected:
                //Create a main content.
                Eo *content = createContent(this->getBase(), "ViewMgr++ Demo<br>Basic View",
                                                                        //Prev Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->popView();
                                                                        },
                                                                        //Next Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->pushView(new page2());
                                                                        });
index 616a8810098250c16368462abc5150f722b7024e..a3685cceb57ba4d0cbad74f66b822ebdd1d6c063 100644 (file)
@@ -36,12 +36,12 @@ protected:
                        //Portrait
                        Eo *content = createContent(this->getBase(), "ViewMgr++ Demo<br>Rotation",
                                                                                //Prev Button Callback
-                                                                               [](void *data, Eo *obj, void *event_info) -> void
+                                                                               [](void *data, Eo *obj, void *event_info)
                                                                                {
                                                                                        UI_VIEWMGR->popView();
                                                                                },
                                                                                //Next Button Callback
-                                                                               [](void *data, Eo *obj, void *event_info) -> void
+                                                                               [](void *data, Eo *obj, void *event_info)
                                                                                {
                                                                                        UI_VIEWMGR->pushView(new page11());
                                                                                });
@@ -54,12 +54,12 @@ protected:
                        //Landscape
                        Eo *content = createLandscapeContent(this->getBase(), "ViewMgr++ Demo<br>Rotation",
                                                                                                //Prev Button Callback
-                                                                                               [](void *data, Eo *obj, void *event_info) -> void
+                                                                                               [](void *data, Eo *obj, void *event_info)
                                                                                                {
                                                                                                        UI_VIEWMGR->popView();
                                                                                                },
                                                                                                //Next Button Callback
-                                                                                               [](void *data, Eo *obj, void *event_info) -> void
+                                                                                               [](void *data, Eo *obj, void *event_info)
                                                                                                {
                                                                                                        UI_VIEWMGR->pushView(new page11());
                                                                                                });
index 75514364cba7a2f9737d21f140feffc7da3d71ec..1ca17913376844781e52ac752f78d390029258c3 100644 (file)
@@ -36,12 +36,12 @@ protected:
                //Create a main content.
                Eo *content = createContent(this->getBase(), "ViewMgr++ Demo<br>Menu Popup",
                                                                        //Prev Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->popView();
                                                                        },
                                                                        //Next Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->pushView(new page12());
                                                                        });
index e63484ffbdeb3cd7f1ff50ec59dee3c39255ac92..222360937ee6afe0f17976283f28857c25e67ae1 100644 (file)
@@ -37,12 +37,12 @@ protected:
                //Create a main content.
                Eo *content = createContent(this->getBase(), "ViewMgr++ Demo<br>Popup",
                                                                        //Prev Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->popView();
                                                                        },
                                                                        //Next Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->pushView(new page13());
                                                                        });
@@ -51,7 +51,7 @@ protected:
                Elm_Button *rightBtn = elm_button_add(this->getBase());
                elm_object_text_set(rightBtn, "popup");
                evas_object_smart_callback_add(rightBtn, "clicked",
-                                                                               [](void *data, Eo *obj, void *event_info) -> void
+                                                                               [](void *data, Eo *obj, void *event_info)
                                                                                {
                                                                                        auto view = static_cast<page12 *>(data);
                                                                                        view->createPopup();
@@ -79,13 +79,13 @@ public:
                elm_popup_timeout_set(obj, 3.0);
                evas_object_smart_callback_add(obj, "dismissed", _popupDismissedCb, popup);
                evas_object_smart_callback_add(obj, "block,clicked",
-                                                                               [](void *data, Eo *obj, void *event_info) -> void
+                                                                               [](void *data, Eo *obj, void *event_info)
                                                                                {
                                                                                        elm_popup_dismiss(obj);
                                                                                },
                                                                                nullptr);
                evas_object_smart_callback_add(obj, "timeout",
-                                                                               [](void *data, Eo *obj, void *event_info) -> void
+                                                                               [](void *data, Eo *obj, void *event_info)
                                                                                {
                                                                                        elm_popup_dismiss(obj);
                                                                                },
index 0fb20fe8cd4394ac6e73c1744d5d4644c5d415b5..e1fdfeb85944587e4ece48c12455b3845ca20bd2 100644 (file)
@@ -30,12 +30,12 @@ protected:
                //Create a main content.
                Eo *content = createContent(this->getBase(), "ViewMgr++ Demo<br>Fade Transition",
                                                                        //Prev Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->popView();
                                                                        },
                                                                        //Next Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->pushView(new page14());
                                                                        });
index f13f7c06d7a71a3786d3cee7718c778f697a5b8a..e1e8740be8376e5d497b1b845a59ba97d42683a4 100644 (file)
@@ -30,12 +30,12 @@ protected:
                //Create a main content.
                Eo *content = createContent(this->getBase(), "ViewMgr++ Demo<br>None Transition",
                                                                        //Prev Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->popView();
                                                                        },
                                                                        //Next Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->pushView(new page15());
                                                                        });
index d8c0414a7b51baef40d64150107b9daf09206a30..87f0e87a0f22750cbf1b6c4269ad788e5c144a9d 100644 (file)
@@ -33,7 +33,7 @@ protected:
                Elm_Button *rightBtn = elm_button_add(this->getBase());
                elm_object_text_set(rightBtn, "Next");
                evas_object_smart_callback_add(rightBtn, "clicked",
-                                                                               [](void *data, Eo *obj, void *event_info) -> void
+                                                                               [](void *data, Eo *obj, void *event_info)
                                                                                {
                                                                                        UI_VIEWMGR->pushView(new page16());
                                                                                },
index d965df7da3aa6c9872836b0ac0a6ff800f5152d4..5bb24941cca6babd790999dce442ae54ae909da0 100644 (file)
@@ -28,35 +28,35 @@ protected:
                //Create a main content.
                Eo *content = createTitleHandleContent(this->getBase(),
                                                                                        //Prev Button Callback
-                                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                                       [](void *data, Eo *obj, void *event_info)
                                                                                        {
                                                                                                UI_VIEWMGR->popView();
                                                                                        },
                                                                                        //Next Button Callback
-                                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                                       [](void *data, Eo *obj, void *event_info)
                                                                                        {
                                                                                                UI_VIEWMGR->deactivate();
                                                                                        },
                                                                                        //Title Show Button Callback
-                                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                                       [](void *data, Eo *obj, void *event_info)
                                                                                        {
                                                                                                auto view = static_cast<UiStandardView *>(data);
                                                                                                view->setTitleVisible(true, false);
                                                                                        },
                                                                                        //Title Hide Button Callback
-                                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                                       [](void *data, Eo *obj, void *event_info)
                                                                                        {
                                                                                                auto view = static_cast<UiStandardView *>(data);
                                                                                                view->setTitleVisible(false, false);
                                                                                        },
                                                                                        //Title Show Anim Button Callback
-                                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                                       [](void *data, Eo *obj, void *event_info)
                                                                                        {
                                                                                                auto view = static_cast<UiStandardView *>(data);
                                                                                                view->setTitleVisible(true, true);
                                                                                        },
                                                                                        //Title Hide Anim Button Callback
-                                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                                       [](void *data, Eo *obj, void *event_info)
                                                                                        {
                                                                                                auto view = static_cast<UiStandardView *>(data);
                                                                                                view->setTitleVisible(false, true);
index 77fd5cf563ccf0e7cd05bbbdfd66e591bee5db41..c5055b91b1093557b1306bf682523baa781da5f0 100644 (file)
@@ -28,12 +28,12 @@ protected:
                //Create a main content.
                Eo *content = createContent(this->getBase(), "ViewMgr++ Demo<br>Title Buttons",
                                                                        //Prev Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->popView();
                                                                        },
                                                                        //Next Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                          UI_VIEWMGR->pushView(new page3());
                                                                        });
index fc74c0a1b878e4598161e5124cdbb6fc0b8df4ab..16315c28c4ad12a0db3e9f60a7e485987701a07e 100644 (file)
@@ -28,12 +28,12 @@ protected:
                //Create a main content.
                Eo *content = createContent(this->getBase(), "ViewMgr++ Demo<br>Subtitle",
                                                                        //Prev Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->popView();
                                                                        },
                                                                        //Next Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->pushView(new page4());
                                                                        });
index 38f5210b9393d178ac8e235cb3913808f721501f..f46c530a7382004834b0eec36ca94f63a72569fd 100644 (file)
@@ -29,12 +29,12 @@ protected:
                //Create a main content.
                Eo *content = createContent(this->getBase(), "ViewMgr++ Demo<br>Title Badge",
                                                                        //Prev Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->popView();
                                                                        },
                                                                        //Next Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->pushView(new page5());
                                                                        });
index 57e087ef8a42b019e412fc4124a337ae4e7fa9e1..ea4bde95c38a0f61c6e317d5fbe91b1cf3822cf0 100644 (file)
@@ -28,12 +28,12 @@ protected:
                //Create a main content.
                Eo *content = createContent(this->getBase(), "ViewMgr++ Demo<br>Full View",
                                                                        //Prev Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->popView();
                                                                        },
                                                                        //Next Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->pushView(new page6());
                                                                        });
index 97b874eabdc29d0c5c46495b17902e0a47090fe1..3884efcf19d47171d2bb8482a9da482264965426 100644 (file)
@@ -27,12 +27,12 @@ protected:
                //Create a main content.
                Eo *content = createContent(this->getBase(), "ViewMgr++ Demo<br>Toolbar",
                                                                        //Prev Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->popView();
                                                                        },
                                                                        //Next Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->pushView(new page7());
                                                                        });
index f774fe41321b613bf040e0f4a7b9750fa1682abd..4609874493fff5565cc8754cbbd3651daa0d0cbd 100644 (file)
@@ -27,12 +27,12 @@ protected:
                //Create a main content.
                Eo *content = createContent(this->getBase(), "ViewMgr++ Demo<br>Navigationbar",
                                                                        //Prev Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->popView();
                                                                        },
                                                                        //Next Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->pushView(new page8());
                                                                        });
index 3f62b5257f586b5701c38fd942c89ce3cb45359d..87f467fc4dab1d5580823b0daab7c4fc82c09cc1 100644 (file)
@@ -25,12 +25,12 @@ public:
                //Create a main content.
                Eo *content = createContent(this->getBase(), "ViewMgr++ Demo<br>Content Preloading",
                                                                        //Prev Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->popView();
                                                                        },
                                                                        //Next Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->pushView(new page9());
                                                                        });
index 2ad3a5c12decf01308efe69f2bcf04cf291bc8b4..c7ae0cd396a12eafb9748217795d30022448194f 100644 (file)
@@ -38,12 +38,12 @@ protected:
 
                Eo *content = createContent(this->getBase(), "ViewMgr Demo<br>Portrait/Landscape",
                                                                        //Prev Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->popView();
                                                                        },
                                                                        //Next Button Callback
-                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                       [](void *data, Eo *obj, void *event_info)
                                                                        {
                                                                                UI_VIEWMGR->pushView(new page10());
                                                                        });
@@ -60,12 +60,12 @@ protected:
 
                Eo *content = createLandscapeContent(this->getBase(), "ViewMgr Demo<br>Portrait/Landscape",
                                                                                        //Prev Button Callback
-                                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                                       [](void *data, Eo *obj, void *event_info)
                                                                                        {
                                                                                                UI_VIEWMGR->popView();
                                                                                        },
                                                                                        //Next Button Callback
-                                                                                       [](void *data, Eo *obj, void *event_info) -> void
+                                                                                       [](void *data, Eo *obj, void *event_info)
                                                                                        {
                                                                                                UI_VIEWMGR->pushView(new page10());
                                                                                        });
index b8663831e96772bf5a4d9288bd7ab703cb006b7f..d093b2808bc5895ac59937a9885f6e3fc26740ee 100644 (file)
@@ -99,7 +99,7 @@ int UiBaseKeyListenerImpl::init()
                return TIZEN_ERROR_UNKNOWN;
        }
 
-       evas_object_event_callback_add(keyGrabRect, EVAS_CALLBACK_KEY_UP, [](void *data, Evas *e, Eo *obj, void *event_info) -> void
+       evas_object_event_callback_add(keyGrabRect, EVAS_CALLBACK_KEY_UP, [](void *data, Evas *e, Eo *obj, void *event_info)
        {
                auto ev = static_cast<Evas_Event_Key_Down *>(event_info);
                auto keyListener = static_cast<UiBaseKeyListenerImpl *>(data);
index b17e4a9ff40dc3f7171b625013b1e6b83ffbf5c2..d634c46155a779a1e1f581719e9941e7bc76e86a 100644 (file)
@@ -95,7 +95,7 @@ bool UiBaseViewmgrImpl::_createBaseLayout(Elm_Scroller *scroller, const char *st
 
        //Push Finished Event
        elm_layout_signal_callback_add(layout, "push,finished", "viewmgr",
-                       [](void *data, Eo *obj, const char *emission, const char *source) -> void
+                       [](void *data, Eo *obj, const char *emission, const char *source)
                        {
                                auto viewmgr = static_cast<UiBaseViewmgr *>(data);
                                UiBaseView *pview = viewmgr->getView(viewmgr->getViewCount() - 2);
@@ -107,7 +107,7 @@ bool UiBaseViewmgrImpl::_createBaseLayout(Elm_Scroller *scroller, const char *st
 
        //Pop Finished Event
        elm_layout_signal_callback_add(layout, "pop,finished", "viewmgr",
-                       [](void *data, Eo *obj, const char *emission, const char *source) -> void
+                       [](void *data, Eo *obj, const char *emission, const char *source)
                        {
                                auto viewmgr = static_cast<UiBaseViewmgr *>(data);
                                UiBaseView *pview = viewmgr->getView(viewmgr->getViewCount() - 2);
@@ -275,7 +275,7 @@ UiBaseViewmgrImpl::UiBaseViewmgrImpl(UiBaseViewmgr *viewmgr, const char *pkg, Ui
                elm_win_wm_rotation_available_rotations_set(this->_win, (const int *) (&rots), 4);
        }
        evas_object_smart_callback_add(this->_win, "wm,rotation,changed",
-                       [](void *data, Eo *obj, void *event_info) -> void
+                       [](void *data, Eo *obj, void *event_info)
                        {
                                int rot = elm_win_rotation_get(obj);
 
@@ -292,7 +292,7 @@ UiBaseViewmgrImpl::UiBaseViewmgrImpl(UiBaseViewmgr *viewmgr, const char *pkg, Ui
                        , this->_viewmgr);
        //Window is requested to delete.
        evas_object_smart_callback_add(this->_win, "delete,request",
-                       [](void *data, Eo *obj, void *event_info) -> void
+                       [](void *data, Eo *obj, void *event_info)
                        {
                                auto viewmgr = static_cast<UiBaseViewmgr*>(data);
                                delete(viewmgr);
index b2825c0de999d4e28af9beb00f63d619ad3e576f..0db2bc2b307f990547738fc1d99129ae72fd7c11 100644 (file)
@@ -143,7 +143,7 @@ bool UiStandardViewImpl::_createLayout()
                if (!prevBtn) {
                        LOGE("Failed to create a button = UiStandardView(%p)", this);
                } else {
-                       evas_object_smart_callback_add(prevBtn, "clicked", [](void *data, Eo *obj, void *event_info) -> void
+                       evas_object_smart_callback_add(prevBtn, "clicked", [](void *data, Eo *obj, void *event_info)
                        {
                                auto viewmgr = static_cast<UiViewmgr *>(data);
                                viewmgr->popView();