hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d040f90d15a69f394e17ab19119e541d95bf9c4c
commit d040f90d15a69f394e17ab19119e541d95bf9c4c
Author: Vivek Ellur <vivek.el...@samsung.com>
Date: Fri Aug 28 16:30:27 2015 +0900
elementary: Port evas object smart callbacks to use eo event callbacks
Summary:
Changed evas_object_smart_callback_add APIs to use eo_event_callback_add API
Signed-off-by: Vivek Ellur <vivek.el...@samsung.com>
Reviewers: cedric, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D2995
---
src/modules/prefs/Makefile.am | 1 +
src/modules/prefs/elm_button.c | 8 +++++---
src/modules/prefs/elm_check.c | 9 +++++----
src/modules/prefs/elm_datetime.c | 8 +++++---
src/modules/prefs/elm_entry.c | 13 ++++++++-----
src/modules/prefs/elm_slider.c | 9 +++++----
src/modules/prefs/elm_spinner.c | 8 +++++---
7 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/src/modules/prefs/Makefile.am b/src/modules/prefs/Makefile.am
index c7b4759..d7280cb 100644
--- a/src/modules/prefs/Makefile.am
+++ b/src/modules/prefs/Makefile.am
@@ -14,6 +14,7 @@ elm_prefs_swallow.edj: Makefile elm_prefs_swallow.edc
$(top_builddir)/src/modules/prefs/elm_prefs_swallow.edj
AM_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
-I. \
-I$(top_builddir) \
-I$(top_srcdir) \
diff --git a/src/modules/prefs/elm_button.c b/src/modules/prefs/elm_button.c
index 53c03f3..cff42e3 100644
--- a/src/modules/prefs/elm_button.c
+++ b/src/modules/prefs/elm_button.c
@@ -8,14 +8,15 @@ static Elm_Prefs_Item_Type supported_types[] =
ELM_PREFS_TYPE_UNKNOWN
};
-static void
+static Eina_Bool
_item_changed_cb(void *data,
- Evas_Object *obj,
+ Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
prefs_it_changed_cb(obj);
+ return EINA_TRUE;
}
static Evas_Object *
@@ -27,7 +28,8 @@ elm_prefs_button_add(const Elm_Prefs_Item_Iface *iface
EINA_UNUSED,
{
Evas_Object *obj = elm_button_add(prefs);
- evas_object_smart_callback_add(obj, "clicked", _item_changed_cb, cb);
+ eo_do(obj, eo_event_callback_add
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _item_changed_cb, cb));
return obj;
}
diff --git a/src/modules/prefs/elm_check.c b/src/modules/prefs/elm_check.c
index 8940c3b..b41243e 100644
--- a/src/modules/prefs/elm_check.c
+++ b/src/modules/prefs/elm_check.c
@@ -6,14 +6,15 @@ static Elm_Prefs_Item_Type supported_types[] =
ELM_PREFS_TYPE_UNKNOWN
};
-static void
+static Eina_Bool
_item_changed_cb(void *data,
- Evas_Object *obj,
+ Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
prefs_it_changed_cb(obj);
+ return EINA_TRUE;
}
static Evas_Object *
@@ -25,8 +26,8 @@ elm_prefs_check_add(const Elm_Prefs_Item_Iface *iface
EINA_UNUSED,
{
Evas_Object *obj = elm_check_add(prefs);
- evas_object_smart_callback_add(obj, "changed", _item_changed_cb, cb);
-
+ eo_do(obj, eo_event_callback_add
+ (ELM_CHECK_EVENT_CHANGED, _item_changed_cb, cb));
elm_check_state_set(obj, spec.b.def);
return obj;
diff --git a/src/modules/prefs/elm_datetime.c b/src/modules/prefs/elm_datetime.c
index 72c9f79..3637e91 100644
--- a/src/modules/prefs/elm_datetime.c
+++ b/src/modules/prefs/elm_datetime.c
@@ -6,14 +6,15 @@ static Elm_Prefs_Item_Type supported_types[] =
ELM_PREFS_TYPE_UNKNOWN
};
-static void
+static Eina_Bool
_item_changed_cb(void *data,
- Evas_Object *obj,
+ Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
prefs_it_changed_cb(obj);
+ return EINA_TRUE;
}
static Evas_Object *
@@ -32,7 +33,8 @@ elm_prefs_datetime_add(const Elm_Prefs_Item_Iface *iface
EINA_UNUSED,
elm_datetime_field_visible_set(obj, ELM_DATETIME_MINUTE, EINA_FALSE);
elm_datetime_field_visible_set(obj, ELM_DATETIME_AMPM, EINA_FALSE);
- evas_object_smart_callback_add(obj, "changed", _item_changed_cb, cb);
+ eo_do(obj, eo_event_callback_add
+ (ELM_DATETIME_EVENT_CHANGED, _item_changed_cb, cb));
t.tm_year = spec.d.min.y - 1900;
t.tm_mon = spec.d.min.m - 1;
diff --git a/src/modules/prefs/elm_entry.c b/src/modules/prefs/elm_entry.c
index e6cf68f..301842d 100644
--- a/src/modules/prefs/elm_entry.c
+++ b/src/modules/prefs/elm_entry.c
@@ -1,4 +1,5 @@
#include "private.h"
+#include "elm_widget.h"
#include <sys/types.h>
#include <regex.h>
@@ -93,14 +94,15 @@ mismatch:
return EINA_FALSE;
}
-static void
+static Eina_Bool
_item_changed_cb(void *data,
- Evas_Object *obj,
+ Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
prefs_it_changed_cb(obj);
+ return EINA_TRUE;
}
static void
@@ -148,9 +150,10 @@ elm_prefs_entry_add(const Elm_Prefs_Item_Iface *iface
EINA_UNUSED,
/* FIXME: is it worth to ERR with the item's name, too, here? */
- evas_object_smart_callback_add(obj, "activated", _item_changed_cb, cb);
- evas_object_smart_callback_add(obj, "unfocused", _item_changed_cb, cb);
-
+ eo_do(obj, eo_event_callback_add
+ (ELM_ENTRY_EVENT_ACTIVATED, _item_changed_cb, cb));
+ eo_do(obj, eo_event_callback_add
+ (ELM_WIDGET_EVENT_UNFOCUSED, _item_changed_cb, cb));
if (spec.s.accept)
{
int ret;
diff --git a/src/modules/prefs/elm_slider.c b/src/modules/prefs/elm_slider.c
index 09515df..bc64635 100644
--- a/src/modules/prefs/elm_slider.c
+++ b/src/modules/prefs/elm_slider.c
@@ -7,14 +7,15 @@ static Elm_Prefs_Item_Type supported_types[] =
ELM_PREFS_TYPE_UNKNOWN
};
-static void
+static Eina_Bool
_item_changed_cb(void *data,
- Evas_Object *obj,
+ Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
prefs_it_changed_cb(obj);
+ return EINA_TRUE;
}
static Evas_Object *
@@ -28,8 +29,8 @@ elm_prefs_slider_add(const Elm_Prefs_Item_Iface *iface
EINA_UNUSED,
evas_object_data_set(obj, "prefs_type", (void *)type);
- evas_object_smart_callback_add(obj, "changed", _item_changed_cb, cb);
-
+ eo_do(obj, eo_event_callback_add
+ (ELM_SLIDER_EVENT_CHANGED, _item_changed_cb, cb));
if (type == ELM_PREFS_TYPE_INT)
{
elm_slider_unit_format_set(obj, "%1.0f");
diff --git a/src/modules/prefs/elm_spinner.c b/src/modules/prefs/elm_spinner.c
index 486dc98..6617e33 100644
--- a/src/modules/prefs/elm_spinner.c
+++ b/src/modules/prefs/elm_spinner.c
@@ -7,14 +7,15 @@ static Elm_Prefs_Item_Type supported_types[] =
ELM_PREFS_TYPE_UNKNOWN
};
-static void
+static Eina_Bool
_item_changed_cb(void *data,
- Evas_Object *obj,
+ Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
prefs_it_changed_cb(obj);
+ return EINA_TRUE;
}
static Evas_Object *
@@ -28,7 +29,8 @@ elm_prefs_spinner_add(const Elm_Prefs_Item_Iface *iface
EINA_UNUSED,
evas_object_data_set(obj, "prefs_type", (void *)type);
- evas_object_smart_callback_add(obj, "changed", _item_changed_cb, cb);
+ eo_do(obj, eo_event_callback_add
+ (ELM_SPINNER_EVENT_CHANGED, _item_changed_cb, cb));
if (type == ELM_PREFS_TYPE_INT)
{
--
