summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNilesh Trimbake <t.shripati@samsung.com>2018-04-10 15:07:56 +0530
committerNilesh Trimbake <t.shripati@samsung.com>2018-04-10 15:32:53 +0530
commit0edf5d67758ead21245f4d72fdcf795811705d64 (patch)
treeb9ebef65855b1b0be5361224941f1b6fe5039d9c
parentcc1999d97ef9f893c449ff7fa0cb00498d602944 (diff)
downloadgallery-0edf5d67758ead21245f4d72fdcf795811705d64.tar.gz
gallery-0edf5d67758ead21245f4d72fdcf795811705d64.tar.bz2
gallery-0edf5d67758ead21245f4d72fdcf795811705d64.zip
This patch replace deprecated Elementary enum EO_CALLBACK_PRIORITY_AFTER, with EVAS_CALLBACK_PRIORITY_AFTER Change-Id: I8af7931d8163647d1f343193fb01b423f46a5282
-rw-r--r--gallery/view/ImageGrid.cpp8
-rw-r--r--ucl/source/gui/Widget.cpp2
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);
}