From: Lukasz Stanislawski Date: Fri, 6 Jul 2018 08:53:32 +0000 (+0200) Subject: Revert "fix build break due to ABI break in EFL 1.20" X-Git-Tag: submit/tizen/20180706.102639^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_5.5;p=profile%2Fmobile%2Fapps%2Fnative%2Fclock.git Revert "fix build break due to ABI break in EFL 1.20" This reverts commit 0756b32486a0f6e668944b06d8184fb1fe739212. The ABI break which was fixed in 0756b32486a0f6e668944b06d8184fb1fe739212 was eventually revered by EFL team. Change-Id: I0508f92aec59c5d75017528ddd235f67a26981b9 --- diff --git a/clock/src/View/AlarmListView.cpp b/clock/src/View/AlarmListView.cpp index 5487e9d..4de2940 100644 --- a/clock/src/View/AlarmListView.cpp +++ b/clock/src/View/AlarmListView.cpp @@ -55,7 +55,7 @@ struct AlarmListView::ItemData { }; Elm_Genlist_Item_Class AlarmListView::alarm_itc = { - 0, 0, EINA_FALSE, + 0, 0, EINA_FALSE, EINA_TRUE, "alarm", nullptr, nullptr, { AlarmListView::TextGet, AlarmListView::ContentGet, @@ -63,8 +63,7 @@ Elm_Genlist_Item_Class AlarmListView::alarm_itc = { AlarmListView::Del, nullptr, nullptr, - }, - EINA_TRUE + } }; void AlarmListView::ItemClicked(void *data, Evas_Object *obj, void *info) diff --git a/clock/src/View/StopWatchView.cpp b/clock/src/View/StopWatchView.cpp index 3ef3cf8..6cac2a7 100644 --- a/clock/src/View/StopWatchView.cpp +++ b/clock/src/View/StopWatchView.cpp @@ -28,12 +28,11 @@ const char *StopWatchView::EDJE_FILE = "edje/StopWatch.edj"; const char *StopWatchView::GROUP = "StopWatch"; const Elm_Genlist_Item_Class StopWatchView::list_itc = { - 0, 0, EINA_FALSE, + 0, 0, EINA_FALSE, EINA_TRUE, "lap", nullptr, nullptr, { GetListText, nullptr, nullptr, nullptr, nullptr, nullptr, - }, - EINA_TRUE + } }; StopWatchView::StopWatchView(ui::IView &main) diff --git a/clock/src/View/WorldClockDeleteItemsView.cpp b/clock/src/View/WorldClockDeleteItemsView.cpp index ae3bc4d..9bc3370 100644 --- a/clock/src/View/WorldClockDeleteItemsView.cpp +++ b/clock/src/View/WorldClockDeleteItemsView.cpp @@ -61,7 +61,7 @@ struct LocationDeleteItemData { /* Delete list View */ Elm_Genlist_Item_Class WorldClockDeleteItemsView::world_clock_delete_view_itc_ = { - 0, 0, EINA_FALSE, + 0, 0, EINA_FALSE, EINA_TRUE, "worldclock.delete/reorder.list", nullptr, nullptr, { WorldClockDeleteItemsView::TextGet, WorldClockDeleteItemsView::ContentGet, @@ -69,8 +69,7 @@ Elm_Genlist_Item_Class WorldClockDeleteItemsView::world_clock_delete_view_itc_ = WorldClockDeleteItemsView::Del, nullptr, nullptr, - }, - EINA_TRUE + } }; void WorldClockDeleteItemsView::AppendItems(std::vector locations) diff --git a/clock/src/View/WorldClockReorderView.cpp b/clock/src/View/WorldClockReorderView.cpp index 309830f..7f2ad5d 100644 --- a/clock/src/View/WorldClockReorderView.cpp +++ b/clock/src/View/WorldClockReorderView.cpp @@ -56,7 +56,7 @@ struct LocationReorderItemData { /* Reorder list View */ Elm_Genlist_Item_Class WorldClockReorderView::world_clock_reorder_items_view_itc_ = { - 0, 0, EINA_FALSE, + 0, 0, EINA_FALSE, EINA_TRUE, "worldclock.delete/reorder.list", nullptr, nullptr, { WorldClockReorderView::TextGet, WorldClockReorderView::ContentGet, @@ -64,8 +64,7 @@ Elm_Genlist_Item_Class WorldClockReorderView::world_clock_reorder_items_view_itc WorldClockReorderView::Del, nullptr, nullptr, - }, - EINA_TRUE + } }; diff --git a/clock/src/View/WorldClockView.cpp b/clock/src/View/WorldClockView.cpp index 768e366..4776816 100644 --- a/clock/src/View/WorldClockView.cpp +++ b/clock/src/View/WorldClockView.cpp @@ -43,7 +43,7 @@ using namespace utils; /* Custom list View */ Elm_Genlist_Item_Class WorldClockView::world_clock_itc_ = { - 0, 0, EINA_FALSE, + 0, 0, EINA_FALSE, EINA_TRUE, "worldclock.custom.list", nullptr, nullptr, { WorldClockView::TextGet, nullptr, @@ -51,8 +51,7 @@ Elm_Genlist_Item_Class WorldClockView::world_clock_itc_ = { WorldClockView::Del, nullptr, nullptr, - }, - EINA_TRUE + } };