From d4b7b46b421f2ef00e8e27b9c2ec281dd0627836 Mon Sep 17 00:00:00 2001 From: "U. Artie Eoff" Date: Thu, 11 Oct 2012 12:22:59 -0700 Subject: [PATCH] evasobject: make it strictly evas dependent (no ecore,elm) Signed-off-by: U. Artie Eoff --- src/efl/evasobject.cpp | 10 ++-------- src/efl/evasobject.h | 4 ---- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/efl/evasobject.cpp b/src/efl/evasobject.cpp index 81837d7..46fc92b 100644 --- a/src/efl/evasobject.cpp +++ b/src/efl/evasobject.cpp @@ -1,7 +1,7 @@ -#include +#include #include "evasobject.h" -#include "application.h" +#include "common/test.h" EvasObject::EvasObject(Evas_Object* o) : obj_(o) @@ -18,17 +18,11 @@ EvasObject::~EvasObject() obj_ = NULL; } -//FIXME: see header // EvasObject::operator Evas*() // { // return evas_object_evas_get(*this); // } -// EvasObject::operator Ecore_Evas*() -// { -// return ecore_evas_object_ecore_evas_get(*this); -// } - EvasObject::operator Evas_Object*() { return obj_; diff --git a/src/efl/evasobject.h b/src/efl/evasobject.h index 88cbf0e..1cf10dd 100644 --- a/src/efl/evasobject.h +++ b/src/efl/evasobject.h @@ -19,11 +19,7 @@ public: const int getY(); const Eina_Bool isVisible(); - //FIXME: these compiled fine before... but for some reason they are flagged - // as ambiguous by the compiler now... this started happending when - // EO was added as dependency to Evas. // operator Evas*(); -// operator Ecore_Evas*(); operator Evas_Object*(); -- 2.7.4