efl_input_text: rename namespace

Efl.Input_Text is a namespace which should not be a interface in the same moment. So rename this to Efl.Input_Text.Entity ref T8648 Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es> Differential Revision: https://phab.enlightenment.org/D11664
2020-04-07 13:53:18 +02:00 · 2020-04-07 13:53:18 +02:00 · 80bf4ace91
parent f526ad8c26
commit 80bf4ace91
7 changed files with 45 additions and 44 deletions
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@ -213,7 +213,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
 #include "interfaces/efl_text_format.eo.h"
 #include "interfaces/efl_text_markup.eo.h"
 #include "interfaces/efl_text_markup_util.eo.h"
-#include "interfaces/efl_input_text.eo.h"
+#include "interfaces/efl_input_text_entity.eo.h"

 /**
 * @brief Get a proxy object referring to a part of an object.
--- a/src/lib/efl/interfaces/efl_input_text_entity.eo
+++ b/src/lib/efl/interfaces/efl_input_text_entity.eo
@ -95,7 +95,7 @@ enum @beta Efl.Input_Text.Panel_Layout_Normal_Variation_Type
   [[Enumeration for defining the types of @Efl.Input_Text.Panel_Layout_Type for normal variation.]]
   normal          , [[The plain normal layout.]]
   file_name       , [[Filename layout. Symbols such as '/' should be disabled.]]
-   person_name     , [[The name of a person, @Efl.Input_Text.autocapitalization will be set to @Efl.Input_Text.Capitalize_Type.word.]]
+   person_name     , [[The name of a person, @Efl.Input_Text.Entity.autocapitalization will be set to @Efl.Input_Text.Capitalize_Type.word.]]
 }

 enum @beta Efl.Input_Text.Panel_Layout_Numberonly_Variation_Type
@ -116,10 +116,11 @@ enum @beta Efl.Input_Text.Panel_Layout_Password_Variation_Type



-interface Efl.Input_Text {
+interface Efl.Input_Text.Entity {
   [[All the functionality relating to input hints/
     @since 1.24
   ]]
+   c_prefix: efl_input_text;
   methods {
      @property input_panel_show_on_demand {
         [[Set/Get the attribute to show the input panel in case of only a user's explicit Mouse Up event.
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@ -25,7 +25,7 @@
 #include "interfaces/efl_text_style.eo.c"
 #include "interfaces/efl_text_format.eo.c"
 #include "interfaces/efl_text_markup.eo.c"
-#include "interfaces/efl_input_text.eo.c"
+#include "interfaces/efl_input_text_entity.eo.c"

 #include "interfaces/efl_gfx_entity.eo.c"
 #include "interfaces/efl_gfx_buffer.eo.c"
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@ -93,7 +93,7 @@ pub_eo_files = [
  'efl_gfx_text_class.eo',
  'efl_gfx_size_class.eo',
  'efl_cached_item.eo',
-  'efl_input_text.eo',
+  'efl_input_text_entity.eo',
 ]

 foreach eo_file : pub_eo_files
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@ -1992,7 +1992,7 @@ _efl_ui_internal_text_interactive_efl_text_interactive_editable_get(const Eo *ob
 }

 EOLIAN static void
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_hide(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_hide(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
 #ifdef HAVE_ECORE_IMF
   if (en->imf_context)
@ -2004,7 +2004,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_hide(Eo *obj EINA_U


 EOLIAN static void
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_language_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Panel_Language_Type lang)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_language_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Panel_Language_Type lang)
 {
   en->input_panel_lang = lang;
 #ifdef HAVE_ECORE_IMF
@ -2018,14 +2018,14 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_language_set(Eo *ob


 EOLIAN static Efl_Input_Text_Panel_Language_Type
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_language_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_language_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
   return en->input_panel_lang;
 }


 EOLIAN static void
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_imdata_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Slice slice)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_imdata_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Slice slice)
 {
 #ifdef HAVE_ECORE_IMF
   if (en->imf_context)
@ -2039,7 +2039,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_imdata_set(Eo *obj


 EOLIAN static Eina_Slice
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_imdata_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_imdata_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
   Eina_Slice slice = {0};

@ -2060,7 +2060,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_imdata_get(const Eo


 EOLIAN static void
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_return_key_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Panel_Return_Key_Type return_key_type)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_return_key_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Panel_Return_Key_Type return_key_type)
 {
 #ifdef HAVE_ECORE_IMF
   if (en->imf_context)
@ -2073,7 +2073,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_return_key_type_set


 EOLIAN static Efl_Input_Text_Panel_Return_Key_Type
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_return_key_type_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_return_key_type_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
 #ifdef HAVE_ECORE_IMF
   if (en->imf_context)
@ -2086,7 +2086,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_return_key_type_get
 }

 EOLIAN static void
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_return_key_state_set(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Panel_Return_Key_State state)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_return_key_state_set(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Panel_Return_Key_State state)
 {
   if (en->input_panel_return_key_state == state)
     return;
@ -2120,14 +2120,14 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_return_key_state_se


 EOLIAN static Efl_Input_Text_Panel_Return_Key_State
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_return_key_state_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_return_key_state_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
   return en->input_panel_return_key_state;
 }


 EOLIAN static void
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_show_on_demand_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool ondemand)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_show_on_demand_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool ondemand)
 {
 #ifdef HAVE_ECORE_IMF
   if (en->imf_context)
@ -2139,7 +2139,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_show_on_demand_set(
 }

 EOLIAN static void
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_layout_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd, Efl_Input_Text_Panel_Layout_Type layout)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_layout_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd, Efl_Input_Text_Panel_Layout_Type layout)
 {
   sd->input_panel_layout = layout;

@ -2155,13 +2155,13 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_layout_set(Eo *obj
 }

 EOLIAN static Efl_Input_Text_Panel_Layout_Type
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_layout_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_layout_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd)
 {
   return sd->input_panel_layout;
 }

 EOLIAN static void
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_layout_variation_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd, int variation)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_layout_variation_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd, int variation)
 {
   sd->input_panel_layout_variation = variation;

@ -2178,13 +2178,13 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_layout_variation_se
 }

 EOLIAN static int
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_layout_variation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_layout_variation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd)
 {
   return sd->input_panel_layout_variation;
 }

 EOLIAN static void
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_show(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_show(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
 #ifdef HAVE_ECORE_IMF
   if (en->imf_context)
@ -2195,7 +2195,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_show(Eo *obj EINA_U
 }

 EOLIAN static void
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_autoshow_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool enabled)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_autoshow_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool enabled)
 {
 #ifdef HAVE_ECORE_IMF
   if (en->imf_context)
@ -2207,7 +2207,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_autoshow_set(Eo *ob
 }

 EOLIAN static Eina_Bool
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_autoshow_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_autoshow_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
 #ifdef HAVE_ECORE_IMF
   if (en->imf_context)
@ -2219,7 +2219,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_autoshow_get(const
 }

 EOLIAN static Eina_Bool
-_efl_ui_internal_text_interactive_efl_input_text_input_panel_show_on_demand_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_show_on_demand_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
 #ifdef HAVE_ECORE_IMF
   if (en->imf_context)
@ -2235,7 +2235,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_show_on_demand_get(


 EOLIAN static void
-_efl_ui_internal_text_interactive_efl_input_text_predictable_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool prediction)
+_efl_ui_internal_text_interactive_efl_input_text_entity_predictable_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool prediction)
 {
   en->prediction_allow = prediction;
 #ifdef HAVE_ECORE_IMF
@ -2249,14 +2249,14 @@ _efl_ui_internal_text_interactive_efl_input_text_predictable_set(Eo *obj EINA_UN


 EOLIAN static Eina_Bool
-_efl_ui_internal_text_interactive_efl_input_text_predictable_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
+_efl_ui_internal_text_interactive_efl_input_text_entity_predictable_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
   return en->prediction_allow;
 }


 EOLIAN static void
-_efl_ui_internal_text_interactive_efl_input_text_input_content_type_set(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Content_Type input_hints)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_content_type_set(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Content_Type input_hints)
 {
 #ifdef HAVE_ECORE_IMF
   if (en->imf_context)
@ -2271,7 +2271,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_content_type_set(Eo *obj,


 EOLIAN static Efl_Input_Text_Content_Type
-_efl_ui_internal_text_interactive_efl_input_text_input_content_type_get(const Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
+_efl_ui_internal_text_interactive_efl_input_text_entity_input_content_type_get(const Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
 #ifdef HAVE_ECORE_IMF
   if (en->imf_context)
@ -2287,7 +2287,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_content_type_get(const Eo


 EOLIAN static void
-_efl_ui_internal_text_interactive_efl_input_text_autocapitalization_set(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Capitalize_Type autocapital_type)
+_efl_ui_internal_text_interactive_efl_input_text_entity_autocapitalization_set(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Capitalize_Type autocapital_type)
 {
 #ifdef HAVE_ECORE_IMF
   if (efl_text_password_get(obj) == EINA_TRUE)
@ -2304,7 +2304,7 @@ _efl_ui_internal_text_interactive_efl_input_text_autocapitalization_set(Eo *obj,


 EOLIAN static Efl_Input_Text_Capitalize_Type
-_efl_ui_internal_text_interactive_efl_input_text_autocapitalization_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
+_efl_ui_internal_text_interactive_efl_input_text_entity_autocapitalization_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
 #ifdef HAVE_ECORE_IMF
   if (en->imf_context)
--- a/src/lib/elementary/efl_ui_internal_text_interactive.eo
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.eo
@ -1,4 +1,4 @@
-class @beta Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Textblock implements Efl.Text_Interactive, Efl.Input_Text, Efl.File
+class @beta Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Textblock implements Efl.Text_Interactive, Efl.Input_Text.Entity, Efl.File
 {
   [[An internal object in charge of the interactive aspect of the text widget.

@ -17,19 +17,19 @@ class @beta Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Textblock implem
      Efl.Text_Interactive.have_selection {get; }
      Efl.Text.text { set; }
      Efl.Text_Markup.markup { set; }
-      Efl.Input_Text.input_panel_show_on_demand { get; set; }
-      Efl.Input_Text.input_panel_language { get; set; }
-      Efl.Input_Text.input_panel_layout_variation { get; set; }
-      Efl.Input_Text.autocapitalization { get; set; }
-      Efl.Input_Text.input_panel_return_key_state { get; set; }
-      Efl.Input_Text.predictable { get; set; }
-      Efl.Input_Text.input_content_type { get; set; }
-      Efl.Input_Text.input_panel_layout { get; set; }
-      Efl.Input_Text.input_panel_return_key_type { get; set; }
-      Efl.Input_Text.input_panel_autoshow { get; set; }
-      Efl.Input_Text.input_panel_show;
-      Efl.Input_Text.input_panel_hide;
-      Efl.Input_Text.input_panel_imdata { get; set; }
+      Efl.Input_Text.Entity.input_panel_show_on_demand { get; set; }
+      Efl.Input_Text.Entity.input_panel_language { get; set; }
+      Efl.Input_Text.Entity.input_panel_layout_variation { get; set; }
+      Efl.Input_Text.Entity.autocapitalization { get; set; }
+      Efl.Input_Text.Entity.input_panel_return_key_state { get; set; }
+      Efl.Input_Text.Entity.predictable { get; set; }
+      Efl.Input_Text.Entity.input_content_type { get; set; }
+      Efl.Input_Text.Entity.input_panel_layout { get; set; }
+      Efl.Input_Text.Entity.input_panel_return_key_type { get; set; }
+      Efl.Input_Text.Entity.input_panel_autoshow { get; set; }
+      Efl.Input_Text.Entity.input_panel_show;
+      Efl.Input_Text.Entity.input_panel_hide;
+      Efl.Input_Text.Entity.input_panel_imdata { get; set; }
      //FIXME Efl.File should be implemented later at Efl.Ui.TextBox level
      Efl.File.file { set; }
      Efl.File.load;
--- a/src/lib/elementary/efl_ui_textbox.eo
+++ b/src/lib/elementary/efl_ui_textbox.eo
@ -13,7 +13,7 @@ enum @beta Efl.Ui.Textbox_Cnp_Content {
 class Efl.Ui.Textbox extends Efl.Ui.Layout_Base implements Efl.Input.Clickable,
                 Efl.Access.Text, Efl.Access.Editable.Text, Efl.Ui.Scrollable
   composites
-                 Efl.Text_Interactive, Efl.Text_Markup, Efl.Input_Text
+                 Efl.Text_Interactive, Efl.Text_Markup, Efl.Input_Text.Entity
 {
   [[A flexible text widget which can be static (as a label) or editable by
     the user (as a text entry). It provides all sorts of editing facilities