update according to eolian changes

21 files changed, 57 insertions, 158 deletions

diff --git a/src/lib/elm_calendar.eo b/src/lib/elm_calendar.eo
index 06124848e..0d30bcaed 100644
--- a/src/lib/elm_calendar.eo
+++ b/src/lib/elm_calendar.eo
@@ -268,7 +268,7 @@ class Elm_Calendar (Elm_Layout)
             @in struct tm *selected_time; /*@ A @b tm struct to represent the selected date. */
          }
       }
-      selected_time_get {
+      selected_time_get @const {
          /*@
          Get selected date.
 
@@ -285,8 +285,6 @@ class Elm_Calendar (Elm_Layout)
          @ref calendar_example_05
 
          @ingroup Calendar */
-
-         const;
          return bool;
          params {
             @inout struct tm selected_time; /*@ A @b tm struct to point to selected date */
@@ -376,7 +374,7 @@ class Elm_Calendar (Elm_Layout)
          @ingroup Calendar */
 
       }
-      displayed_time_get {
+      displayed_time_get @const {
          /*@
          Get the current time displayed in the widget
 
@@ -385,8 +383,6 @@ class Elm_Calendar (Elm_Layout)
 
          @ingroup Calendar
          @since 1.8 */
-
-         const;
          return bool;
          params {
             @inout struct tm displayed_time; /*@ A @b tm struct to point to displayed date */
diff --git a/src/lib/elm_datetime.eo b/src/lib/elm_datetime.eo
index 4f44c2fca..c3dd022cb 100644
--- a/src/lib/elm_datetime.eo
+++ b/src/lib/elm_datetime.eo
@@ -107,7 +107,7 @@ class Elm_Datetime (Elm_Layout)
             @in int max; /*@ Reference to field's maximum value */
          }
       }
-      field_limit_get {
+      field_limit_get @const {
          /*@
          @brief Get the field limits of a field.
 
@@ -120,8 +120,6 @@ class Elm_Datetime (Elm_Layout)
 
          @see elm_datetime_field_limit_set()
          @ingroup Datetime */
-
-         const;
          params {
             @in Elm_Datetime_Field_Type fieldtype; /*@ Type of the field. ELM_DATETIME_YEAR etc. */
             @out int min; /*@ Reference to field's minimum value */
@@ -153,7 +151,7 @@ class Elm_Datetime (Elm_Layout)
             @in const(struct tm)* mintime; /*@ Time structure containing the minimum time value. */
          }
       }
-      value_min_get {
+      value_min_get @const {
          /*@
          @brief Get the lower boundary of a field.
 
@@ -172,8 +170,6 @@ class Elm_Datetime (Elm_Layout)
 
          @see elm_datetime_value_min_set()
          @ingroup Datepicker */
-
-         const;
          return bool;
          params {
             @inout struct tm mintime; /*@ Time structure. */
@@ -205,7 +201,7 @@ class Elm_Datetime (Elm_Layout)
             @in const(struct tm)* newtime; /*@ Time structure filled with values to be set. */
          }
       }
-      value_get {
+      value_get @const {
          /*@
          @brief Get the current value of a Datetime object.
 
@@ -224,8 +220,6 @@ class Elm_Datetime (Elm_Layout)
 
          @see elm_datetime_value_set()
          @ingroup Datetime */
-
-         const;
          return bool;
          params {
             @inout struct tm currtime; /*@ Time structure. */
@@ -251,7 +245,7 @@ class Elm_Datetime (Elm_Layout)
             @in bool visible; /*@ @c EINA_TRUE field can be visible, @c EINA_FALSE otherwise. */
          }
       }
-      field_visible_get {
+      field_visible_get @const {
          /*@
          @brief Get whether a field can be visible/not
 
@@ -259,8 +253,6 @@ class Elm_Datetime (Elm_Layout)
 
          @see elm_datetime_field_visible_set()
          @ingroup Datetime */
-
-         const;
          return bool;
          params {
             @in Elm_Datetime_Field_Type fieldtype; /*@ Type of the field. ELM_DATETIME_YEAR etc */
@@ -291,7 +283,7 @@ class Elm_Datetime (Elm_Layout)
             @in const(struct tm)* maxtime; /*@ Time structure containing the maximum time value. */
          }
       }
-      value_max_get {
+      value_max_get @const {
          /*@
          @brief Get the upper boundary of a field.
 
@@ -310,8 +302,6 @@ class Elm_Datetime (Elm_Layout)
 
          @see elm_datetime_value_max_set()
          @ingroup Datetime */
-
-         const;
          return bool;
          params {
             @inout struct tm maxtime; /*@ Time structure containing the maximum time value. */
diff --git a/src/lib/elm_dayselector.eo b/src/lib/elm_dayselector.eo
index ae16344aa..82ac78453 100644
--- a/src/lib/elm_dayselector.eo
+++ b/src/lib/elm_dayselector.eo
@@ -110,7 +110,7 @@ class Elm_Dayselector (Elm_Layout)
             @warning The strings must be NULL terminated ('@\0'). */
          }
       }
-      weekdays_names_get {
+      weekdays_names_get @const {
          /*@
          Get weekdays names displayed by the calendar.
 
@@ -125,8 +125,6 @@ class Elm_Dayselector (Elm_Layout)
          @since 1.8
 
          @ingroup Dayselector */
-
-         const;
          return Eina_List *;
       }
       day_selected_set {
@@ -143,7 +141,7 @@ class Elm_Dayselector (Elm_Layout)
             @in bool selected; /*@ state of the day. @c EINA_TRUE is selected. */
          }
       }
-      day_selected_get {
+      day_selected_get @const {
          /*@
          Get the state of given Dayselector_Day.
 
@@ -153,8 +151,6 @@ class Elm_Dayselector (Elm_Layout)
          @see elm_dayselector_day_selected_set()
 
          @ingroup Dayselector */
-
-         const;
          return bool;
          params {
             @in Elm_Dayselector_Day day; /*@ Dayselector_Day that the user want to know state. */
diff --git a/src/lib/elm_entry.eo b/src/lib/elm_entry.eo
index 08b75e3e7..2304edf0e 100644
--- a/src/lib/elm_entry.eo
+++ b/src/lib/elm_entry.eo
@@ -891,7 +891,7 @@ class Elm_Entry (Elm_Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface,
             @in void *data; /*@ The data passed to @p func */
          }
       }
-      text_style_user_peek {
+      text_style_user_peek @const {
          /*@
          Retrieve the style on the top of user style stack.
 
@@ -901,8 +901,6 @@ class Elm_Entry (Elm_Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface,
 
          @ingroup Entry
          @since 1.7 */
-
-         const;
          return const(char)*;
       }
       context_menu_clear {
@@ -962,15 +960,13 @@ class Elm_Entry (Elm_Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface,
             @in int len; /*@ the length of data, in bytes, to send to the input panel */
          }
       }
-      input_panel_imdata_get {
+      input_panel_imdata_get @const {
          /*@
          Get the specific data of the current input panel.
 
          See @ref elm_entry_input_panel_imdata_set for more details.
 
          @ingroup Entry */
-
-         const;
          params {
             @out void data; /*@ The specific data to be got from the input panel */
             @out int len; /*@ The length of data */
@@ -1032,7 +1028,7 @@ class Elm_Entry (Elm_Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface,
          @ingroup Entry */
 
       }
-      is_empty {
+      is_empty @const {
          /*@
          Get whether the entry is empty.
 
@@ -1043,8 +1039,6 @@ class Elm_Entry (Elm_Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface,
          @return EINA_TRUE if the entry is empty, EINA_FALSE otherwise.
 
          @ingroup Entry */
-
-         const;
          return bool;
       }
       markup_filter_remove {
diff --git a/src/lib/elm_gengrid.eo b/src/lib/elm_gengrid.eo
index b5c7dec5e..a7c5f7037 100644
--- a/src/lib/elm_gengrid.eo
+++ b/src/lib/elm_gengrid.eo
@@ -528,7 +528,7 @@ class Elm_Gengrid (Elm_Layout, Elm_Interface_Scrollable, Evas.Clickable_Interfac
             @in const(void)* func_data; /*@ Data to be passed to @p func. */
          }
       }
-      items_count {
+      items_count @const {
          /*@
          Return how many items are currently in a list
 
@@ -537,11 +537,9 @@ class Elm_Gengrid (Elm_Layout, Elm_Interface_Scrollable, Evas.Clickable_Interfac
          This behavior is O(1) and includes items which may or may not be realized.
 
          @ingroup Gengrid */
-
-         const;
          return uint;
       }
-      at_xy_item_get {
+      at_xy_item_get @const {
          /*@
          Get the item that is at the x, y canvas coords.
 
@@ -562,8 +560,6 @@ class Elm_Gengrid (Elm_Layout, Elm_Interface_Scrollable, Evas.Clickable_Interfac
          the gengrid.
 
          @ingroup Gengrid */
-
-         const;
          return Elm_Object_Item *;
          params {
             @in Evas_Coord x; /*@ The input x coordinate */
diff --git a/src/lib/elm_genlist.eo b/src/lib/elm_genlist.eo
index 205f6984b..14babba7f 100644
--- a/src/lib/elm_genlist.eo
+++ b/src/lib/elm_genlist.eo
@@ -551,7 +551,7 @@ class Elm_Genlist (Elm_Layout, Elm_Interface_Scrollable, Evas.Clickable_Interfac
             @in const(void)* func_data; /*@ Data passed to @p func above. */
          }
       }
-      at_xy_item_get {
+      at_xy_item_get @const {
          /*@
          Get the item that is at the x, y canvas coords.
 
@@ -568,8 +568,6 @@ class Elm_Genlist (Elm_Layout, Elm_Interface_Scrollable, Evas.Clickable_Interfac
          the genlist.
 
          @ingroup Genlist */
-
-         const;
          return Elm_Object_Item *;
          params {
             @in Evas_Coord x; /*@ The input x coordinate */
@@ -577,7 +575,7 @@ class Elm_Genlist (Elm_Layout, Elm_Interface_Scrollable, Evas.Clickable_Interfac
             @out int posret; /*@ The position relative to the item returned here */
          }
       }
-      items_count {
+      items_count @const {
          /*@
          Return how many items are currently in a list
 
@@ -586,8 +584,6 @@ class Elm_Genlist (Elm_Layout, Elm_Interface_Scrollable, Evas.Clickable_Interfac
          This behavior is O(1) and includes items which may or may not be realized.
 
          @ingroup Genlist */
-
-         const;
          return uint;
       }
       item_prepend {
diff --git a/src/lib/elm_hover.eo b/src/lib/elm_hover.eo
index 047281d07..32e3b3039 100644
--- a/src/lib/elm_hover.eo
+++ b/src/lib/elm_hover.eo
@@ -27,7 +27,7 @@ class Elm_Hover (Elm_Layout, Evas.Clickable_Interface)
       }
    }
    methods {
-      best_content_location_get {
+      best_content_location_get @const {
          /*@
          @brief Returns the best swallow location for content in the hover.
 
@@ -53,8 +53,6 @@ class Elm_Hover (Elm_Layout, Evas.Clickable_Interface)
          @see elm_object_part_content_set()
 
          @ingroup Hover */
-
-         const;
          return const(char)*;
          params {
             @in Elm_Hover_Axis pref_axis; /*@ The preferred orientation axis for the hover object to use */
diff --git a/src/lib/elm_index.eo b/src/lib/elm_index.eo
index ed28f4137..4a829b202 100644
--- a/src/lib/elm_index.eo
+++ b/src/lib/elm_index.eo
@@ -294,15 +294,13 @@ class Elm_Index (Elm_Layout)
             @in const(void)* data; /*@ The item data to set for the index's item */
          }
       }
-      selected_item_get {
+      selected_item_get @const {
          /*@
          Returns the last selected item, for a given index widget.
 
          @return The last item @b selected on @p obj (or @c NULL, on errors).
 
          @ingroup Index */
-
-         const;
          return Elm_Object_Item *;
          params {
             @in int level; /*@ @c 0 or @c 1, the currently implemented levels. */
diff --git a/src/lib/elm_layout.eo b/src/lib/elm_layout.eo
index a1f7cb93e..e9a19bf58 100644
--- a/src/lib/elm_layout.eo
+++ b/src/lib/elm_layout.eo
@@ -163,15 +163,13 @@ class Elm_Layout (Elm_Container)
             or should also search on widget's theme as well (EINA_FALSE) */
          }
       }
-      part_cursor_engine_only_get {
+      part_cursor_engine_only_get @const {
          /*@
          Get a specific cursor engine_only for an edje part.
 
          @return whenever the cursor is just provided by engine or also from theme.
 
          @ingroup Layout */
-
-         const;
          return bool;
          params {
             @in const(char)* part_name; /*@ a part from loaded edje group. */
@@ -291,7 +289,7 @@ class Elm_Layout (Elm_Container)
             @in const(char)* style; /*@ the theme style to use (default, transparent, ...) */
          }
       }
-      part_cursor_style_get {
+      part_cursor_style_get @const {
          /*@
          Get a specific cursor style for an edje part.
 
@@ -299,8 +297,6 @@ class Elm_Layout (Elm_Container)
          object does not have a cursor set, then NULL is returned.
 
          @ingroup Layout */
-
-         const;
          return const(char)*;
          params {
             @in const(char)* part_name; /*@ a part from loaded edje group. */
@@ -320,15 +316,13 @@ class Elm_Layout (Elm_Container)
             @in const(char)* text; /*@ The text to set */
          }
       }
-      text_get {
+      text_get @const {
          /*@
          Get the text set in the given part
 
          @return The text set in @p part
 
          @ingroup Layout */
-
-         const;
          return const(char)*;
          params {
             @in const(char)* part; /*@ The TEXT part to retrieve the text off */
@@ -369,15 +363,13 @@ class Elm_Layout (Elm_Container)
             @in const(char)* cursor; /*@ cursor name to use, see Elementary_Cursor.h */
          }
       }
-      part_cursor_get {
+      part_cursor_get @const {
          /*@
          Get the cursor to be shown when mouse is over an edje part
 
          @return the cursor name.
 
          @ingroup Layout */
-
-         const;
          return const(char)*;
          params {
             @in const(char)* part_name; /*@ a part from loaded edje group. */
@@ -438,7 +430,7 @@ class Elm_Layout (Elm_Container)
          legacy null;
          return bool;
       }
-      data_get {
+      data_get @const {
          /*@
          Get the edje data from the given layout
 
@@ -463,8 +455,6 @@ class Elm_Layout (Elm_Container)
          @endcode
 
          @ingroup Layout */
-
-         const;
          return const(char)*;
          params {
             @in const(char)* key; /*@ The data key */
diff --git a/src/lib/elm_list.eo b/src/lib/elm_list.eo
index 2b51b528e..c093d0575 100644
--- a/src/lib/elm_list.eo
+++ b/src/lib/elm_list.eo
@@ -390,7 +390,7 @@ class Elm_List (Elm_Layout, Elm_Interface_Scrollable)
             @in const(void)* data; /*@ The data to associate with the item for related callbacks. */
          }
       }
-      at_xy_item_get {
+      at_xy_item_get @const {
          /*@
          Get the item that is at the x, y canvas coords.
 
@@ -408,8 +408,6 @@ class Elm_List (Elm_Layout, Elm_Interface_Scrollable)
 
 
          @ingroup List */
-
-         const;
          return Elm_Object_Item *;
          params {
             @in Evas_Coord x; /*@ The input x coordinate */
diff --git a/src/lib/elm_map.eo b/src/lib/elm_map.eo
index 0c6757c47..d394785a3 100644
--- a/src/lib/elm_map.eo
+++ b/src/lib/elm_map.eo
@@ -329,7 +329,7 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable)
             @in const(char)* source_name; /*@ The source to be used. */
          }
       }
-      source_get {
+      source_get @const {
          /*@
          Get the name of currently used source for a specific type.
 
@@ -339,8 +339,6 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable)
          @see elm_map_source_set()
 
          @ingroup Map */
-
-         const;
          return const(char)*;
          params {
             @in Elm_Map_Source_Type type; /*@ source type. */
@@ -402,7 +400,7 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable)
             @in void *emap; /*@ The emap route object. */
          }
       }
-      region_to_canvas_convert {
+      region_to_canvas_convert @const {
          /*@
          Convert geographic coordinates (longitude, latitude)
          into canvas coordinates.
@@ -413,8 +411,6 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable)
          see elm_map_canvas_to_region_convert()
 
          @ingroup Map */
-
-         const;
          params {
             @in double lon; /*@ The longitude to convert. */
             @in double lat; /*@ The latitude to convert. */
@@ -494,7 +490,7 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable)
 
          return Elm_Map_Overlay *;
       }
-      sources_get {
+      sources_get @const {
          /*@
          Get the names of available sources for a specific type.
 
@@ -520,8 +516,6 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable)
          @see elm_map_source_get()
 
          @ingroup Map */
-
-         const;
          return const(char)**;
          params {
             @in Elm_Map_Source_Type type; /*@ source type. */
@@ -584,7 +578,7 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable)
             @in double lat; /*@ Latitude to center at. */
          }
       }
-      name_add {
+      name_add @const {
          /*@
          Request a address or geographic coordinates(longitude, latitude)
          from a given address or geographic coordinate(longitude, latitude).
@@ -602,8 +596,6 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable)
          should be used.
 
          @ingroup Map */
-
-         const;
          return Elm_Map_Name *;
          params {
             @in const(char)* address; /*@ The address. */
@@ -613,7 +605,7 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable)
             @in void *data; /*@ The user callback data. */
          }
       }
-      name_search {
+      name_search @const {
          /*@
          @brief Requests a list of addresses corresponding to a given name.
 
@@ -623,7 +615,6 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable)
 
          @internal
          @ingroup Map */
-         const;
          params {
             @in const(char)* address; /*@ The address. */
             @in Elm_Map_Name_List_Cb name_cb; /*@ The callback function. */
@@ -759,7 +750,7 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable)
             @in double lat; /*@ The latitude of the overlay. */
          }
       }
-      canvas_to_region_convert {
+      canvas_to_region_convert @const {
          /*@
          Convert canvas coordinates into geographic coordinates
          (longitude, latitude).
@@ -770,8 +761,6 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable)
          see elm_map_region_to_canvas_convert()
 
          @ingroup Map */
-
-         const;
          params {
             @in Evas_Coord x; /*@ horizontal coordinate of the point to convert. */
             @in Evas_Coord y; /*@ vertical coordinate of the point to convert. */
diff --git a/src/lib/elm_photo.eo b/src/lib/elm_photo.eo
index aa1a703c3..b7d503937 100644
--- a/src/lib/elm_photo.eo
+++ b/src/lib/elm_photo.eo
@@ -93,12 +93,11 @@ class Elm_Photo (Elm_Widget, Evas.Clickable_Interface, Evas.Draggable_Interface)
       }
    }
    methods {
-      thumb_set {
+      thumb_set @const {
          /*@
            Set the file that will be used as thumbnail in the photo.
 
            @ingroup Photo */
-         const;
          params {
             @in const(char)* file; /*@ The path to file that will be used as thumbnail. */
             @in const(char)* group; /*@ The key used in case of an EET file. */
diff --git a/src/lib/elm_prefs.eo b/src/lib/elm_prefs.eo
index 9bc9eb20e..5367bef5f 100644
--- a/src/lib/elm_prefs.eo
+++ b/src/lib/elm_prefs.eo
@@ -177,7 +177,7 @@ class Elm_Prefs (Elm_Widget)
             take place */
          }
       }
-      item_value_get {
+      item_value_get @const {
          /*@
          Retrieve the value of a given prefs widget's item.
 
@@ -188,8 +188,6 @@ class Elm_Prefs (Elm_Widget)
          @see elm_prefs_item_value_set()
 
          @since 1.8 */
-
-         const;
          return bool;
          params {
             @in const(char)* name; /*@ The name of the item (as declared in the prefs
@@ -238,7 +236,7 @@ class Elm_Prefs (Elm_Widget)
             otherwise */
          }
       }
-      item_disabled_get {
+      item_disabled_get @const {
          /*@
          Retrieve whether the widget bound to a given prefs widget's item is
          disabled or not.
@@ -249,8 +247,6 @@ class Elm_Prefs (Elm_Widget)
          @see elm_prefs_item_disabled_set()
 
          @since 1.8 */
-
-         const;
          return bool;
          params {
             @in const(char)* name; /*@ The name of the item (as declared in the prefs
@@ -294,7 +290,7 @@ class Elm_Prefs (Elm_Widget)
             otherwise */
          }
       }
-      item_editable_get {
+      item_editable_get @const {
          /*@
          Retrieve whether the widget bound to a given prefs widget's item is
          editable or not.
@@ -305,8 +301,6 @@ class Elm_Prefs (Elm_Widget)
          @see elm_prefs_item_editable_set() for more details
 
          @since 1.8 */
-
-         const;
          return bool;
          params {
             @in const(char)* name; /*@ The name of the item (as declared in the prefs
@@ -349,7 +343,7 @@ class Elm_Prefs (Elm_Widget)
             otherwise */
          }
       }
-      item_visible_get {
+      item_visible_get @const {
          /*@
          Retrieve whether the widget bound to a given prefs widget's item is
          visible or not.
@@ -360,8 +354,6 @@ class Elm_Prefs (Elm_Widget)
          @see elm_prefs_item_visible_set() for more details
 
          @since 1.8 */
-
-         const;
          return bool;
          params {
             @in const(char)* name; /*@ The name of the item (as declared in the prefs
diff --git a/src/lib/elm_progressbar.eo b/src/lib/elm_progressbar.eo
index 2f4a62757..51303f7d1 100644
--- a/src/lib/elm_progressbar.eo
+++ b/src/lib/elm_progressbar.eo
@@ -239,7 +239,7 @@ class Elm_Progressbar (Elm_Layout)
             1.0) */
          }
       }
-      part_value_get {
+      part_value_get @const {
          /*@
          Get the progress value (in percentage) on a given progress bar
          widget for a particular part
@@ -251,8 +251,6 @@ class Elm_Progressbar (Elm_Layout)
          @see elm_progressbar_value_set() for more details
 
          @ingroup Progressbar */
-
-         const;
          return double;
          params {
             @in const(char)* part; /*@ The part name of the progress bar */
diff --git a/src/lib/elm_scroller.eo b/src/lib/elm_scroller.eo
index de9a6e775..cee1b65dc 100644
--- a/src/lib/elm_scroller.eo
+++ b/src/lib/elm_scroller.eo
@@ -40,7 +40,7 @@ class Elm_Scroller (Elm_Layout, Elm_Interface_Scrollable)
       }
    }
    methods {
-      page_scroll_limit_set {
+      page_scroll_limit_set @const {
          /*@
          @brief Set the maxium of the movable page at a flicking.
 
@@ -51,14 +51,12 @@ class Elm_Scroller (Elm_Layout, Elm_Interface_Scrollable)
          @since 1.8
 
          @ingroup Scroller */
-
-         const;
          params {
             @in int page_limit_h; /*@ The maxium of the movable horizontal page */
             @in int page_limit_v; /*@ The maxium of the movable vertical page */
          }
       }
-      page_scroll_limit_get {
+      page_scroll_limit_get @const {
          /*@
          @brief Get the maxium of the movable page at a flicking.
 
@@ -67,8 +65,6 @@ class Elm_Scroller (Elm_Layout, Elm_Interface_Scrollable)
          @since 1.8
 
          @ingroup Scroller */
-
-         const;
          params {
             @in int *page_limit_h; /*@ The maxium of the movable horizontal page */
             @in int *page_limit_v; /*@ The maxium of the movable vertical page */
diff --git a/src/lib/elm_segment_control.eo b/src/lib/elm_segment_control.eo
index 67c4d5f3c..536a4292a 100644
--- a/src/lib/elm_segment_control.eo
+++ b/src/lib/elm_segment_control.eo
@@ -34,7 +34,7 @@ class Elm_Segment_Control (Elm_Layout)
       }
    }
    methods {
-      item_label_get {
+      item_label_get @const {
          /*@
          Get the label of item.
 
@@ -49,8 +49,6 @@ class Elm_Segment_Control (Elm_Layout)
          @see elm_segment_control_item_add()
 
          @ingroup SegmentControl */
-
-         const;
          return const(char)*;
          params {
             @in int idx; /*@ The index of the segment item. */
@@ -91,7 +89,7 @@ class Elm_Segment_Control (Elm_Layout)
             @in int idx; /*@ Item position. Value should be between 0 and items count. */
          }
       }
-      item_get {
+      item_get @const {
          /*@
          Get the item placed at specified index.
 
@@ -103,8 +101,6 @@ class Elm_Segment_Control (Elm_Layout)
          elm_segment_control_item_count_get().
 
          @ingroup SegmentControl */
-
-         const;
          return Elm_Object_Item *;
          params {
             @in int idx; /*@ The index of the segment item. */
@@ -169,7 +165,7 @@ class Elm_Segment_Control (Elm_Layout)
             Note that, NULL is different from empty string "". */
          }
       }
-      item_icon_get {
+      item_icon_get @const {
          /*@
          Get the icon associated to the item.
 
@@ -184,8 +180,6 @@ class Elm_Segment_Control (Elm_Layout)
          @see elm_object_item_part_content_set()
 
          @ingroup SegmentControl */
-
-         const;
          return Evas_Object *;
          params {
             @in int idx; /*@ The index of the segment item. */
diff --git a/src/lib/elm_slideshow.eo b/src/lib/elm_slideshow.eo
index d49774751..c54c427ab 100644
--- a/src/lib/elm_slideshow.eo
+++ b/src/lib/elm_slideshow.eo
@@ -321,7 +321,7 @@ class Elm_Slideshow (Elm_Layout)
          @ingroup Slideshow */
 
       }
-      item_nth_get {
+      item_nth_get @const {
          /*@
          Get the the item, in a given slideshow widget, placed at
          position @p nth, in its internal items list
@@ -330,8 +330,6 @@ class Elm_Slideshow (Elm_Layout)
          if there's no item with that index (and on errors)
 
          @ingroup Slideshow */
-
-         const;
          return Elm_Object_Item *;
          params {
             @in uint nth; /*@ The number of the item to grab a handle to (0 being
diff --git a/src/lib/elm_table.eo b/src/lib/elm_table.eo
index fed5c07cd..d22769ba2 100644
--- a/src/lib/elm_table.eo
+++ b/src/lib/elm_table.eo
@@ -56,13 +56,11 @@ class Elm_Table (Elm_Widget)
             @in bool clear; /*@ If true, will delete children, else just remove from table. */
          }
       }
-      child_get {
+      child_get @const {
          /*@
          @brief Get child object of table at given coordinates.
 
          @return Child of object if find if not return NULL. */
-
-         const;
          return Evas_Object *;
          params {
             @in int col; /*@ Column number of child object */
diff --git a/src/lib/elm_toolbar.eo b/src/lib/elm_toolbar.eo
index ca49702db..4c46d8354 100644
--- a/src/lib/elm_toolbar.eo
+++ b/src/lib/elm_toolbar.eo
@@ -434,13 +434,11 @@ class Elm_Toolbar (Elm_Widget, Elm_Interface_Scrollable)
             @in const(void)* data; /*@ The data to associate with the item for related callbacks. */
          }
       }
-      items_count {
+      items_count @const {
          /*@
          Get the number of items in a toolbar
          @return The number of items in @p obj toolbar
          @ingroup Toolbar */
-
-         const;
          return uint;
       }
       item_prepend {
@@ -482,7 +480,7 @@ class Elm_Toolbar (Elm_Widget, Elm_Interface_Scrollable)
             @in const(void)* data; /*@ The data to associate with the item for related callbacks. */
          }
       }
-      item_find_by_label {
+      item_find_by_label @const {
          /*@
          Returns a pointer to a toolbar item by its label.
 
@@ -490,8 +488,6 @@ class Elm_Toolbar (Elm_Widget, Elm_Interface_Scrollable)
          on failure.
 
          @ingroup Toolbar */
-
-         const;
          return Elm_Object_Item *;
          params {
             @in const(char)* label; /*@ The label of the item to find. */
diff --git a/src/lib/elm_web.eo b/src/lib/elm_web.eo
index 0fa507699..691d46f9a 100644
--- a/src/lib/elm_web.eo
+++ b/src/lib/elm_web.eo
@@ -507,7 +507,7 @@ class Elm_Web (Elm_Widget)
             @in const(char)* unreachable_url; /*@ URL that could not be reached (optional) */
          }
       }
-      text_search {
+      text_search @const {
          /*@
          Searches the given string in a document.
 
@@ -515,8 +515,6 @@ class Elm_Web (Elm_Widget)
          or failure
 
          @ingroup Web */
-
-         const;
          return bool;
          params {
             @in const(char)* string; /*@ String to search */
diff --git a/src/lib/elm_widget.eo b/src/lib/elm_widget.eo
index b9436a884..23a04d14e 100644
--- a/src/lib/elm_widget.eo
+++ b/src/lib/elm_widget.eo
@@ -437,9 +437,8 @@ abstract Elm_Widget (Evas.Object_Smart, Elm_Interface_Atspi_Widget)
       }
    }
    methods {
-      newest_focus_order_get {
+      newest_focus_order_get @const {
          /*@ No description supplied by the EAPI. */
-         const;
          return Evas_Object *;
          params {
             @out uint newest_focus_order;
@@ -462,9 +461,8 @@ abstract Elm_Widget (Evas.Object_Smart, Elm_Interface_Atspi_Widget)
             @in Elm_Focus_Direction dir;
          }
       }
-      focus_next_object_get {
+      focus_next_object_get @const {
          /*@ No description supplied by the EAPI. */
-         const;
          return Evas_Object *;
          params {
             @in Elm_Focus_Direction dir;
@@ -488,9 +486,8 @@ abstract Elm_Widget (Evas.Object_Smart, Elm_Interface_Atspi_Widget)
             @in const(char)* text;
          }
       }
-      focus_highlight_geometry_get {
+      focus_highlight_geometry_get @const {
          /*@ Get the focus highlight geometry of widget. */
-         const;
          params {
             @in Evas_Coord *x;
             @in Evas_Coord *y;
@@ -608,18 +605,16 @@ abstract Elm_Widget (Evas.Object_Smart, Elm_Interface_Atspi_Widget)
          /*@ 'Virtual' function which checks if handling of passing focus to sub-objects is supported by widget. */
          return bool;
       }
-      name_find {
+      name_find @const {
          /*@ No description supplied by the EAPI. */
-         const;
          return Evas_Object *;
          params {
             @in const(char)* name;
             @in int recurse;
          }
       }
-      focus_list_direction_get {
+      focus_list_direction_get @const {
          /*@ No description supplied by the EAPI. */
-         const;
          return bool;
          params {
             @in const(Evas_Object)* base;
@@ -650,9 +645,8 @@ abstract Elm_Widget (Evas.Object_Smart, Elm_Interface_Atspi_Widget)
             @in bool forceshow;
          }
       }
-      show_region_get {
+      show_region_get @const {
          /*@ No description supplied by the EAPI. */
-         const;
          params {
             @out Evas_Coord x;
             @out Evas_Coord y;
@@ -669,18 +663,16 @@ abstract Elm_Widget (Evas.Object_Smart, Elm_Interface_Atspi_Widget)
             @in Elm_Tooltip *tt;
          }
       }
-      focus_next_get {
+      focus_next_get @const {
          /*@ No description supplied by the EAPI. */
-         const;
          return bool;
          params {
             @in Elm_Focus_Direction dir;
             @out Evas_Object *next;
          }
       }
-      translatable_part_text_get {
+      translatable_part_text_get @const {
          /*@ No description supplied by the EAPI. */
-         const;
          return const(char)*;
          params {
             @in const(char)* part;
@@ -727,9 +719,8 @@ abstract Elm_Widget (Evas.Object_Smart, Elm_Interface_Atspi_Widget)
          }
          return bool;
       }
-      focus_list_next_get {
+      focus_list_next_get @const {
          /*@ No description supplied by the EAPI. */
-         const;
          return bool;
          params {
             @in const(Eina_List)* items;
@@ -746,9 +737,8 @@ abstract Elm_Widget (Evas.Object_Smart, Elm_Interface_Atspi_Widget)
          /*@ 'Virtual' function on the widget being re-themed. */
          return bool;
       }
-      focus_direction_get {
+      focus_direction_get @const {
          /*@ No description supplied by the EAPI. */
-         const;
          return bool;
          params {
             @in const(Evas_Object)* base;
@@ -790,9 +780,8 @@ abstract Elm_Widget (Evas.Object_Smart, Elm_Interface_Atspi_Widget)
             @in Elm_Tooltip *tt;
          }
       }
-      focus_region_show {
+      focus_region_show @const {
          /*@ No description supplied by the EAPI. */
-         const;
       }
       focus_disabled_handle {
          /*@ No description supplied by the EAPI. */