Fix sort callback.

SVN revision: 37221

src/modules/conf_display/e_int_config_display.c

@@ -16,7 +16,7 @@ static void         _load_rates              (E_Config_Dialog_Data *cfdata);
 static void         _ilist_item_change       (void *data);
 static int          _deferred_noxrandr_error (void *data);
 static int          _deferred_norates_error  (void *data);
-static int	    _sort_resolutions	     (void *d1, void *d2);
+static int	    _sort_resolutions	     (const void *d1, const void *d2);
 
 typedef struct _Resolution Resolution;
 typedef struct _SureBox SureBox;
@@ -526,10 +526,10 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 }
 
 static int
-_sort_resolutions(void *d1, void *d2)
+_sort_resolutions(const void *d1, const void *d2)
 {
-   Resolution *r1 = d1;
-   Resolution *r2 = d2;
+   const Resolution *r1 = d1;
+   const Resolution *r2 = d2;
 
    if (r1->size.width > r2->size.width) return 1;
    if (r1->size.width < r2->size.width) return -1;

src/modules/conf_fonts/e_int_config_fonts.c

@@ -25,7 +25,7 @@ static void _adv_font_cb_change(void *data, Evas_Object *obj);
 static void _adv_style_cb_change(void *data, Evas_Object *obj);
 static void _size_cb_change(void *data);
 
-static int  _sort_fonts(void *data1, void *data2);
+static int  _sort_fonts(const void *data1, const void *data2);
 static void _font_list_load(E_Config_Dialog_Data *cfdata, const char *cur_font);
 static void _size_list_load(E_Config_Dialog_Data *cfdata, Eina_List *size_list, Evas_Font_Size cur_size, int clear);
 static void _class_list_load(E_Config_Dialog_Data *cfdata);
@@ -1125,7 +1125,7 @@ _adv_enabled_fallback_cb_change(void *data, Evas_Object *obj)
 }
 
 static int 
