From a2d430fad21aa6010525ffc06b2883a0109cdac8 Mon Sep 17 00:00:00 2001 From: Joe Konno Date: Thu, 19 Jul 2012 15:40:09 -0700 Subject: [PATCH] EFL: add isVisible() to EvasObject, minor refactor For refactor, make class method use in the check() methods explicit with "this->" syntax. Signed-off-by: Joe Konno --- src/efl/evasobject.cpp | 15 ++++++++++----- src/efl/evasobject.h | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/efl/evasobject.cpp b/src/efl/evasobject.cpp index 65c8180..4d35d6d 100644 --- a/src/efl/evasobject.cpp +++ b/src/efl/evasobject.cpp @@ -78,19 +78,24 @@ const int EvasObject::getHeight() return h; } +const Eina_Bool EvasObject::isVisible() +{ + return evas_object_visible_get(*this); +} + void EvasObject::checkSize(const int width, const int height) { - BOOST_CHECK_EQUAL(getWidth(), width); - BOOST_CHECK_EQUAL(getHeight(), height); + BOOST_CHECK_EQUAL(this->getWidth(), width); + BOOST_CHECK_EQUAL(this->getHeight(), height); } void EvasObject::checkPosition(const int xcoord, const int ycoord) { - BOOST_CHECK_EQUAL(getX(), xcoord); - BOOST_CHECK_EQUAL(getY(), ycoord); + BOOST_CHECK_EQUAL(this->getX(), xcoord); + BOOST_CHECK_EQUAL(this->getY(), ycoord); } void EvasObject::checkVisible(const Eina_Bool isVisible) { - BOOST_CHECK_EQUAL(evas_object_visible_get(*this), isVisible); + BOOST_CHECK_EQUAL(this->isVisible(), isVisible); } diff --git a/src/efl/evasobject.h b/src/efl/evasobject.h index e232faa..624b4cf 100644 --- a/src/efl/evasobject.h +++ b/src/efl/evasobject.h @@ -16,6 +16,7 @@ public: const int getHeight(); const int getX(); const int getY(); + const Eina_Bool isVisible(); operator Evas*(); operator Ecore_Evas*(); -- 2.7.4