From 1cb600e635813576b3308569555122fc0a4c181f Mon Sep 17 00:00:00 2001 From: "U. Artie Eoff" Date: Thu, 21 Jun 2012 12:40:26 -0700 Subject: [PATCH] restore evasobject encapsulation Signed-off-by: U. Artie Eoff --- src/efl/actionslider.cpp | 4 ---- src/efl/actionslider.h | 2 -- src/efl/background.cpp | 4 ---- src/efl/background.h | 2 -- src/efl/evasobject.h | 2 +- 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/efl/actionslider.cpp b/src/efl/actionslider.cpp index e1f7d25..66a407e 100644 --- a/src/efl/actionslider.cpp +++ b/src/efl/actionslider.cpp @@ -36,7 +36,3 @@ Elm_Actionslider_Pos Actionslider::getPos() return elm_actionslider_indicator_pos_get(*this); } -Actionslider::operator Evas_Object*() -{ - return EvasObject::obj_; -} diff --git a/src/efl/actionslider.h b/src/efl/actionslider.h index 2d40bb8..a8b3f34 100644 --- a/src/efl/actionslider.h +++ b/src/efl/actionslider.h @@ -15,8 +15,6 @@ public: Elm_Actionslider_Pos getPos(); - operator Evas_Object*(); - private: Evas_Object *parent; }; diff --git a/src/efl/background.cpp b/src/efl/background.cpp index 23b965a..74a5488 100644 --- a/src/efl/background.cpp +++ b/src/efl/background.cpp @@ -43,7 +43,3 @@ Elm_Bg_Option Background::getImageOpt() return elm_bg_option_get(*this); } -Background::operator Evas_Object*() -{ - return EvasObject::obj_; -} diff --git a/src/efl/background.h b/src/efl/background.h index 16beab8..133e08f 100644 --- a/src/efl/background.h +++ b/src/efl/background.h @@ -25,8 +25,6 @@ public: void getImage(path&); Elm_Bg_Option getImageOpt(); - operator Evas_Object*(); - private: Evas_Object *parent; }; diff --git a/src/efl/evasobject.h b/src/efl/evasobject.h index a9c22a7..871cefa 100644 --- a/src/efl/evasobject.h +++ b/src/efl/evasobject.h @@ -21,7 +21,7 @@ public: operator Ecore_Evas*(); operator Evas_Object*(); -protected: +private: Evas_Object* obj_; }; -- 2.7.4