summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitor Sousa <vitorsousasilva@gmail.com>2016-01-22 19:42:58 -0200
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-02-09 14:14:08 -0200
commit50ebea1d2f12d3bc6738ea8d21923caace4fe62a (patch)
treecb31f78934343a211b6636ddc45340a2b813f377
parent11e27d00f96b0755df4d69f58c88415646850c00 (diff)
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".
-rw-r--r--src/lib/elm_gen.h8
-rw-r--r--src/lib/elm_general.eot15
-rw-r--r--src/lib/elm_gengrid.eo2
-rw-r--r--src/lib/elm_genlist.eo2
4 files changed, 17 insertions, 10 deletions
diff --git a/src/lib/elm_gen.h b/src/lib/elm_gen.h
index 9d09e7152..8c1ce8476 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,
45 45
46#define ELM_GEN_ITEM_CLASS_VERSION 2 46#define ELM_GEN_ITEM_CLASS_VERSION 2
47#define ELM_GEN_ITEM_CLASS_HEADER ELM_GEN_ITEM_CLASS_VERSION, 0, 0 47#define ELM_GEN_ITEM_CLASS_HEADER ELM_GEN_ITEM_CLASS_VERSION, 0, 0
48
49typedef enum
50{
51 ELM_GLOB_MATCH_NO_ESCAPE = (1 << 0), /**< Treat backslash as an ordinary character instead of escape */
52 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. */
53 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. */
54 ELM_GLOB_MATCH_NOCASE = (1 << 3) /**< The pattern is matched case-insensitively. */
55} 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 ac19ca196..68e7e1625 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. ]]
47 47
48type Elm.Genlist.Item.Class: Elm.Gen.Item.Class; [[ See @Elm.Gen.Item.Class. ]] 48type Elm.Genlist.Item.Class: Elm.Gen.Item.Class; [[ See @Elm.Gen.Item.Class. ]]
49 49
50enum Elm.Glob.Match_Flags
51{
52 [[Glob matching bitfiled flags. @since 1.11]]
53 legacy: elm_glob_match;
54 no_escape = (1 << 0), [[Treat backslash as an ordinary character instead of escape]]
55 path = (1 << 1), [[Match a slash in string only with a slash in pattern and not by
56 an asterisk (*) or a question mark (?) metacharacter, nor by a
57 bracket expression ([]) containing a slash.]]
58 period = (1 << 2), [[Leading period in string has to be matched exactly by a period
59 in pattern. A period is considered to be leading if it is the
60 first character in string, or if both ELM_GLOB_MATCH_PATH is
61 set and the period immediately follows a slash.]]
62 nocase = (1 << 3), [[The pattern is matched case-insensitively.]]
63}
64
50enum Elm.Policy 65enum Elm.Policy
51{ 66{
52 [[Policy identifiers.]] 67 [[Policy identifiers.]]
diff --git a/src/lib/elm_gengrid.eo b/src/lib/elm_gengrid.eo
index 9fa39524d..5dfead53e 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,
515 ]] 515 ]]
516 @in part_name: const(char) *; [[Name of the TEXT part of gengrid item to search string in.]] 516 @in part_name: const(char) *; [[Name of the TEXT part of gengrid item to search string in.]]
517 @in pattern: const(char) *; [[The search pattern.]] 517 @in pattern: const(char) *; [[The search pattern.]]
518 @in flags: Elm_Glob_Match_Flags; [[Search flags.]] 518 @in flags: Elm.Glob.Match_Flags; [[Search flags.]]
519 } 519 }
520 } 520 }
521 reorder_mode_start { 521 reorder_mode_start {
diff --git a/src/lib/elm_genlist.eo b/src/lib/elm_genlist.eo
index ddee6115b..84a7e9a02 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
506 ]] 506 ]]
507 @in part_name: const(char)*; [[Name of the TEXT part of genlist item to search string in.]] 507 @in part_name: const(char)*; [[Name of the TEXT part of genlist item to search string in.]]
508 @in pattern: const(char)*; [[The search pattern.]] 508 @in pattern: const(char)*; [[The search pattern.]]
509 @in flags: Elm_Glob_Match_Flags; [[Search flags.]] 509 @in flags: Elm.Glob.Match_Flags; [[Search flags.]]
510 } 510 }
511 } 511 }
512 } 512 }