evas: Make Efl.Input.Event.legacy_info.get internal

This removes the function from the EO file by using EXTRA_OPS
as introduced in 53fef30db0aecc191384dae81882b50eba79da1.

9 files changed, 55 insertions, 12 deletions

diff --git a/src/lib/efl/interfaces/efl_common_internal.h b/src/lib/efl/interfaces/efl_common_internal.h
index 6cbe7d453a..65e79b261a 100644
--- a/src/lib/efl/interfaces/efl_common_internal.h
+++ b/src/lib/efl/interfaces/efl_common_internal.h
@@ -119,6 +119,8 @@ struct _Efl_Input_Focus_Data
    double timestamp;
 };
 
+/* Internal helpers */
+
 static inline const char *
 _efl_input_modifier_to_string(Efl_Input_Modifier mod)
 {
@@ -164,4 +166,35 @@ _efl_input_value_mark(Efl_Input_Pointer_Data *pd, Efl_Input_Value key)
 
 #define _efl_input_value_mask(key) (1u << (int) key)
 
+/* Internal EO APIs */
+
+#undef EAPI
+
+#ifdef _WIN32
+# ifdef EFL_EFL_BUILD
+#  ifdef DLL_EXPORT
+#   define EAPI __declspec(dllexport)
+#  else
+#   define EAPI
+#  endif /* ! DLL_EXPORT */
+# else
+#  define EAPI __declspec(dllimport)
+# endif /* ! EFL_EFL_BUILD */
+#else
+# ifdef __GNUC__
+#  if __GNUC__ >= 4
+#   define EAPI __attribute__ ((visibility("default")))
+#  else
+#   define EAPI
+#  endif
+# else
+#  define EAPI
+# endif
+#endif /* ! _WIN32 */
+
+EOAPI void *efl_input_legacy_info_get(const Eo *obj);
+
+#undef EAPI
+#define EAPI
+
 #endif
diff --git a/src/lib/evas/canvas/efl_input_event.c b/src/lib/evas/canvas/efl_input_event.c
index 0c94f8f807..2582844281 100644
--- a/src/lib/evas/canvas/efl_input_event.c
+++ b/src/lib/evas/canvas/efl_input_event.c
@@ -62,6 +62,13 @@ _efl_input_event_efl_object_provider_find(Eo *obj, void *pd EINA_UNUSED, const E
    return efl_provider_find(efl_super(obj, MY_CLASS), klass);
 }
 
+/* Internal EO APIs */
+
+EOAPI EFL_FUNC_BODY_CONST(efl_input_legacy_info_get, void *, NULL)
+
+#define EFL_INPUT_EVENT_EXTRA_OPS \
+   EFL_OBJECT_OP_FUNC(efl_input_legacy_info_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 d984c34e4d..a87560b3c8 100644
--- a/src/lib/evas/canvas/efl_input_event.eo
+++ b/src/lib/evas/canvas/efl_input_event.eo
@@ -65,15 +65,6 @@ mixin Efl.Input.Event (Efl.Interface, Efl.Object)
             val: bool; [[$true if the event was not from real hardware, $false otherwise]]
          }
       }
-
-      /* FIXME: Internal functions should be marked as such, not as protected! */
-      @property legacy_info @protected @pure_virtual /* @internal */ {
-         [[Returns the legacy info structure. Internal API, do not use it!]]
-         get {}
-         values {
-            event_info: void_ptr; [[Should not be $null.]]
-         }
-      }
       instance_get @class @protected @pure_virtual /* @internal */ {
       	 [[Get an instance of this input event]]
          params {
diff --git a/src/lib/evas/canvas/efl_input_hold.c b/src/lib/evas/canvas/efl_input_hold.c
index 68a354f623..6589b29093 100644
--- a/src/lib/evas/canvas/efl_input_hold.c
+++ b/src/lib/evas/canvas/efl_input_hold.c
@@ -124,4 +124,9 @@ _efl_input_hold_efl_input_event_legacy_info_get(Eo *obj, Efl_Input_Hold_Data *pd
    return efl_input_hold_legacy_info_fill(obj, NULL);
 }
 
+/* Internal EO APIs */
+
+#define EFL_INPUT_HOLD_EXTRA_OPS \
+   EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get, _efl_input_hold_efl_input_event_legacy_info_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 9a19931e77..ed5d429532 100644
--- a/src/lib/evas/canvas/efl_input_hold.eo
+++ b/src/lib/evas/canvas/efl_input_hold.eo
@@ -18,6 +18,5 @@ class Efl.Input.Hold (Efl.Object, Efl.Input.Event)
       Efl.Input.Event.timestamp { get; set; }
       Efl.Input.Event.event_flags { get; set; }
       Efl.Input.Event.device { get; set; }
-      Efl.Input.Event.legacy_info { get; }
    }
 }
diff --git a/src/lib/evas/canvas/efl_input_key.c b/src/lib/evas/canvas/efl_input_key.c
index ade0e417d5..c037cfb5af 100644
--- a/src/lib/evas/canvas/efl_input_key.c
+++ b/src/lib/evas/canvas/efl_input_key.c
@@ -286,4 +286,9 @@ _efl_input_key_efl_input_event_legacy_info_get(Eo *obj, Efl_Input_Key_Data *pd)
    return efl_input_key_legacy_info_fill(obj, NULL);
 }
 
+/* Internal EO APIs */
+
+#define EFL_INPUT_KEY_EXTRA_OPS \
+   EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get, _efl_input_key_efl_input_event_legacy_info_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 1c45d21a3d..895e7959fd 100644
--- a/src/lib/evas/canvas/efl_input_key.eo
+++ b/src/lib/evas/canvas/efl_input_key.eo
@@ -62,7 +62,6 @@ class Efl.Input.Key (Efl.Object, Efl.Input.Event, Efl.Input.State, Efl.Input.Eve
       Efl.Input.Event.fake { get; }
       Efl.Input.Event.event_flags { get; set; }
       Efl.Input.Event.device { get; set; }
-      Efl.Input.Event.legacy_info { get; }
       Efl.Input.State.modifier_enabled { get; }
       Efl.Input.State.lock_enabled { get; }
    }
diff --git a/src/lib/evas/canvas/efl_input_pointer.c b/src/lib/evas/canvas/efl_input_pointer.c
index 02b07279f9..aeb411f9c7 100644
--- a/src/lib/evas/canvas/efl_input_pointer.c
+++ b/src/lib/evas/canvas/efl_input_pointer.c
@@ -614,4 +614,9 @@ _efl_input_pointer_efl_input_event_legacy_info_get(Eo *obj, Efl_Input_Pointer_Da
    return efl_input_pointer_legacy_info_fill(NULL, obj, EVAS_CALLBACK_LAST, NULL);
 }
 
+/* Internal EO APIs */
+
+#define EFL_INPUT_POINTER_EXTRA_OPS \
+   EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get, _efl_input_pointer_efl_input_event_legacy_info_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 5c1a6461f2..a83a2b015c 100644
--- a/src/lib/evas/canvas/efl_input_pointer.eo
+++ b/src/lib/evas/canvas/efl_input_pointer.eo
@@ -171,7 +171,6 @@ class Efl.Input.Pointer (Efl.Object, Efl.Input.Event, Efl.Input.State)
       Efl.Input.Event.fake { get; }
       Efl.Input.Event.event_flags { get; set; }
       Efl.Input.Event.device { get; set; }
-      Efl.Input.Event.legacy_info { get; }
       Efl.Input.State.modifier_enabled { get; }
       Efl.Input.State.lock_enabled { get; }
    }