From 0edf5d67758ead21245f4d72fdcf795811705d64 Mon Sep 17 00:00:00 2001 From: Nilesh Trimbake Date: Tue, 10 Apr 2018 15:07:56 +0530 Subject: Update Elementary Enum. This patch replace deprecated Elementary enum EO_CALLBACK_PRIORITY_AFTER, with EVAS_CALLBACK_PRIORITY_AFTER Change-Id: I8af7931d8163647d1f343193fb01b423f46a5282 --- gallery/view/ImageGrid.cpp | 8 +++----- ucl/source/gui/Widget.cpp | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/gallery/view/ImageGrid.cpp b/gallery/view/ImageGrid.cpp index a456e0a..9b140fd 100644 --- a/gallery/view/ImageGrid.cpp +++ b/gallery/view/ImageGrid.cpp @@ -494,8 +494,7 @@ namespace gallery { (curImgW != m_imageWidth) || (curImgH != m_imageHeight) || ( ((curImgW / m_imageLoadSize) <= 1) && - ((curImgH / m_imageLoadSize) <= 1) - )); + ((curImgH / m_imageLoadSize) <= 1) )); } void onImagePreloaded(Widget &widget, void *eventInfo) @@ -892,7 +891,7 @@ namespace gallery { WEAK_DELEGATE(ImageGrid::onBoxMove, asWeak(*this))); evas_object_event_callback_priority_add(m_box, - EVAS_CALLBACK_RESIZE, EO_CALLBACK_PRIORITY_AFTER, + EVAS_CALLBACK_RESIZE, EVAS_CALLBACK_PRIORITY_AFTER, CALLBACK_A(ImageGrid::onBoxResize), this); } @@ -1240,8 +1239,7 @@ namespace gallery { return (isItemFullyVisible(slotIndex, itemOffset, minVisibleOffset, maxVisibleOffset) ? RES_OK : RES_FALSE); - } - ) == RES_OK); + }) == RES_OK); } bool ImageGrid::isItemFullyVisible( diff --git a/ucl/source/gui/Widget.cpp b/ucl/source/gui/Widget.cpp index 096c6e1..f2e5cd3 100644 --- a/ucl/source/gui/Widget.cpp +++ b/ucl/source/gui/Widget.cpp @@ -123,7 +123,7 @@ namespace ucl { if (isShared()) { evas_object_event_callback_priority_add(m_eo, EVAS_CALLBACK_DEL, - EO_CALLBACK_PRIORITY_AFTER, + EVAS_CALLBACK_PRIORITY_AFTER, CALLBACK_A(Widget::onEoDel), this); } -- cgit v1.2.3