felipealmeida pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=50ebea1d2f12d3bc6738ea8d21923caace4fe62a
commit 50ebea1d2f12d3bc6738ea8d21923caace4fe62a
Author: Vitor Sousa <vitorsousasi...@gmail.com>
Date: Fri Jan 22 19:42:58 2016 -0200
elementary: move definition of Elm_Glob_Match_Flags to elm_general.eot
Move definition of Elm_Glob_Match_Flags from elm_gen.h to
elm_general.eot.
Use the Eolian name Elm.Glob.Match_Flags and replace the older name
by it in all .eo files.
Keep the legacy prefix "ELM_GLOB_MATCH".
---
src/lib/elm_gen.h | 8 --------
src/lib/elm_general.eot | 15 +++++++++++++++
src/lib/elm_gengrid.eo | 2 +-
src/lib/elm_genlist.eo | 2 +-
4 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/lib/elm_gen.h b/src/lib/elm_gen.h
index 9d09e71..8c1ce84 100644
--- a/src/lib/elm_gen.h
+++ b/src/lib/elm_gen.h
@@ -45,11 +45,3 @@ typedef Eina_Bool
(*Elm_Gen_Item_Filter_Get_Cb)(void *data,
#define ELM_GEN_ITEM_CLASS_VERSION 2
#define ELM_GEN_ITEM_CLASS_HEADER ELM_GEN_ITEM_CLASS_VERSION, 0, 0
-
-typedef enum
-{
- ELM_GLOB_MATCH_NO_ESCAPE = (1 << 0), /**< Treat backslash as an ordinary
character instead of escape */
- ELM_GLOB_MATCH_PATH = (1 << 1), /**< Match a slash in string only with a
slash in pattern and not by an asterisk (*) or a question mark (?)
metacharacter, nor by a bracket expression ([]) containing a slash. */
- ELM_GLOB_MATCH_PERIOD = (1 << 2), /**< Leading period in string has to be
matched exactly by a period in pattern. A period is considered to be leading if
it is the first character in string, or if both ELM_GLOB_MATCH_PATH is set and
the period immediately follows a slash. */
- ELM_GLOB_MATCH_NOCASE = (1 << 3) /**< The pattern is matched
case-insensitively. */
-} Elm_Glob_Match_Flags; /**< Glob matching bitfiled flags. @since 1.11 */
diff --git a/src/lib/elm_general.eot b/src/lib/elm_general.eot
index ac19ca1..68e7e16 100644
--- a/src/lib/elm_general.eot
+++ b/src/lib/elm_general.eot
@@ -47,6 +47,21 @@ type Elm.Gengrid.Item.Class: Elm.Gen.Item.Class; [[ See
@Elm.Gen.Item.Class. ]]
type Elm.Genlist.Item.Class: Elm.Gen.Item.Class; [[ See @Elm.Gen.Item.Class. ]]
+enum Elm.Glob.Match_Flags
+{
+ [[Glob matching bitfiled flags. @since 1.11]]
+ legacy: elm_glob_match;
+ no_escape = (1 << 0), [[Treat backslash as an ordinary character instead of
escape]]
+ path = (1 << 1), [[Match a slash in string only with a slash in pattern and
not by
+ an asterisk (*) or a question mark (?) metacharacter,
nor by a
+ bracket expression ([]) containing a slash.]]
+ period = (1 << 2), [[Leading period in string has to be matched exactly by
a period
+ in pattern. A period is considered to be leading if it
is the
+ first character in string, or if both
ELM_GLOB_MATCH_PATH is
+ set and the period immediately follows a slash.]]
+ nocase = (1 << 3), [[The pattern is matched case-insensitively.]]
+}
+
enum Elm.Policy
{
[[Policy identifiers.]]
diff --git a/src/lib/elm_gengrid.eo b/src/lib/elm_gengrid.eo
index 9fa3952..5dfead5 100644
--- a/src/lib/elm_gengrid.eo
+++ b/src/lib/elm_gengrid.eo
@@ -515,7 +515,7 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
]]
@in part_name: const(char) *; [[Name of the TEXT part of gengrid
item to search string in.]]
@in pattern: const(char) *; [[The search pattern.]]
- @in flags: Elm_Glob_Match_Flags; [[Search flags.]]
+ @in flags: Elm.Glob.Match_Flags; [[Search flags.]]
}
}
reorder_mode_start {
diff --git a/src/lib/elm_genlist.eo b/src/lib/elm_genlist.eo
index ddee611..84a7e9a 100644
--- a/src/lib/elm_genlist.eo
+++ b/src/lib/elm_genlist.eo
@@ -506,7 +506,7 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable,
Evas.Clickable_Interfac
]]
@in part_name: const(char)*; [[Name of the TEXT part of genlist
item to search string in.]]
@in pattern: const(char)*; [[The search pattern.]]
- @in flags: Elm_Glob_Match_Flags; [[Search flags.]]
+ @in flags: Elm.Glob.Match_Flags; [[Search flags.]]
}
}
}
--
