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.

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 65e79b261a..590b05c3ba 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 2582844281..34cae5f284 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 a87560b3c8..43f0753d75 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 fead3af8c2..4ee891a1e0 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 1cbac6d581..47c13af1fc 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 6589b29093..1d991e78f0 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 ed5d429532..66919902cb 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 c037cfb5af..f9d2f15021 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 895e7959fd..2255cf5ae6 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 aeb411f9c7..6354ecd1b3 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 a83a2b015c..07f60ac727 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; }