summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2018-03-24 08:42:31 +0100
committerDave Andreoli <dave@gurumeditation.it>2018-03-24 08:42:31 +0100
commit30c9c60b5d20b546bfc00ec7a2f5d5a29d9a76a6 (patch)
tree83297765b814623fe637b7463b32f757f2eb0009
parent26607a098607d56ad460e84535387628045217d8 (diff)
Fix warnings spotted by cython 0.28
Those are all simbols redeclared in different places
-rw-r--r--efl/elementary/box_cdef.pxi2
-rw-r--r--efl/elementary/cnp_callbacks.pxi8
-rw-r--r--efl/elementary/elementary_cdef.pxi11
-rw-r--r--efl/elementary/entry_cdef.pxi9
-rw-r--r--efl/elementary/layout_cdef.pxi2
-rw-r--r--efl/elementary/object_cdef.pxi21
-rw-r--r--efl/elementary/object_item_cdef.pxi3
-rw-r--r--include/efl.ecore_x.pxd6
-rw-r--r--include/efl.elementary.enums.pxd17
9 files changed, 10 insertions, 69 deletions
diff --git a/efl/elementary/box_cdef.pxi b/efl/elementary/box_cdef.pxi
index b56c24b..40feec5 100644
--- a/efl/elementary/box_cdef.pxi
+++ b/efl/elementary/box_cdef.pxi
@@ -1,5 +1,3 @@
1cdef extern from "Ecore.h":
2 ctypedef void (*Ecore_Cb)(void *data)
3 1
4cdef extern from "Evas.h": 2cdef extern from "Evas.h":
5 ctypedef void *Evas_Object_Box_Data 3 ctypedef void *Evas_Object_Box_Data
diff --git a/efl/elementary/cnp_callbacks.pxi b/efl/elementary/cnp_callbacks.pxi
index 8e6b7e4..8b29de1 100644
--- a/efl/elementary/cnp_callbacks.pxi
+++ b/efl/elementary/cnp_callbacks.pxi
@@ -1,14 +1,6 @@
1from efl.utils.conversions cimport python_list_objects_to_eina_list 1from efl.utils.conversions cimport python_list_objects_to_eina_list
2 2
3cdef extern from "Elementary.h": 3cdef extern from "Elementary.h":
4 struct _Elm_Selection_Data:
5 Evas_Coord x, y
6 Elm_Sel_Format format
7 void *data
8 size_t len
9 Elm_Xdnd_Action action
10
11 ctypedef _Elm_Selection_Data Elm_Selection_Data
12 4
13 ctypedef Eina_Bool (*Elm_Drop_Cb) (void *data, Evas_Object *obj, Elm_Selection_Data *ev) 5 ctypedef Eina_Bool (*Elm_Drop_Cb) (void *data, Evas_Object *obj, Elm_Selection_Data *ev)
14 ctypedef Elm_Object_Item *(*Elm_Xy_Item_Get_Cb) (Evas_Object *obj, Evas_Coord x, Evas_Coord y, int *xposret, int *yposret) 6 ctypedef Elm_Object_Item *(*Elm_Xy_Item_Get_Cb) (Evas_Object *obj, Evas_Coord x, Evas_Coord y, int *xposret, int *yposret)
diff --git a/efl/elementary/elementary_cdef.pxi b/efl/elementary/elementary_cdef.pxi
index a9751e4..7b21958 100644
--- a/efl/elementary/elementary_cdef.pxi
+++ b/efl/elementary/elementary_cdef.pxi
@@ -11,7 +11,8 @@ from efl.evas.enums cimport EVAS_EVENT_FLAG_NONE, EVAS_CALLBACK_KEY_DOWN, \
11from efl.ecore cimport Ecore_Pos_Map 11from efl.ecore cimport Ecore_Pos_Map
12 12
13from efl.elementary.enums cimport Elm_Process_State, Elm_Sys_Notify_Urgency, \ 13from efl.elementary.enums cimport Elm_Process_State, Elm_Sys_Notify_Urgency, \
14 Elm_Policy, Elm_Policy_Quit, Elm_Policy_Exit, Elm_Policy_Throttle 14 Elm_Policy, Elm_Policy_Quit, Elm_Policy_Exit, Elm_Policy_Throttle, \
15 Elm_Sel_Format, Elm_Xdnd_Action
15 16
16 17
17cdef extern from "time.h": 18cdef extern from "time.h":
@@ -47,6 +48,14 @@ cdef extern from "Elementary.h":
47 const char *palette_name 48 const char *palette_name
48 Eina_List *color_list 49 Eina_List *color_list
49 50
51 #selection
52 ctypedef struct Elm_Selection_Data:
53 Evas_Coord x, y
54 Elm_Sel_Format format
55 void *data
56 size_t len
57 Elm_Xdnd_Action action
58
50 #event 59 #event
51 ctypedef Eina_Bool (*Elm_Event_Cb) (void *data, Evas_Object *obj, Evas_Object *src, Evas_Callback_Type t, void *event_info) 60 ctypedef Eina_Bool (*Elm_Event_Cb) (void *data, Evas_Object *obj, Evas_Object *src, Evas_Callback_Type t, void *event_info)
52 61
diff --git a/efl/elementary/entry_cdef.pxi b/efl/elementary/entry_cdef.pxi
index 8e95e6d..7cda8be 100644
--- a/efl/elementary/entry_cdef.pxi
+++ b/efl/elementary/entry_cdef.pxi
@@ -21,20 +21,11 @@ cdef extern from "Elementary.h":
21 Eina_Bool hover_top 21 Eina_Bool hover_top
22 Eina_Bool hover_bottom 22 Eina_Bool hover_bottom
23 23
24 ctypedef struct Elm_Selection_Data:
25 Evas_Coord x, y
26 Elm_Sel_Format format
27 void *data
28 size_t len
29 Elm_Xdnd_Action action
30
31 ctypedef struct Elm_Entry_Context_Menu_Item: 24 ctypedef struct Elm_Entry_Context_Menu_Item:
32 pass 25 pass
33 26
34 ctypedef void (*Elm_Entry_Filter_Cb)(void *data, Evas_Object *entry, char **text) 27 ctypedef void (*Elm_Entry_Filter_Cb)(void *data, Evas_Object *entry, char **text)
35 28
36 ctypedef Eina_Bool (*Elm_Drop_Cb) (void *data, Evas_Object *obj, Elm_Selection_Data *ev)
37
38 # Data for the elm_entry_filter_limit_size() entry filter. 29 # Data for the elm_entry_filter_limit_size() entry filter.
39 ctypedef struct Elm_Entry_Filter_Limit_Size: 30 ctypedef struct Elm_Entry_Filter_Limit_Size:
40 int max_char_count # The maximum number of characters allowed. 31 int max_char_count # The maximum number of characters allowed.
diff --git a/efl/elementary/layout_cdef.pxi b/efl/elementary/layout_cdef.pxi
index 7405d5e..8a830ef 100644
--- a/efl/elementary/layout_cdef.pxi
+++ b/efl/elementary/layout_cdef.pxi
@@ -1,5 +1,3 @@
1cdef extern from "Edje.h":
2 ctypedef void (*Edje_Signal_Cb)(void *data, Evas_Object *obj, const char *emission, const char *source)
3 1
4cdef extern from "Elementary.h": 2cdef extern from "Elementary.h":
5 Eina_Bool elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content) 3 Eina_Bool elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content)
diff --git a/efl/elementary/object_cdef.pxi b/efl/elementary/object_cdef.pxi
index 06bc567..88265d0 100644
--- a/efl/elementary/object_cdef.pxi
+++ b/efl/elementary/object_cdef.pxi
@@ -18,33 +18,12 @@
18from efl.elementary.enums cimport Elm_Sel_Type, Elm_Focus_Direction, \ 18from efl.elementary.enums cimport Elm_Sel_Type, Elm_Focus_Direction, \
19 Elm_Focus_Region_Show_Mode, Elm_Tooltip_Orient 19 Elm_Focus_Region_Show_Mode, Elm_Tooltip_Orient
20 20
21cdef extern from "Edje.h":
22 ctypedef void (*Edje_Signal_Cb)(void *data, Evas_Object *obj, const char *emission, const char *source)
23
24 21
25cdef extern from "Elementary.h": 22cdef extern from "Elementary.h":
26 ctypedef struct Elm_Theme 23 ctypedef struct Elm_Theme
27 24
28 ctypedef struct Elm_Object_Item 25 ctypedef struct Elm_Object_Item
29 26
30 ctypedef struct Elm_Selection_Data:
31 Evas_Coord x, y
32 Elm_Sel_Format format
33 void *data
34 size_t len
35 Elm_Xdnd_Action action
36
37 ctypedef Eina_Bool (*Elm_Event_Cb) (void *data, Evas_Object *obj, Evas_Object *src, Evas_Callback_Type t, void *event_info)
38 ctypedef Evas_Object *(*Elm_Tooltip_Content_Cb) (void *data, Evas_Object *obj, Evas_Object *tooltip)
39 ctypedef Evas_Object *(*Elm_Tooltip_Item_Content_Cb) (void *data, Evas_Object *obj, Evas_Object *tooltip, void *item)
40
41 ctypedef Eina_Bool (*Elm_Drop_Cb) (void *data, Evas_Object *obj, Elm_Selection_Data *ev)
42 ctypedef void (*Elm_Selection_Loss_Cb) (void *data, Elm_Sel_Type selection)
43 ctypedef Evas_Object *(*Elm_Drag_Icon_Create_Cb) (void *data, Evas_Object *win, Evas_Coord *xoff, Evas_Coord *yoff)
44 ctypedef void (*Elm_Drag_State) (void *data, Evas_Object *obj)
45 ctypedef void (*Elm_Drag_Accept) (void *data, Evas_Object *obj, Eina_Bool doaccept)
46 ctypedef void (*Elm_Drag_Pos) (void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y, Elm_Xdnd_Action action)
47
48 # Object handling (py3: DONE) 27 # Object handling (py3: DONE)
49 void elm_object_part_text_set(Evas_Object *obj, const char *part, const char *label) 28 void elm_object_part_text_set(Evas_Object *obj, const char *part, const char *label)
50 void elm_object_text_set(Evas_Object *obj, const char *label) 29 void elm_object_text_set(Evas_Object *obj, const char *label)
diff --git a/efl/elementary/object_item_cdef.pxi b/efl/elementary/object_item_cdef.pxi
index 490f40d..401993c 100644
--- a/efl/elementary/object_item_cdef.pxi
+++ b/efl/elementary/object_item_cdef.pxi
@@ -2,9 +2,6 @@ cdef extern from "Elementary.h":
2 2
3 ctypedef struct Elm_Object_Item 3 ctypedef struct Elm_Object_Item
4 4
5 ctypedef Evas_Object *(*Elm_Tooltip_Content_Cb) (void *data, Evas_Object *obj, Evas_Object *tooltip)
6 ctypedef Evas_Object *(*Elm_Tooltip_Item_Content_Cb) (void *data, Evas_Object *obj, Evas_Object *tooltip, void *item)
7
8 Evas_Object * elm_object_item_widget_get(const Elm_Object_Item *it) 5 Evas_Object * elm_object_item_widget_get(const Elm_Object_Item *it)
9 void elm_object_item_part_content_set(Elm_Object_Item *it, const char *part, Evas_Object* content) 6 void elm_object_item_part_content_set(Elm_Object_Item *it, const char *part, Evas_Object* content)
10 void elm_object_item_content_set(Elm_Object_Item *it, Evas_Object* content) 7 void elm_object_item_content_set(Elm_Object_Item *it, Evas_Object* content)
diff --git a/include/efl.ecore_x.pxd b/include/efl.ecore_x.pxd
index 2e69be8..5489481 100644
--- a/include/efl.ecore_x.pxd
+++ b/include/efl.ecore_x.pxd
@@ -800,12 +800,6 @@ cdef extern from "Ecore_X.h":
800 ECORE_X_REGION_BOUNDING 800 ECORE_X_REGION_BOUNDING
801 ECORE_X_REGION_CLIP 801 ECORE_X_REGION_CLIP
802 802
803 ctypedef Ecore_X_ID Ecore_X_Picture
804 ctypedef Ecore_X_ID Ecore_X_Region
805 ctypedef enum Ecore_X_Region_Type:
806 ECORE_X_REGION_BOUNDING
807 ECORE_X_REGION_CLIP
808
809 ctypedef Ecore_X_ID Ecore_X_Damage 803 ctypedef Ecore_X_ID Ecore_X_Damage
810 804
811 ctypedef enum Ecore_X_Damage_Report_Level: 805 ctypedef enum Ecore_X_Damage_Report_Level:
diff --git a/include/efl.elementary.enums.pxd b/include/efl.elementary.enums.pxd
index 0dae58f..75b9120 100644
--- a/include/efl.elementary.enums.pxd
+++ b/include/efl.elementary.enums.pxd
@@ -21,7 +21,6 @@ cdef extern from "Elementary.h":
21 ELM_EVENT_PROCESS_FOREGROUND 21 ELM_EVENT_PROCESS_FOREGROUND
22 ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED 22 ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED
23 ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED 23 ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED
24 ELM_EVENT_SYSTRAY_READY
25 24
26 #enums 25 #enums
27 ctypedef enum Elm_Focus_Direction: 26 ctypedef enum Elm_Focus_Direction:
@@ -119,11 +118,6 @@ cdef extern from "Elementary.h":
119 ELM_PROCESS_STATE_FOREGROUND 118 ELM_PROCESS_STATE_FOREGROUND
120 ELM_PROCESS_STATE_BACKGROUND 119 ELM_PROCESS_STATE_BACKGROUND
121 120
122 ctypedef enum Elm_Sys_Notify_Urgency:
123 ELM_SYS_NOTIFY_URGENCY_LOW
124 ELM_SYS_NOTIFY_URGENCY_NORMAL
125 ELM_SYS_NOTIFY_URGENCY_CRITICAL
126
127 # actionslider 121 # actionslider
128 ctypedef enum Elm_Actionslider_Pos: 122 ctypedef enum Elm_Actionslider_Pos:
129 ELM_ACTIONSLIDER_NONE 123 ELM_ACTIONSLIDER_NONE
@@ -202,12 +196,6 @@ cdef extern from "Elementary.h":
202 ELM_SOFTCURSOR_MODE_ON 196 ELM_SOFTCURSOR_MODE_ON
203 ELM_SOFTCURSOR_MODE_OFF 197 ELM_SOFTCURSOR_MODE_OFF
204 198
205 ctypedef enum Elm_Slider_Indicator_Visible_Mode:
206 ELM_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT
207 ELM_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS
208 ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS
209 ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE
210
211 # ctxpopup 199 # ctxpopup
212 ctypedef enum Elm_Ctxpopup_Direction: 200 ctypedef enum Elm_Ctxpopup_Direction:
213 ELM_CTXPOPUP_DIRECTION_DOWN 201 ELM_CTXPOPUP_DIRECTION_DOWN
@@ -438,11 +426,6 @@ cdef extern from "Elementary.h":
438 ELM_IMAGE_FLIP_TRANSVERSE 426 ELM_IMAGE_FLIP_TRANSVERSE
439 427
440 # label 428 # label
441 ctypedef enum Elm_Wrap_Type:
442 ELM_WRAP_NONE
443 ELM_WRAP_CHAR
444 ELM_WRAP_WORD
445 ELM_WRAP_MIXED
446 429
447 ctypedef enum Elm_Label_Slide_Mode: 430 ctypedef enum Elm_Label_Slide_Mode:
448 ELM_LABEL_SLIDE_MODE_NONE 431 ELM_LABEL_SLIDE_MODE_NONE