prefs: Remove some elm_prefs types from EO

Ref T5329

diff --git a/src/lib/elementary/elm_general.eot b/src/lib/elementary/elm_general.eot
index f1302bb..4bde308 100644 (file)
--- a/src/lib/elementary/elm_general.eot
+++ b/src/lib/elementary/elm_general.eot
@@ -79,6 +79,7 @@ enum Elm.Glob.Match_Flags
    nocase = (1 << 3), [[The pattern is matched case-insensitively.]]
 }
 
+/* FIXME: elm_policy API is not bound to EO */
 enum Elm.Policy
 {
    [[Policy identifiers.]]
@@ -212,37 +213,6 @@ enum Efl.Ui.Focus.Move_Policy
                Left, Right, Up, Down, Tab, or Shift+Tab.]]
 }
 
-enum Elm.Prefs.Reset_Mode
-{
-   [[Modes of resetting a prefs widget.
-     see elm_prefs_reset()
-     @since 1.8]]
-   legacy: elm_prefs_reset;
-   defaults, [[reset to default values, declared in its <b>.epb</b> file]]
-   last [[prefs will keep a small history of changes, so this  resets back to last batch of changes on the UI elements. it does <b>not</b> work on autosave mode]]
-}
-
-enum Elm.Prefs.Item_Type
-{
-   [[Elm Prefs item types.
-     @since 1.8]]
-   legacy: elm_prefs_type;
-   unknown = 0, [[Unknown type]]
-   action, [[action type, bound to button-like UI elements]]
-   bool, [[boolean type, bound to checkbox-like UI elements]]
-   int, [[integer type, bound to spinner-like UI elements]]
-   float, [[floating point type, bound to spinner-like UI elements]]
-   label, [[label type, bound to read-only, label UI elements]]
-   date, [[date type, bound to date selection UI elements]]
-   text, [[text type, bound to single-line, text entry UI elements]]
-   textarea, [[text area type, bound to multi-line, text entry UI elements]]
-   page, [[page type, used to nest pages]]
-   reset, [[values resetting trigger type, bound to button-like UI elements]]
-   save, [[saving trigger type, bound to button-like UI elements]]
-   separator, [[separator type, bound to separator-like UI elements]]
-   swallow [[swallow type, bound to an empty 'spot' on the UI meant to receive and display external content]]
-}
-
 enum Efl.Ui.Slider.Indicator_Visible_Mode
 {
    [[Slider's indicator visiblity mode.

diff --git a/src/lib/elementary/elm_prefs_data.h b/src/lib/elementary/elm_prefs_data.h
index bf3b8af..49a7740 100644 (file)
--- a/src/lib/elementary/elm_prefs_data.h
+++ b/src/lib/elementary/elm_prefs_data.h
@@ -30,6 +30,42 @@
  * @{
  */
 
+/** Modes of resetting a prefs widget. see elm_prefs_reset()
+ *
+ * @since 1.8
+ */
+typedef enum
+{
+  ELM_PREFS_RESET_DEFAULTS = 0, /**< reset to default values, declared in its
+                                 * <b>.epb</b> file */
+  ELM_PREFS_RESET_LAST /**< prefs will keep a small history of changes, so this
+                        *  resets back to last batch of changes on the UI
+                        * elements. it does <b>not</b> work on autosave mode */
+} Elm_Prefs_Reset_Mode;
+
+/** Elm Prefs item types.
+ *
+ * @since 1.8
+ */
+typedef enum
+{
+  ELM_PREFS_TYPE_UNKNOWN = 0, /**< Unknown type */
+  ELM_PREFS_TYPE_ACTION, /**< action type, bound to button-like UI elements */
+  ELM_PREFS_TYPE_BOOL, /**< boolean type, bound to checkbox-like UI elements */
+  ELM_PREFS_TYPE_INT, /**< integer type, bound to spinner-like UI elements */
+  ELM_PREFS_TYPE_FLOAT, /**< floating point type, bound to spinner-like UI elements */
+  ELM_PREFS_TYPE_LABEL, /**< label type, bound to read-only, label UI elements */
+  ELM_PREFS_TYPE_DATE, /**< date type, bound to date selection UI elements */
+  ELM_PREFS_TYPE_TEXT, /**< text type, bound to single-line, text entry UI elements */
+  ELM_PREFS_TYPE_TEXTAREA, /**< text area type, bound to multi-line, text entry UI elements */
+  ELM_PREFS_TYPE_PAGE, /**< page type, used to nest pages */
+  ELM_PREFS_TYPE_RESET, /**< values resetting trigger type, bound to button-like UI elements */
+  ELM_PREFS_TYPE_SAVE, /**< saving trigger type, bound to button-like UI elements */
+  ELM_PREFS_TYPE_SEPARATOR, /**< separator type, bound to separator-like UI elements */
+  ELM_PREFS_TYPE_SWALLOW /**< swallow type, bound to an empty 'spot' on the UI
+                          * meant to receive and display external content */
+} Elm_Prefs_Item_Type;
+
 /**
  * Types of events a given prefs data handle may issue.
  *

diff --git a/src/lib/elementary/elm_prefs_legacy.h b/src/lib/elementary/elm_prefs_legacy.h
index 9670523..d3c1785 100644 (file)
--- a/src/lib/elementary/elm_prefs_legacy.h
+++ b/src/lib/elementary/elm_prefs_legacy.h
@@ -3,8 +3,11 @@
  *
  * @{
  */
-EAPI Eina_Bool elm_prefs_page_widget_common_add(Evas_Object *prefs,
-                                                Evas_Object *obj);
+
+/**
+ * Add a page widget to an elm_prefs object.
+ */
+EAPI Eina_Bool elm_prefs_page_widget_common_add(Evas_Object *prefs, Evas_Object *obj);
 
 /**
  *