-_sort_fonts(void *data1, void *data2) 
+_sort_fonts(const void *data1, const void *data2) 
 {
    if (!data1) return 1;
    if (!data2) return -1;

src/modules/conf_icon_theme/e_int_config_icon_themes.c

@@ -16,7 +16,7 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Co
 //static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
 static void _ilist_cb_change(void *data, Evas_Object *obj);
-static int _sort_icon_themes(void *data1, void *data2);
+static int _sort_icon_themes(const void *data1, const void *data2);
 
 struct _E_Config_Dialog_Data
 {
@@ -441,9 +441,9 @@ _ilist_cb_change(void *data, Evas_Object *obj)
 }
 
 static int
-_sort_icon_themes(void *data1, void *data2)
+_sort_icon_themes(const void *data1, const void *data2)
 {
-   Efreet_Icon_Theme *m1, *m2;
+   const Efreet_Icon_Theme *m1, *m2;
 
    if (!data2) return -1;
 

src/modules/conf_imc/e_int_config_imc.c

@@ -15,7 +15,7 @@ static Evas_Object *_basic_create_widgets    (E_Config_Dialog *cfd, Evas *evas,
 static Evas_Object *_advanced_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
 /* Basic Callbacks */
-static int	    _basic_list_sort_cb	     (void *d1, void *d2);
+static int	    _basic_list_sort_cb	     (const void *d1, const void *d2);
 static void	    _e_imc_disable_change_cb (void *data, Evas_Object *obj);
 static void	    _e_imc_list_change_cb    (void *data, Evas_Object *obj);
 static void	    _e_imc_setup_cb          (void *data, void *data2);
@@ -204,7 +204,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 }
 
 static int
-_basic_list_sort_cb(void *d1, void *d2)
+_basic_list_sort_cb(const void *d1, const void *d2)
 {
    if (!d1) return 1;
    if (!d2) return -1;

src/modules/conf_intl/e_int_config_intl.c

@@ -19,11 +19,11 @@ static void _ilist_language_cb_change       (void *data, Evas_Object *obj);
 static void _ilist_region_cb_change         (void *data, Evas_Object *obj);
 static void _ilist_codeset_cb_change        (void *data, Evas_Object *obj);
 static void _ilist_modifier_cb_change       (void *data, Evas_Object *obj);
-static int  _lang_list_sort                 (void *data1, void *data2);
+static int  _lang_list_sort                 (const void *data1, const void *data2);
 static void _lang_list_load                 (void *data);
-static int  _region_list_sort               (void *data1, void *data2);
+static int  _region_list_sort               (const void *data1, const void *data2);
 static void _region_list_load               (void *data);
-static int  _basic_lang_list_sort           (void *data1, void *data2);
+static int  _basic_lang_list_sort           (const void *data1, const void *data2);
 
 /* Fill the clear lists, fill with language, select */
 /* Update lanague */
@@ -1305,9 +1305,9 @@ _intl_current_locale_setup(E_Config_Dialog_Data *cfdata)
 }
 
 static int 
-_lang_list_sort(void *data1, void *data2) 
+_lang_list_sort(const void *data1, const void *data2) 
 {
-   E_Intl_Language_Node *ln1, *ln2;
+   const E_Intl_Language_Node *ln1, *ln2;
    const char *trans1;
    const char *trans2;
    
@@ -1378,9 +1378,9 @@ _lang_list_load(void *data)
 }
 
 static int 
-_region_list_sort(void *data1, void *data2) 
+_region_list_sort(const void *data1, const void *data2) 
 {
-   E_Intl_Region_Node *rn1, *rn2;
+   const E_Intl_Region_Node *rn1, *rn2;
    const char *trans1;
    const char *trans2;
    
@@ -1442,9 +1442,9 @@ _region_list_load(void *data)
 }
 
 static int 
-_basic_lang_list_sort(void *data1, void *data2) 
+_basic_lang_list_sort(const void *data1, const void *data2) 
 {
-   E_Intl_Pair *ln1, *ln2;
+   const E_Intl_Pair *ln1, *ln2;
    const char *trans1;
    const char *trans2;
    

src/modules/conf_keybindings/e_int_config_keybindings.c

@@ -39,7 +39,7 @@ static void _auto_apply_changes(E_Config_Dialog_Data *cfdata);
 static void _find_key_binding_action(const char *action, const char *params, int *g, int *a, int *n);
 
 /********* Sorting ************************/
-static int _key_binding_sort_cb(void *d1, void *d2);
+static int _key_binding_sort_cb(const void *d1, const void *d2);
 
 /**************** grab window *******/
 static void _grab_wnd_show(E_Config_Dialog_Data *cfdata);
@@ -873,10 +873,10 @@ _update_buttons(E_Config_Dialog_Data *cfdata)
 
 /*************** Sorting *****************************/
 static int
-_key_binding_sort_cb(void *d1, void *d2)
+_key_binding_sort_cb(const void *d1, const void *d2)
 {
    int i, j;
-   E_Config_Binding_Key *bi, *bi2;
+   const E_Config_Binding_Key *bi, *bi2;
 
    bi = d1;
    bi2 = d2;

src/modules/conf_mime/e_int_config_mime.c

@@ -41,7 +41,7 @@ static void         _load_mimes      (E_Config_Dialog_Data *cfdata, char *file);
 static void         _load_globs      (E_Config_Dialog_Data *cfdata, char *file);
 static void         _fill_types      (E_Config_Dialog_Data *cfdata);
 static void         _tlist_cb_change (void *data);
-static int          _sort_mimes      (void *data1, void *data2);
+static int          _sort_mimes      (const void *data1, const void *data2);
 static Config_Mime *_find_mime       (E_Config_Dialog_Data *cfdata, char *mime);
 static Config_Glob *_find_glob       (Config_Mime *mime, char *glob);
 static void         _cb_config       (void *data, void *data2);
@@ -490,9 +490,9 @@ _tlist_cb_change(void *data)
 }
 
 static int 
-_sort_mimes(void *data1, void *data2) 
+_sort_mimes(const void *data1, const void *data2) 
 {
-   Config_Mime *m1, *m2;
+   const Config_Mime *m1, *m2;
    
    if (!data1) return 1;
    if (!data2) return -1;

src/modules/conf_mousebindings/e_int_config_mousebindings.c

@@ -41,8 +41,8 @@ static char *_helper_modifier_name_get(int mod);
 static void _auto_apply_changes(E_Config_Dialog_Data *cfdata);
 
 /********* Sorting ***************/
-static int _mouse_binding_sort_cb(void *d1, void *d2);
-static int _wheel_binding_sort_cb(void *d1, void *d2);
+static int _mouse_binding_sort_cb(const void *d1, const void *d2);
+static int _wheel_binding_sort_cb(const void *d1, const void *d2);
 
 /********* grab window **********/
 static void _grab_wnd_show(E_Config_Dialog_Data *cfdata);
@@ -1240,9 +1240,9 @@ _helper_modifier_name_get(int mod)
 
 /********* Sorting ***************/
 static int
-_mouse_binding_sort_cb(void *d1, void *d2)
+_mouse_binding_sort_cb(const void *d1, const void *d2)
 {
-   E_Config_Binding_Mouse *eb, *eb2;
+   const E_Config_Binding_Mouse *eb, *eb2;
 
    eb = d1;
    eb2 = d2;
@@ -1258,9 +1258,9 @@ _mouse_binding_sort_cb(void *d1, void *d2)
 }
 
 static int
-_wheel_binding_sort_cb(void *d1, void *d2)
+_wheel_binding_sort_cb(const void *d1, const void *d2)
 {
-   E_Config_Binding_Wheel *bw, *bw2;
+   const E_Config_Binding_Wheel *bw, *bw2;
 
    bw = d1;
    bw2 = d2;

src/modules/conf_theme/e_int_config_theme.c

@@ -448,7 +448,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
  */
 
 static int
-_cb_sort(void *data1, void *data2)
+_cb_sort(const void *data1, const void *data2)
 {
    const char *d1, *d2;
 

src/modules/conf_window_remembers/e_int_config_remembers.c

@@ -35,10 +35,10 @@ e_int_config_remembers(E_Container *con, const char *params __UNUSED__)
 
 /* private functions */
 static int
-_cb_sort(void *data1, void *data2)
+_cb_sort(const void *data1, const void *data2)
 {
-   E_Remember *rem1 = NULL;
-   E_Remember *rem2 = NULL;
+   const E_Remember *rem1 = NULL;
+   const E_Remember *rem2 = NULL;
    const char *d1, *d2;
 
    if (!(rem1 = data1)) return 1;

src/modules/cpufreq/e_mod_main.c

@@ -52,7 +52,7 @@ static Status *_cpufreq_status_new();
 static void _cpufreq_status_free(Status *s);
 static int _cpufreq_status_check_available(Status *s);
 static int _cpufreq_status_check_current(Status *s);
-static int _cpufreq_cb_sort(void *item1, void *item2);
+static int _cpufreq_cb_sort(const void *item1, const void *item2);
 static void _cpufreq_face_update_available(Instance *inst);
 static void _cpufreq_face_update_current(Instance *inst);
 static void _cpufreq_face_cb_set_frequency(void *data, Evas_Object *o, const char *emission, const char *source);
@@ -446,7 +446,7 @@ _cpufreq_status_free(Status *s)
 }
 
 static int
-_cpufreq_cb_sort(void *item1, void *item2)
+_cpufreq_cb_sort(const void *item1, const void *item2)
 {
    int a, b;
 
@@ -567,7 +567,7 @@ _cpufreq_status_check_available(Status *s)
 
 	s->governors = eina_list_sort(s->governors,
 				      eina_list_count(s->governors),
-				      (int (*)(void *, void *))strcmp);
+				      (int (*)(const void *, const void *))strcmp);
      }
 #endif
    return 1;

src/modules/exebuf/e_exebuf.c

@@ -32,8 +32,8 @@ struct _E_Exe_List
 
 static void _e_exebuf_exe_free(E_Exebuf_Exe *exe);
 static void _e_exebuf_matches_clear(void);
-static int _e_exebuf_cb_sort_eap(void *data1, void *data2);
-static int _e_exebuf_cb_sort_exe(void *data1, void *data2);
+static int _e_exebuf_cb_sort_eap(const void *data1, const void *data2);
+static int _e_exebuf_cb_sort_exe(const void *data1, const void *data2);
 static void _e_exebuf_update(void);
 static void _e_exebuf_exec(void);
 static void _e_exebuf_exec_term(void);
@@ -847,9 +847,9 @@ _e_exebuf_clear(void)
 }
 
 static int
-_e_exebuf_cb_sort_eap(void *data1, void *data2)
+_e_exebuf_cb_sort_eap(const void *data1, const void *data2)
 {
-   Efreet_Desktop *a1, *a2;
+   const Efreet_Desktop *a1, *a2;
    const char *e1, *e2;
    double t1, t2;
    
@@ -863,9 +863,9 @@ _e_exebuf_cb_sort_eap(void *data1, void *data2)
 }
 
 static int
-_e_exebuf_cb_sort_exe(void *data1, void *data2)
+_e_exebuf_cb_sort_exe(const void *data1, const void *data2)
 {
-   char *e1, *e2;
+   const char *e1, *e2;
    double t1, t2;
    
    e1 = data1;

src/modules/fileman/e_fwin.c

@@ -108,7 +108,7 @@ static void _e_fwin_config_set(E_Fwin *fwin);
 static void _e_fwin_window_title_set(E_Fwin *fwin);
 static void _e_fwin_toolbar_resize(E_Fwin *fwin);
 static int _e_fwin_dlg_cb_desk_sort(Efreet_Desktop *d1, Efreet_Desktop *d2);
-static int _e_fwin_dlg_cb_desk_list_sort(void *data1, void *data2);
+static int _e_fwin_dlg_cb_desk_list_sort(const void *data1, const void *data2);
 
 /* local subsystem globals */
 static Eina_List *fwins = NULL;
@@ -1777,9 +1777,9 @@ _e_fwin_dlg_cb_desk_sort(Efreet_Desktop *d1, Efreet_Desktop *d2)
 }
 
 static int 
-_e_fwin_dlg_cb_desk_list_sort(void *data1, void *data2) 
+_e_fwin_dlg_cb_desk_list_sort(const void *data1, const void *data2) 
 {
-   Efreet_Desktop *d1, *d2;
+   const Efreet_Desktop *d1, *d2;
 
    if (!(d1 = data1)) return 1;
    if (!(d2 = data2)) return -1;

src/modules/illume/e_kbd_dict.c

@@ -140,9 +140,9 @@ _e_kbd_dict_normalized_strcpy(char *dst, const char *src)
 }
 
 static int
-_e_kbd_dict_matches_loolup_cb_sort(void *d1, void *d2)
+_e_kbd_dict_matches_loolup_cb_sort(const void *d1, const void *d2)
 {
-   E_Kbd_Dict_Word *kw1, *kw2;
+   const E_Kbd_Dict_Word *kw1, *kw2;
    
    kw1 = d1;
    kw2 = d2;
@@ -152,9 +152,9 @@ _e_kbd_dict_matches_loolup_cb_sort(void *d1, void *d2)
 }
 
 static int
-_e_kbd_dict_writes_cb_sort(void *d1, void *d2)
+_e_kbd_dict_writes_cb_sort(const void *d1, const void *d2)
 {
-   E_Kbd_Dict_Word *kw1, *kw2;
+   const E_Kbd_Dict_Word *kw1, *kw2;
    
    kw1 = d1;
    kw2 = d2;

src/modules/mixer/app_mixer.c

@@ -186,9 +186,9 @@ _cb_channel_selected(void *data)
 }
 
 static int
-_channel_info_cmp(void *data_a, void *data_b)
+_channel_info_cmp(const void *data_a, const void *data_b)
 {
-   struct channel_info *a = data_a, *b = data_b;
+   const struct channel_info *a = data_a, *b = data_b;
 
    if (a->has_capture < b->has_capture)
      return -1;