Remove const hacks

They were a workaround for limitations in Cython <0.18

1 files changed, 28 insertions, 31 deletions

diff --git a/include/efl.eina.pxd b/include/efl.eina.pxd
index 0c67518..cc0e0b9 100644
--- a/include/efl.eina.pxd
+++ b/include/efl.eina.pxd
@@ -16,8 +16,8 @@
 # along with this Python-EFL.  If not, see <http://www.gnu.org/licenses/>.
 
 from cpython cimport va_list
-from libc.stdlib cimport const_void, malloc, free
-from libc.string cimport const_char, memcpy, strdup
+from libc.stdlib cimport malloc, free
+from libc.string cimport memcpy, strdup
 
 cdef extern from "time.h":
     struct tm:
@@ -32,7 +32,7 @@ cdef extern from "time.h":
         int tm_isdst
 
         long int tm_gmtoff
-        const_char *tm_zone
+        const char *tm_zone
 
 
 cdef extern from "Eina.h":
@@ -57,7 +57,7 @@ cdef extern from "Eina.h":
     #
     ctypedef unsigned char Eina_Bool
     ctypedef int Eina_Error
-    ctypedef const_char Eina_Stringshare
+    ctypedef const char Eina_Stringshare
     # This is actually either wchar_t or uint32_t, Cython
     # should use an appropriate integer automatically
     ctypedef Py_UCS4 Eina_Unicode
@@ -76,7 +76,6 @@ cdef extern from "Eina.h":
         Eina_List *next
         Eina_List *prev
         void      *accounting
-    ctypedef Eina_List const_Eina_List "const Eina_List"
 
     ctypedef struct Eina_Hash
 
@@ -84,7 +83,6 @@ cdef extern from "Eina.h":
         void *key
         void *data
         unsigned int key_length
-    ctypedef Eina_Hash_Tuple const_Eina_Hash_Tuple "const Eina_Hash_Tuple"
 
     ctypedef struct Eina_Iterator:
         Eina_Bool (*next)(Eina_Iterator *it, void **data)
@@ -93,37 +91,36 @@ cdef extern from "Eina.h":
 
     ctypedef struct Eina_Log_Domain:
         int         level # Max level to log
-        const_char *domain_str # Formatted string with color to print
-        const_char *name # Domain name
+        const char *domain_str # Formatted string with color to print
+        const char *name # Domain name
         size_t      namelen # strlen(name)
-    ctypedef Eina_Log_Domain const_Eina_Log_Domain "const Eina_Log_Domain"
 
     ####################################################################
     # Other typedefs
     #
-    ctypedef int (*Eina_Compare_Cb)(const_void *data1, const_void *data2)
+    ctypedef int (*Eina_Compare_Cb)(const void *data1, const void *data2)
     ctypedef void (*Eina_Free_Cb)(void *data)
-    ctypedef void (*Eina_Log_Print_Cb)(const_Eina_Log_Domain *d,
+    ctypedef void (*Eina_Log_Print_Cb)(const Eina_Log_Domain *d,
                                   Eina_Log_Level level,
-                                  const_char *file, const_char *fnc, int line,
-                                  const_char *fmt, void *data, va_list args)
+                                  const char *file, const char *fnc, int line,
+                                  const char *fmt, void *data, va_list args)
 
     ####################################################################
     # Functions
     #
     Eina_Error eina_error_get()
     void eina_error_set(Eina_Error err)
-    const_char *eina_error_msg_get(Eina_Error error)
+    const char *eina_error_msg_get(Eina_Error error)
 
     Eina_Bool eina_iterator_next(Eina_Iterator *iterator, void **data)
     void eina_iterator_free(Eina_Iterator *iterator)
 
-    Eina_Stringshare *eina_stringshare_add_length(const_char *str, unsigned int slen)
-    Eina_Stringshare *eina_stringshare_add(const_char *str)
+    Eina_Stringshare *eina_stringshare_add_length(const char *str, unsigned int slen)
+    Eina_Stringshare *eina_stringshare_add(const char *str)
     void              eina_stringshare_del(Eina_Stringshare *str)
     Eina_Stringshare *eina_stringshare_ref(Eina_Stringshare *str)
     int               eina_stringshare_strlen(Eina_Stringshare *str)
-    Eina_Bool         eina_stringshare_replace(Eina_Stringshare **p_str, const_char *news)
+    Eina_Bool         eina_stringshare_replace(Eina_Stringshare **p_str, const char *news)
 
     Eina_List *eina_list_free(Eina_List *list)
     Eina_List *eina_list_append(Eina_List *list, void *data)
@@ -163,9 +160,9 @@ cdef extern from "Eina.h":
     unsigned int eina_list_count(Eina_List *list)
 
     Eina_Hash *eina_hash_string_superfast_new(Eina_Free_Cb data_free_cb)
-    Eina_Bool  eina_hash_add(Eina_Hash *hash, const_void *key, const_void *data)
-    Eina_Bool eina_hash_del(Eina_Hash  *hash, const_void *key, const_void *data)
-    void *eina_hash_find(Eina_Hash *hash, const_void *key)
+    Eina_Bool  eina_hash_add(Eina_Hash *hash, const void *key, const void *data)
+    Eina_Bool eina_hash_del(Eina_Hash  *hash, const void *key, const void *data)
+    void *eina_hash_find(Eina_Hash *hash, const void *key)
 
     void eina_log_threads_enable()
     void eina_log_print_cb_set(Eina_Log_Print_Cb cb, void *data)
@@ -174,21 +171,21 @@ cdef extern from "Eina.h":
     Eina_Bool          eina_log_main_thread_check()
     void               eina_log_function_disable_set(Eina_Bool disabled)
     Eina_Bool          eina_log_function_disable_get()
-    void               eina_log_domain_level_set(const_char *domain_name, int level)
-    int                eina_log_domain_level_get(const_char *domain_name)
+    void               eina_log_domain_level_set(const char *domain_name, int level)
+    int                eina_log_domain_level_get(const char *domain_name)
     int                eina_log_domain_registered_level_get(int domain)
-    int  eina_log_domain_register(const_char *name, const_char *color)
+    int  eina_log_domain_register(const char *name, const char *color)
     void eina_log_domain_unregister(int domain)
     void eina_log_print(int            domain,
                         Eina_Log_Level level,
-                        const_char    *file,
-                        const_char    *fnc,
+                        const char    *file,
+                        const char    *fnc,
                         int            line,
-                        const_char    *fmt,
+                        const char    *fmt,
                         ...)
 
-    void EINA_LOG_DOM_CRIT(int DOM, const_char *fmt, ...)
-    void EINA_LOG_DOM_ERR(int DOM, const_char *fmt, ...)
-    void EINA_LOG_DOM_WARN(int DOM, const_char *fmt, ...)
-    void EINA_LOG_DOM_INFO(int DOM, const_char *fmt, ...)
-    void EINA_LOG_DOM_DBG(int DOM, const_char *fmt, ...)
+    void EINA_LOG_DOM_CRIT(int DOM, const char *fmt, ...)
+    void EINA_LOG_DOM_ERR(int DOM, const char *fmt, ...)
+    void EINA_LOG_DOM_WARN(int DOM, const char *fmt, ...)
+    void EINA_LOG_DOM_INFO(int DOM, const char *fmt, ...)
+    void EINA_LOG_DOM_DBG(int DOM, const char *fmt, ...)