jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=de4627030a99a15a488607e5de0755bae471c708
commit de4627030a99a15a488607e5de0755bae471c708
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Thu May 18 17:27:47 2017 +0900
evas: Make Efl.Input.Event.instance_get internal
Same as the previous patch. This removes the definition from
the EO file, implementing the feature in C.
---
src/lib/efl/interfaces/efl_common_internal.h | 1 +
src/lib/evas/canvas/efl_input_event.c | 4 ++++
src/lib/evas/canvas/efl_input_event.eo | 8 --------
src/lib/evas/canvas/efl_input_focus.c | 5 +++++
src/lib/evas/canvas/efl_input_focus.eo | 1 -
src/lib/evas/canvas/efl_input_hold.c | 3 +++
src/lib/evas/canvas/efl_input_hold.eo | 1 -
src/lib/evas/canvas/efl_input_key.c | 3 +++
src/lib/evas/canvas/efl_input_key.eo | 1 -
src/lib/evas/canvas/efl_input_pointer.c | 3 +++
src/lib/evas/canvas/efl_input_pointer.eo | 1 -
11 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_common_internal.h
b/src/lib/efl/interfaces/efl_common_internal.h
index 65e79b2..590b05c 100644
--- a/src/lib/efl/interfaces/efl_common_internal.h
+++ b/src/lib/efl/interfaces/efl_common_internal.h
@@ -193,6 +193,7 @@ _efl_input_value_mark(Efl_Input_Pointer_Data *pd,
Efl_Input_Value key)
#endif /* ! _WIN32 */
EOAPI void *efl_input_legacy_info_get(const Eo *obj);
+EOAPI Eo *efl_input_instance_get(const Eo *obj, Efl_Object *owner, void
**priv);
#undef EAPI
#define EAPI
diff --git a/src/lib/evas/canvas/efl_input_event.c
b/src/lib/evas/canvas/efl_input_event.c
index 2582844..34cae5f 100644
--- a/src/lib/evas/canvas/efl_input_event.c
+++ b/src/lib/evas/canvas/efl_input_event.c
@@ -65,10 +65,14 @@ _efl_input_event_efl_object_provider_find(Eo *obj, void *pd
EINA_UNUSED, const E
/* Internal EO APIs */
EOAPI EFL_FUNC_BODY_CONST(efl_input_legacy_info_get, void *, NULL)
+EOAPI EFL_FUNC_BODYV_CONST(efl_input_instance_get, Efl_Input_Event *, NULL,
EFL_FUNC_CALL(owner, priv), Efl_Object *owner, void **priv)
#define EFL_INPUT_EVENT_EXTRA_OPS \
EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get, NULL)
+#define EFL_INPUT_EVENT_EXTRA_CLASS_OPS \
+ EFL_OBJECT_OP_FUNC(efl_input_instance_get, NULL)
+
#include "efl_input_event.eo.c"
#include "efl_input_state.eo.c"
#include "efl_input_interface.eo.c"
diff --git a/src/lib/evas/canvas/efl_input_event.eo
b/src/lib/evas/canvas/efl_input_event.eo
index a87560b..43f0753 100644
--- a/src/lib/evas/canvas/efl_input_event.eo
+++ b/src/lib/evas/canvas/efl_input_event.eo
@@ -65,14 +65,6 @@ mixin Efl.Input.Event (Efl.Interface, Efl.Object)
val: bool; [[$true if the event was not from real hardware, $false
otherwise]]
}
}
- instance_get @class @protected @pure_virtual /* @internal */ {
- [[Get an instance of this input event]]
- params {
- @in owner: Efl.Object; [[Owner of this input event]]
- @out priv: void_ptr; [[Private data pointer]]
- }
- return: own(Efl.Input.Event); [[Instance of this input event]]
- }
}
implements {
Efl.Object.provider_find;
diff --git a/src/lib/evas/canvas/efl_input_focus.c
b/src/lib/evas/canvas/efl_input_focus.c
index fead3af..4ee891a 100644
--- a/src/lib/evas/canvas/efl_input_focus.c
+++ b/src/lib/evas/canvas/efl_input_focus.c
@@ -156,4 +156,9 @@ _efl_input_focus_efl_input_event_reset(Eo *obj,
Efl_Input_Focus_Data *pd)
pd->eo = obj;
}
+/* Internal EO APIs */
+
+#define EFL_INPUT_FOCUS_EXTRA_CLASS_OPS \
+ EFL_OBJECT_OP_FUNC(efl_input_instance_get,
_efl_input_focus_efl_input_event_instance_get)
+
#include "efl_input_focus.eo.c"
diff --git a/src/lib/evas/canvas/efl_input_focus.eo
b/src/lib/evas/canvas/efl_input_focus.eo
index 1cbac6d..47c13af 100644
--- a/src/lib/evas/canvas/efl_input_focus.eo
+++ b/src/lib/evas/canvas/efl_input_focus.eo
@@ -16,7 +16,6 @@ class Efl.Input.Focus(Efl.Object, Efl.Input.Event)
Efl.Object.constructor;
Efl.Object.destructor;
Efl.Input.Event.device { get; set; }
- Efl.Input.Event.instance_get;
Efl.Input.Event.reset;
Efl.Input.Event.dup;
Efl.Input.Event.timestamp { get; set; }
diff --git a/src/lib/evas/canvas/efl_input_hold.c
b/src/lib/evas/canvas/efl_input_hold.c
index 6589b29..1d991e7 100644
--- a/src/lib/evas/canvas/efl_input_hold.c
+++ b/src/lib/evas/canvas/efl_input_hold.c
@@ -129,4 +129,7 @@ _efl_input_hold_efl_input_event_legacy_info_get(Eo *obj,
Efl_Input_Hold_Data *pd
#define EFL_INPUT_HOLD_EXTRA_OPS \
EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get,
_efl_input_hold_efl_input_event_legacy_info_get)
+#define EFL_INPUT_HOLD_EXTRA_CLASS_OPS \
+ EFL_OBJECT_OP_FUNC(efl_input_instance_get,
_efl_input_hold_efl_input_event_instance_get)
+
#include "efl_input_hold.eo.c"
diff --git a/src/lib/evas/canvas/efl_input_hold.eo
b/src/lib/evas/canvas/efl_input_hold.eo
index ed5d429..6691990 100644
--- a/src/lib/evas/canvas/efl_input_hold.eo
+++ b/src/lib/evas/canvas/efl_input_hold.eo
@@ -12,7 +12,6 @@ class Efl.Input.Hold (Efl.Object, Efl.Input.Event)
implements {
Efl.Object.constructor;
Efl.Object.destructor;
- Efl.Input.Event.instance_get;
Efl.Input.Event.reset;
Efl.Input.Event.dup;
Efl.Input.Event.timestamp { get; set; }
diff --git a/src/lib/evas/canvas/efl_input_key.c
b/src/lib/evas/canvas/efl_input_key.c
index c037cfb..f9d2f15 100644
--- a/src/lib/evas/canvas/efl_input_key.c
+++ b/src/lib/evas/canvas/efl_input_key.c
@@ -291,4 +291,7 @@ _efl_input_key_efl_input_event_legacy_info_get(Eo *obj,
Efl_Input_Key_Data *pd)
#define EFL_INPUT_KEY_EXTRA_OPS \
EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get,
_efl_input_key_efl_input_event_legacy_info_get)
+#define EFL_INPUT_KEY_EXTRA_CLASS_OPS \
+ EFL_OBJECT_OP_FUNC(efl_input_instance_get,
_efl_input_key_efl_input_event_instance_get)
+
#include "efl_input_key.eo.c"
diff --git a/src/lib/evas/canvas/efl_input_key.eo
b/src/lib/evas/canvas/efl_input_key.eo
index 895e795..2255cf5 100644
--- a/src/lib/evas/canvas/efl_input_key.eo
+++ b/src/lib/evas/canvas/efl_input_key.eo
@@ -55,7 +55,6 @@ class Efl.Input.Key (Efl.Object, Efl.Input.Event,
Efl.Input.State, Efl.Input.Eve
class.destructor;
Efl.Object.constructor;
Efl.Object.destructor;
- Efl.Input.Event.instance_get;
Efl.Input.Event.reset;
Efl.Input.Event.dup;
Efl.Input.Event.timestamp { get; set; }
diff --git a/src/lib/evas/canvas/efl_input_pointer.c
b/src/lib/evas/canvas/efl_input_pointer.c
index aeb411f..6354ecd1 100644
--- a/src/lib/evas/canvas/efl_input_pointer.c
+++ b/src/lib/evas/canvas/efl_input_pointer.c
@@ -619,4 +619,7 @@ _efl_input_pointer_efl_input_event_legacy_info_get(Eo *obj,
Efl_Input_Pointer_Da
#define EFL_INPUT_POINTER_EXTRA_OPS \
EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get,
_efl_input_pointer_efl_input_event_legacy_info_get)
+#define EFL_INPUT_POINTER_EXTRA_CLASS_OPS \
+ EFL_OBJECT_OP_FUNC(efl_input_instance_get,
_efl_input_pointer_efl_input_event_instance_get)
+
#include "efl_input_pointer.eo.c"
diff --git a/src/lib/evas/canvas/efl_input_pointer.eo
b/src/lib/evas/canvas/efl_input_pointer.eo
index a83a2b0..07f60ac 100644
--- a/src/lib/evas/canvas/efl_input_pointer.eo
+++ b/src/lib/evas/canvas/efl_input_pointer.eo
@@ -164,7 +164,6 @@ class Efl.Input.Pointer (Efl.Object, Efl.Input.Event,
Efl.Input.State)
Efl.Object.constructor;
Efl.Object.destructor;
class.destructor;
- Efl.Input.Event.instance_get;
Efl.Input.Event.reset;
Efl.Input.Event.dup;
Efl.Input.Event.timestamp { get; set; }
--
