Remove const hacks

They were a workaround for limitations in Cython <0.18

1 files changed, 19 insertions, 27 deletions

diff --git a/include/efl.c_eo.pxd b/include/efl.c_eo.pxd
index 5ce114d..7639c6d 100644
--- a/include/efl.c_eo.pxd
+++ b/include/efl.c_eo.pxd
@@ -15,10 +15,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this Python-EFL.  If not, see <http://www.gnu.org/licenses/>.
 
-#from efl.eina cimport *
-
-from libc.string cimport const_char
-from libc.stdlib cimport const_void
 from efl.eina cimport Eina_Bool
 
 cdef extern from "Eo.h":
@@ -26,16 +22,12 @@ cdef extern from "Eo.h":
     # Structures
     #
     ctypedef struct Eo
-    ctypedef Eo const_Eo "const Eo"
 
     ctypedef struct Eo_Class
-    ctypedef Eo_Class const_Eo_Class "const Eo_Class"
 
     ctypedef struct Eo_Event_Description:
-        const_char *name
-        const_char *doc
-
-    ctypedef Eo_Event_Description const_Eo_Event_Description "const Eo_Event_Description"
+        const char *name
+        const char *doc
 
     ctypedef unsigned int Eo_Op
 
@@ -44,12 +36,12 @@ cdef extern from "Eo.h":
     ####################################################################
     # Eo Events
     #
-    cdef const_Eo_Event_Description *EO_EV_DEL
+    cdef const Eo_Event_Description *EO_EV_DEL
 
     ####################################################################
     # Other typedefs
     #
-    ctypedef Eina_Bool (*Eo_Event_Cb)(void *data, Eo *obj, const_Eo_Event_Description *desc, void *event_info)
+    ctypedef Eina_Bool (*Eo_Event_Cb)(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info)
 
     ctypedef void (*eo_base_data_free_func)(void *)
 
@@ -60,30 +52,30 @@ cdef extern from "Eo.h":
     int eo_init()
     int eo_shutdown()
 
-    Eo *eo_add(const_Eo_Class *klass, Eo *parent, ...)
-    Eo *eo_ref(const_Eo *obj)
-    void eo_unref(const_Eo *obj)
-    int eo_ref_get(const_Eo *obj)
-    void eo_del(const_Eo *obj)
+    Eo *eo_add(const Eo_Class *klass, Eo *parent, ...)
+    Eo *eo_ref(const Eo *obj)
+    void eo_unref(const Eo *obj)
+    int eo_ref_get(const Eo *obj)
+    void eo_del(const Eo *obj)
 
     Eo_Op eo_wref_add(Eo *obj)
 
     Eina_Bool eo_do(Eo *obj, ...)
     Eina_Bool eo_class_do(Eo_Class *cls, ...)
-    const_Eo_Class *eo_base_class_get()
+    const Eo_Class *eo_base_class_get()
 
-    Eo_Op eo_base_data_set(const_char *key, const_void *data, eo_base_data_free_func free_func)
-    Eo_Op eo_base_data_get(const_char *key, void **data)
-    Eo_Op eo_base_data_del(const_char *key)
+    Eo_Op eo_base_data_set(const char *key, const void *data, eo_base_data_free_func free_func)
+    Eo_Op eo_base_data_get(const char *key, void **data)
+    Eo_Op eo_base_data_del(const char *key)
 
-    const_Eo_Class *eo_class_get(const_Eo *obj)
-    const_char *eo_class_name_get(const_Eo_Class *klass)
+    const Eo_Class *eo_class_get(const Eo *obj)
+    const char *eo_class_name_get(const Eo_Class *klass)
 
     Eo_Op eo_parent_set(Eo *parent)
     Eo_Op eo_parent_get(Eo **parent)
 
-    Eo_Op eo_event_callback_forwarder_add(const_Eo_Event_Description *desc, Eo *new_obj)
-    Eo_Op eo_event_callback_forwarder_del(const_Eo_Event_Description *desc, Eo *new_obj)
+    Eo_Op eo_event_callback_forwarder_add(const Eo_Event_Description *desc, Eo *new_obj)
+    Eo_Op eo_event_callback_forwarder_del(const Eo_Event_Description *desc, Eo *new_obj)
 
     Eo_Op eo_event_freeze()
     Eo_Op eo_event_thaw()
@@ -93,5 +85,5 @@ cdef extern from "Eo.h":
     Eo_Op eo_event_global_thaw()
     Eo_Op eo_event_global_freeze_get(int *fcount)
 
-    Eo_Op eo_event_callback_add(const_Eo_Event_Description *desc, Eo_Event_Cb cb, const_void *data)
-    Eo_Op eo_event_callback_del(const_Eo_Event_Description *desc, Eo_Event_Cb cb, const_void *data)
+    Eo_Op eo_event_callback_add(const Eo_Event_Description *desc, Eo_Event_Cb cb, const void *data)
+    Eo_Op eo_event_callback_del(const Eo_Event_Description *desc, Eo_Event_Cb cb, const void *data)