From ad2a5bf616ba758e7d45c002ad0468d5d1f9fdd9 Mon Sep 17 00:00:00 2001
From: Hermet Park <hermet@hermet.pe.kr>
Date: Fri, 14 Oct 2016 17:31:56 +0900
Subject: [PATCH] c++: clean up code.

Skip return types in the lamda expressions for simplifying code.

Change-Id: Ic65134a3448eb499b936be34caaff7c5246176a5
---
 src/examples/efl/cpp/page1.h          |  4 ++--
 src/examples/efl/cpp/page10.h         |  8 ++++----
 src/examples/efl/cpp/page11.h         |  4 ++--
 src/examples/efl/cpp/page12.h         | 10 +++++-----
 src/examples/efl/cpp/page13.h         |  4 ++--
 src/examples/efl/cpp/page14.h         |  4 ++--
 src/examples/efl/cpp/page15.h         |  2 +-
 src/examples/efl/cpp/page16.h         | 12 ++++++------
 src/examples/efl/cpp/page2.h          |  4 ++--
 src/examples/efl/cpp/page3.h          |  4 ++--
 src/examples/efl/cpp/page4.h          |  4 ++--
 src/examples/efl/cpp/page5.h          |  4 ++--
 src/examples/efl/cpp/page6.h          |  4 ++--
 src/examples/efl/cpp/page7.h          |  4 ++--
 src/examples/efl/cpp/page8.h          |  4 ++--
 src/examples/efl/cpp/page9.h          |  8 ++++----
 src/lib/efl/UiBaseKeyListener.cpp     |  2 +-
 src/lib/efl/UiBaseViewmgr.cpp         |  8 ++++----
 src/lib/efl/mobile/UiStandardView.cpp |  2 +-
 19 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/examples/efl/cpp/page1.h b/src/examples/efl/cpp/page1.h
index 7166016..3e225fc 100644
--- a/src/examples/efl/cpp/page1.h
+++ b/src/examples/efl/cpp/page1.h
@@ -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());
 									});
diff --git a/src/examples/efl/cpp/page10.h b/src/examples/efl/cpp/page10.h
index 616a881..a3685cc 100644
--- a/src/examples/efl/cpp/page10.h
+++ b/src/examples/efl/cpp/page10.h
@@ -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());
 												});
diff --git a/src/examples/efl/cpp/page11.h b/src/examples/efl/cpp/page11.h
index 7551436..1ca1791 100644
--- a/src/examples/efl/cpp/page11.h
+++ b/src/examples/efl/cpp/page11.h
@@ -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());
 									});
diff --git a/src/examples/efl/cpp/page12.h b/src/examples/efl/cpp/page12.h
index e63484f..2223609 100644
--- a/src/examples/efl/cpp/page12.h
+++ b/src/examples/efl/cpp/page12.h
@@ -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);
 										},
diff --git a/src/examples/efl/cpp/page13.h b/src/examples/efl/cpp/page13.h
index 0fb20fe..e1fdfeb 100644
--- a/src/examples/efl/cpp/page13.h
+++ b/src/examples/efl/cpp/page13.h
@@ -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());
 									});
diff --git a/src/examples/efl/cpp/page14.h b/src/examples/efl/cpp/page14.h
index f13f7c0..e1e8740 100644
--- a/src/examples/efl/cpp/page14.h
+++ b/src/examples/efl/cpp/page14.h
@@ -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());
 									});
diff --git a/src/examples/efl/cpp/page15.h b/src/examples/efl/cpp/page15.h
index d8c0414..87f0e87 100644
--- a/src/examples/efl/cpp/page15.h
+++ b/src/examples/efl/cpp/page15.h
@@ -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());
 										},
diff --git a/src/examples/efl/cpp/page16.h b/src/examples/efl/cpp/page16.h
index d965df7..5bb2494 100644
--- a/src/examples/efl/cpp/page16.h
+++ b/src/examples/efl/cpp/page16.h
@@ -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);
diff --git a/src/examples/efl/cpp/page2.h b/src/examples/efl/cpp/page2.h
index 77fd5cf..c5055b9 100644
--- a/src/examples/efl/cpp/page2.h
+++ b/src/examples/efl/cpp/page2.h
@@ -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());
 									});
diff --git a/src/examples/efl/cpp/page3.h b/src/examples/efl/cpp/page3.h
index fc74c0a..16315c2 100644
--- a/src/examples/efl/cpp/page3.h
+++ b/src/examples/efl/cpp/page3.h
@@ -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());
 									});
diff --git a/src/examples/efl/cpp/page4.h b/src/examples/efl/cpp/page4.h
index 38f5210..f46c530 100644
--- a/src/examples/efl/cpp/page4.h
+++ b/src/examples/efl/cpp/page4.h
@@ -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());
 									});
diff --git a/src/examples/efl/cpp/page5.h b/src/examples/efl/cpp/page5.h
index 57e087e..ea4bde9 100644
--- a/src/examples/efl/cpp/page5.h
+++ b/src/examples/efl/cpp/page5.h
@@ -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());
 									});
diff --git a/src/examples/efl/cpp/page6.h b/src/examples/efl/cpp/page6.h
index 97b874e..3884efc 100644
--- a/src/examples/efl/cpp/page6.h
+++ b/src/examples/efl/cpp/page6.h
@@ -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());
 									});
diff --git a/src/examples/efl/cpp/page7.h b/src/examples/efl/cpp/page7.h
index f774fe4..4609874 100644
--- a/src/examples/efl/cpp/page7.h
+++ b/src/examples/efl/cpp/page7.h
@@ -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());
 									});
diff --git a/src/examples/efl/cpp/page8.h b/src/examples/efl/cpp/page8.h
index 3f62b52..87f467f 100644
--- a/src/examples/efl/cpp/page8.h
+++ b/src/examples/efl/cpp/page8.h
@@ -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());
 									});
diff --git a/src/examples/efl/cpp/page9.h b/src/examples/efl/cpp/page9.h
index 2ad3a5c..c7ae0cd 100644
--- a/src/examples/efl/cpp/page9.h
+++ b/src/examples/efl/cpp/page9.h
@@ -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());
 											});
diff --git a/src/lib/efl/UiBaseKeyListener.cpp b/src/lib/efl/UiBaseKeyListener.cpp
index b866383..d093b28 100644
--- a/src/lib/efl/UiBaseKeyListener.cpp
+++ b/src/lib/efl/UiBaseKeyListener.cpp
@@ -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);
diff --git a/src/lib/efl/UiBaseViewmgr.cpp b/src/lib/efl/UiBaseViewmgr.cpp
index b17e4a9..d634c46 100644
--- a/src/lib/efl/UiBaseViewmgr.cpp
+++ b/src/lib/efl/UiBaseViewmgr.cpp
@@ -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);
diff --git a/src/lib/efl/mobile/UiStandardView.cpp b/src/lib/efl/mobile/UiStandardView.cpp
index b2825c0..0db2bc2 100644
--- a/src/lib/efl/mobile/UiStandardView.cpp
+++ b/src/lib/efl/mobile/UiStandardView.cpp
@@ -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();
-- 
2.34.1