From 8a186c3588d3598857c36e2122fa68d01eba30fd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 8 May 2011 13:24:42 -0400 Subject: Coding style cleanups. --- e-util/e-alert.c | 4 ++-- e-util/e-config.c | 58 +++++++++++++++++++++++----------------------- e-util/e-datetime-format.c | 2 +- e-util/e-event.c | 24 +++++++++---------- e-util/e-html-utils.c | 16 ++++++------- e-util/e-import.c | 16 ++++++------- e-util/e-plugin.c | 14 +++++------ e-util/e-signature-list.c | 2 +- e-util/e-signature.c | 6 ++--- e-util/e-sorter-array.c | 4 ++-- e-util/e-unicode.c | 10 ++++---- e-util/e-xml-utils.c | 28 +++++++++++----------- e-util/gconf-bridge.c | 4 ++-- 13 files changed, 94 insertions(+), 94 deletions(-) (limited to 'e-util') diff --git a/e-util/e-alert.c b/e-util/e-alert.c index 12a92565a9..1858e338f8 100644 --- a/e-util/e-alert.c +++ b/e-util/e-alert.c @@ -234,12 +234,12 @@ e_alert_load (const gchar *path) for (scan = error->children;scan;scan=scan->next) { if (!strcmp((gchar *)scan->name, "primary")) { - if ((tmp = (gchar *)xmlNodeGetContent (scan))) { + if ((tmp = (gchar *) xmlNodeGetContent (scan))) { e->primary_text = g_strdup (dgettext (table->translation_domain, tmp)); xmlFree (tmp); } } else if (!strcmp((gchar *)scan->name, "secondary")) { - if ((tmp = (gchar *)xmlNodeGetContent (scan))) { + if ((tmp = (gchar *) xmlNodeGetContent (scan))) { e->secondary_text = g_strdup (dgettext (table->translation_domain, tmp)); xmlFree (tmp); } diff --git a/e-util/e-config.c b/e-util/e-config.c index 14765f853b..0f2a13f00b 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -93,7 +93,7 @@ G_DEFINE_TYPE ( static void config_finalize (GObject *object) { - EConfig *emp = (EConfig *)object; + EConfig *emp = (EConfig *) object; EConfigPrivate *p = emp->priv; GList *link; @@ -344,8 +344,8 @@ ec_add_static_items (EConfig *config) static gint ep_cmp (gconstpointer ap, gconstpointer bp) { - struct _widget_node *a = *((gpointer *)ap); - struct _widget_node *b = *((gpointer *)bp); + struct _widget_node *a = *((gpointer *) ap); + struct _widget_node *b = *((gpointer *) bp); return strcmp (a->item->path, b->item->path); } @@ -759,7 +759,7 @@ ec_rebuild (EConfig *emp) } else { wn->frame = page; if (page) - gtk_notebook_reorder_child ((GtkNotebook *)book, page, pageno); + gtk_notebook_reorder_child ((GtkNotebook *) book, page, pageno); } if (page) sectionno = 1; @@ -784,9 +784,9 @@ ec_rebuild (EConfig *emp) w = gtk_label_new_with_mnemonic (translated_label); gtk_widget_show (w); page = gtk_vbox_new (FALSE, 12); - gtk_container_set_border_width ((GtkContainer *)page, 12); + gtk_container_set_border_width ((GtkContainer *) page, 12); gtk_widget_show (page); - gtk_notebook_insert_page ((GtkNotebook *)book, page, w, pageno); + gtk_notebook_insert_page ((GtkNotebook *) book, page, w, pageno); gtk_container_child_set (GTK_CONTAINER (book), page, "tab-fill", FALSE, "tab-expand", FALSE, NULL); wn->frame = page; } @@ -879,8 +879,8 @@ ec_rebuild (EConfig *emp) section = gtk_vbox_new (FALSE, 6); else { section = gtk_table_new (1, 1, FALSE); - gtk_table_set_col_spacings ((GtkTable *)section, 6); - gtk_table_set_row_spacings ((GtkTable *)section, 6); + gtk_table_set_col_spacings ((GtkTable *) section, 6); + gtk_table_set_row_spacings ((GtkTable *) section, 6); } frame = g_object_new (gtk_frame_get_type (), @@ -892,7 +892,7 @@ ec_rebuild (EConfig *emp) "child", section, NULL), NULL); gtk_widget_show_all (frame); - gtk_box_pack_start ((GtkBox *)page, frame, FALSE, FALSE, 0); + gtk_box_pack_start ((GtkBox *) page, frame, FALSE, FALSE, 0); wn->frame = frame; } nopage: @@ -986,9 +986,9 @@ ec_rebuild (EConfig *emp) if (book) { /* make this depend on flags?? */ - if (gtk_notebook_get_n_pages ((GtkNotebook *)book) == 1) { - gtk_notebook_set_show_tabs ((GtkNotebook *)book, FALSE); - gtk_notebook_set_show_border ((GtkNotebook *)book, FALSE); + if (gtk_notebook_get_n_pages ((GtkNotebook *) book) == 1) { + gtk_notebook_set_show_tabs ((GtkNotebook *) book, FALSE); + gtk_notebook_set_show_border ((GtkNotebook *) book, FALSE); } } @@ -1019,7 +1019,7 @@ void e_config_set_target (EConfig *emp, EConfigTarget *target) { if (emp->target != target) - ((EConfigClass *)G_OBJECT_GET_CLASS (emp))->set_target (emp, target); + ((EConfigClass *) G_OBJECT_GET_CLASS (emp))->set_target (emp, target); } static void @@ -1095,7 +1095,7 @@ e_config_create_widget (EConfig *emp) /* FIXME: for some reason ec_rebuild puts the widget on page 1, this is just to override that */ if (emp->type == E_CONFIG_BOOK) - gtk_notebook_set_current_page ((GtkNotebook *)emp->widget, 0); + gtk_notebook_set_current_page ((GtkNotebook *) emp->widget, 0); else { gtk_window_set_position (GTK_WINDOW (emp->widget), GTK_WIN_POS_CENTER); gtk_widget_show (emp->widget); @@ -1151,11 +1151,11 @@ e_config_create_window (EConfig *emp, GtkWindow *parent, const gchar *title) gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (w))), 0); gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (w))), 12); - gtk_box_pack_start ((GtkBox *)gtk_dialog_get_content_area (((GtkDialog *)w)), emp->widget, TRUE, TRUE, 0); + gtk_box_pack_start ((GtkBox *) gtk_dialog_get_content_area (((GtkDialog *) w)), emp->widget, TRUE, TRUE, 0); } else { /* response is handled directly by the assistant stuff */ w = emp->widget; - gtk_window_set_title ((GtkWindow *)w, title); + gtk_window_set_title ((GtkWindow *) w, title); } emp->window = w; @@ -1172,9 +1172,9 @@ ec_call_page_check (EConfig *emp) } else { if (emp->window) { if (e_config_page_check (emp, NULL)) { - gtk_dialog_set_response_sensitive ((GtkDialog *)emp->window, GTK_RESPONSE_OK, TRUE); + gtk_dialog_set_response_sensitive ((GtkDialog *) emp->window, GTK_RESPONSE_OK, TRUE); } else { - gtk_dialog_set_response_sensitive ((GtkDialog *)emp->window, GTK_RESPONSE_OK, FALSE); + gtk_dialog_set_response_sensitive ((GtkDialog *) emp->window, GTK_RESPONSE_OK, FALSE); } } } @@ -1519,7 +1519,7 @@ e_config_target_free (EConfig *ep, gpointer o) { EConfigTarget *t = o; - ((EConfigClass *)G_OBJECT_GET_CLASS (ep))->target_free (ep, t); + ((EConfigClass *) G_OBJECT_GET_CLASS (ep))->target_free (ep, t); } /* ********************************************************************** */ @@ -1634,7 +1634,7 @@ emph_free_item (struct _EConfigItem *item) static void emph_free_group (struct _EConfigHookGroup *group) { - g_slist_foreach (group->items, (GFunc)emph_free_item, NULL); + g_slist_foreach (group->items, (GFunc) emph_free_item, NULL); g_slist_free (group->items); g_free (group->id); @@ -1774,7 +1774,7 @@ emph_construct_menu (EPluginHook *eph, xmlNodePtr root) struct _EConfigHookGroup *menu; xmlNodePtr node; EConfigHookTargetMap *map; - EConfigHookClass *class = (EConfigHookClass *)G_OBJECT_GET_CLASS (eph); + EConfigHookClass *class = (EConfigHookClass *) G_OBJECT_GET_CLASS (eph); gchar *tmp; d(printf(" loading menu\n")); @@ -1792,13 +1792,13 @@ emph_construct_menu (EPluginHook *eph, xmlNodePtr root) menu->id = e_plugin_xml_prop(root, "id"); if (menu->id == NULL) { g_warning("Plugin '%s' missing 'id' field in group for '%s'\n", eph->plugin->name, - ((EPluginHookClass *)G_OBJECT_GET_CLASS (eph))->id); + ((EPluginHookClass *) G_OBJECT_GET_CLASS (eph))->id); goto error; } menu->check = e_plugin_xml_prop(root, "check"); menu->commit = e_plugin_xml_prop(root, "commit"); menu->abort = e_plugin_xml_prop(root, "abort"); - menu->hook = (EConfigHook *)eph; + menu->hook = (EConfigHook *) eph; node = root->children; while (node) { if (0 == strcmp((gchar *)node->name, "item")) { @@ -1825,10 +1825,10 @@ emph_construct (EPluginHook *eph, EPlugin *ep, xmlNodePtr root) d(printf("loading config hook\n")); - if (((EPluginHookClass *)e_config_hook_parent_class)->construct (eph, ep, root) == -1) + if (((EPluginHookClass *) e_config_hook_parent_class)->construct (eph, ep, root) == -1) return -1; - class = ((EConfigHookClass *)G_OBJECT_GET_CLASS (eph))->config_class; + class = ((EConfigHookClass *) G_OBJECT_GET_CLASS (eph))->config_class; node = root->children; while (node) { @@ -1852,12 +1852,12 @@ emph_construct (EPluginHook *eph, EPlugin *ep, xmlNodePtr root) static void emph_finalize (GObject *o) { - EPluginHook *eph = (EPluginHook *)o; + EPluginHook *eph = (EPluginHook *) o; - g_slist_foreach (emph->groups, (GFunc)emph_free_group, NULL); + g_slist_foreach (emph->groups, (GFunc) emph_free_group, NULL); g_slist_free (emph->groups); - ((GObjectClass *)e_config_hook_parent_class)->finalize (o); + ((GObjectClass *) e_config_hook_parent_class)->finalize (o); } static void @@ -1899,5 +1899,5 @@ void e_config_hook_class_add_target_map (EConfigHookClass *class, const EConfigHookTargetMap *map) { - g_hash_table_insert (class->target_map, (gpointer)map->type, (gpointer)map); + g_hash_table_insert (class->target_map, (gpointer) map->type, (gpointer) map); } diff --git a/e-util/e-datetime-format.c b/e-util/e-datetime-format.c index df6ee06ea0..3748a470e0 100644 --- a/e-util/e-datetime-format.c +++ b/e-util/e-datetime-format.c @@ -560,7 +560,7 @@ e_datetime_format_add_setup_widget (GtkWidget *table, gint row, const gchar *com g_object_unref (store); fill_combo_formats (combo, key, kind); - gtk_label_set_mnemonic_widget ((GtkLabel *)label, combo); + gtk_label_set_mnemonic_widget ((GtkLabel *) label, combo); align = gtk_alignment_new (0.0, 0.5, 0.0, 0.0); gtk_container_add (GTK_CONTAINER (align), combo); diff --git a/e-util/e-event.c b/e-util/e-event.c index 10ea83b30b..4611995c91 100644 --- a/e-util/e-event.c +++ b/e-util/e-event.c @@ -59,7 +59,7 @@ G_DEFINE_TYPE ( static void event_finalize (GObject *object) { - EEvent *event = (EEvent *)object; + EEvent *event = (EEvent *) object; EEventPrivate *p = event->priv; if (event->target) @@ -78,7 +78,7 @@ event_finalize (GObject *object) g_free (node); } - g_slist_foreach (p->sorted, (GFunc)g_free, NULL); + g_slist_foreach (p->sorted, (GFunc) g_free, NULL); g_slist_free (p->sorted); /* Chain up to parent's finalize() method. */ @@ -158,12 +158,12 @@ e_event_add_items (EEvent *event, g_queue_push_tail (&event->priv->events, node); if (event->priv->sorted) { - g_slist_foreach (event->priv->sorted, (GFunc)g_free, NULL); + g_slist_foreach (event->priv->sorted, (GFunc) g_free, NULL); g_slist_free (event->priv->sorted); event->priv->sorted = NULL; } - return (gpointer)node; + return (gpointer) node; } /** @@ -186,7 +186,7 @@ e_event_remove_items (EEvent *event, gpointer handle) g_free (node); if (event->priv->sorted) { - g_slist_foreach (event->priv->sorted, (GFunc)g_free, NULL); + g_slist_foreach (event->priv->sorted, (GFunc) g_free, NULL); g_slist_free (event->priv->sorted); event->priv->sorted = NULL; } @@ -195,8 +195,8 @@ e_event_remove_items (EEvent *event, gpointer handle) static gint ee_cmp (gconstpointer ap, gconstpointer bp) { - gint a = ((struct _event_info **)ap)[0]->item->priority; - gint b = ((struct _event_info **)bp)[0]->item->priority; + gint a = ((struct _event_info **) ap)[0]->item->priority; + gint b = ((struct _event_info **) bp)[0]->item->priority; if (a < b) return 1; @@ -387,13 +387,13 @@ emph_event_handle (EEvent *ee, EEventItem *item, gpointer data) return; e_plugin_invoke ( - hook->hook.plugin, (gchar *)item->user_data, ee->target); + hook->hook.plugin, (gchar *) item->user_data, ee->target); } static void emph_free_item (EEventItem *item) { - g_free ((gchar *)item->id); + g_free ((gchar *) item->id); g_free (item->user_data); g_free (item); } @@ -403,7 +403,7 @@ emph_free_items (EEvent *ee, GSList *items, gpointer data) { /*EPluginHook *eph = data;*/ - g_slist_foreach (items, (GFunc)emph_free_item, NULL); + g_slist_foreach (items, (GFunc) emph_free_item, NULL); g_slist_free (items); } @@ -452,7 +452,7 @@ emph_construct (EPluginHook *eph, EPlugin *ep, xmlNodePtr root) d(printf("loading event hook\n")); - if (((EPluginHookClass *)e_event_hook_parent_class)-> + if (((EPluginHookClass *) e_event_hook_parent_class)-> construct (eph, ep, root) == -1) return -1; @@ -510,5 +510,5 @@ void e_event_hook_class_add_target_map (EEventHookClass *class, const EEventHookTargetMap *map) { g_hash_table_insert ( - class->target_map, (gpointer)map->type, (gpointer)map); + class->target_map, (gpointer) map->type, (gpointer) map); } diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c index 087ac7a162..ceac32ffc6 100644 --- a/e-util/e-html-utils.c +++ b/e-util/e-html-utils.c @@ -130,7 +130,7 @@ email_address_extract (const guchar **cur, gchar **out, const guchar *linestart) if (dot > end) return NULL; - addr = g_strndup ((gchar *)start, end - start); + addr = g_strndup ((gchar *) start, end - start); *out -= *cur - start; *cur = end; @@ -158,7 +158,7 @@ is_citation (const guchar *c, gboolean saw_citation) return TRUE; /* Same if the next line is */ - p = (const guchar *)strchr ((const gchar *)c, '\n'); + p = (const guchar *) strchr ((const gchar *) c, '\n'); if (p && *++p == '>') return TRUE; @@ -233,7 +233,7 @@ e_text_to_html_full (const gchar *input, guint flags, guint32 color) col = 0; - for (cur = linestart = (const guchar *)input; cur && *cur; cur = next) { + for (cur = linestart = (const guchar *) input; cur && *cur; cur = next) { gunichar u; if (flags & E_TEXT_TO_HTML_MARK_CITATION && col == 0) { @@ -264,7 +264,7 @@ e_text_to_html_full (const gchar *input, guint flags, guint32 color) out += sprintf (out, "> "); } - u = g_utf8_get_char ((gchar *)cur); + u = g_utf8_get_char ((gchar *) cur); if (g_unichar_isalpha (u) && (flags & E_TEXT_TO_HTML_CONVERT_URLS)) { gchar *tmpurl = NULL, *refurl = NULL, *dispurl = NULL; @@ -310,7 +310,7 @@ e_text_to_html_full (const gchar *input, guint flags, guint32 color) if (!*cur) break; - u = g_utf8_get_char ((gchar *)cur); + u = g_utf8_get_char ((gchar *) cur); } if (u == '@' && (flags & E_TEXT_TO_HTML_CONVERT_ADDRESSES)) { @@ -330,7 +330,7 @@ e_text_to_html_full (const gchar *input, guint flags, guint32 color) if (!*cur) break; - u = g_utf8_get_char ((gchar *)cur); + u = g_utf8_get_char ((gchar *) cur); } } @@ -341,7 +341,7 @@ e_text_to_html_full (const gchar *input, guint flags, guint32 color) u = *cur; next = cur + 1; } else - next = (const guchar *)g_utf8_next_char (cur); + next = (const guchar *) g_utf8_next_char (cur); out = check_size (&buffer, &buffer_size, out, 10); @@ -396,7 +396,7 @@ e_text_to_html_full (const gchar *input, guint flags, guint32 color) case ' ': if (flags & E_TEXT_TO_HTML_CONVERT_SPACES) { - if (cur == (const guchar *)input || + if (cur == (const guchar *) input || *(cur + 1) == ' ' || *(cur + 1) == '\t' || *(cur - 1) == '\n') { strcpy (out, " "); diff --git a/e-util/e-import.c b/e-util/e-import.c index ac41024e73..b5fbe27f68 100644 --- a/e-util/e-import.c +++ b/e-util/e-import.c @@ -355,7 +355,7 @@ e_import_target_free (EImport *ep, gpointer o) { EImportTarget *t = o; - ((EImportClass *)G_OBJECT_GET_CLASS (ep))->target_free (ep, t); + ((EImportClass *) G_OBJECT_GET_CLASS (ep))->target_free (ep, t); } EImportTargetURI * @@ -428,7 +428,7 @@ eih_supported (EImport *ei, EImportTarget *target, EImportImporter *im) { - struct _EImportHookImporter *ihook = (EImportHookImporter *)im; + struct _EImportHookImporter *ihook = (EImportHookImporter *) im; EImportHook *hook = im->user_data; return e_plugin_invoke (hook->hook.plugin, ihook->supported, target) != NULL; @@ -439,7 +439,7 @@ eih_get_widget (EImport *ei, EImportTarget *target, EImportImporter *im) { - struct _EImportHookImporter *ihook = (EImportHookImporter *)im; + struct _EImportHookImporter *ihook = (EImportHookImporter *) im; EImportHook *hook = im->user_data; return e_plugin_invoke (hook->hook.plugin, ihook->get_widget, target); @@ -450,7 +450,7 @@ eih_import (EImport *ei, EImportTarget *target, EImportImporter *im) { - struct _EImportHookImporter *ihook = (EImportHookImporter *)im; + struct _EImportHookImporter *ihook = (EImportHookImporter *) im; EImportHook *hook = im->user_data; e_plugin_invoke (hook->hook.plugin, ihook->import, target); @@ -461,7 +461,7 @@ eih_cancel (EImport *ei, EImportTarget *target, EImportImporter *im) { - struct _EImportHookImporter *ihook = (EImportHookImporter *)im; + struct _EImportHookImporter *ihook = (EImportHookImporter *) im; EImportHook *hook = im->user_data; e_plugin_invoke (hook->hook.plugin, ihook->cancel, target); @@ -470,7 +470,7 @@ eih_cancel (EImport *ei, static void eih_free_importer (EImportImporter *im, gpointer data) { - EImportHookImporter *ihook = (EImportHookImporter *)im; + EImportHookImporter *ihook = (EImportHookImporter *) im; g_free (ihook->supported); g_free (ihook->get_widget); @@ -483,7 +483,7 @@ emph_construct_importer (EPluginHook *eph, xmlNodePtr root) { struct _EImportHookImporter *item; EImportHookTargetMap *map; - EImportHookClass *class = (EImportHookClass *)G_OBJECT_GET_CLASS (eph); + EImportHookClass *class = (EImportHookClass *) G_OBJECT_GET_CLASS (eph); gchar *tmp; d (printf (" loading import item\n")); @@ -521,7 +521,7 @@ emph_construct_importer (EPluginHook *eph, xmlNodePtr root) return item; error: d (printf ("error!\n")); - eih_free_importer ((EImportImporter *)item, NULL); + eih_free_importer ((EImportImporter *) item, NULL); return NULL; } diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index fa7f0d9d88..17e4b50102 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -576,7 +576,7 @@ e_plugin_load_plugins (void) static void ep_list_plugin (gpointer key, gpointer val, gpointer dat) { - GSList **l = (GSList **)dat; + GSList **l = (GSList **) dat; *l = g_slist_prepend(*l, g_object_ref(val)); } @@ -770,7 +770,7 @@ e_plugin_xml_prop_domain (xmlNodePtr node, const gchar *id, const gchar *domain) { gchar *p, *out; - p = (gchar *)xmlGetProp (node, (const guchar *)id); + p = (gchar *) xmlGetProp (node, (const guchar *) id); if (p == NULL) return NULL; @@ -796,7 +796,7 @@ e_plugin_xml_prop_domain (xmlNodePtr node, const gchar *id, const gchar *domain) gint e_plugin_xml_int (xmlNodePtr node, const gchar *id, gint def) { - gchar *p = (gchar *)xmlGetProp (node, (const guchar *)id); + gchar *p = (gchar *) xmlGetProp (node, (const guchar *) id); if (p) return atoi (p); @@ -817,7 +817,7 @@ e_plugin_xml_int (xmlNodePtr node, const gchar *id, gint def) gchar * e_plugin_xml_content (xmlNodePtr node) { - gchar *p = (gchar *)xmlNodeGetContent (node); + gchar *p = (gchar *) xmlNodeGetContent (node); if (g_mem_is_system_malloc ()) { return p; @@ -846,7 +846,7 @@ e_plugin_xml_content_domain (xmlNodePtr node, const gchar *domain) { gchar *p, *out; - p = (gchar *)xmlNodeGetContent (node); + p = (gchar *) xmlNodeGetContent (node); if (p == NULL) return NULL; @@ -935,7 +935,7 @@ e_plugin_hook_mask (xmlNodePtr root, gchar *val, *p, *start, c; guint32 mask = 0; - val = (gchar *)xmlGetProp (root, (const guchar *)prop); + val = (gchar *) xmlGetProp (root, (const guchar *) prop); if (val == NULL) return 0; @@ -988,7 +988,7 @@ e_plugin_hook_id (xmlNodePtr root, gchar *val; gint i; - val = (gchar *)xmlGetProp (root, (const guchar *)prop); + val = (gchar *) xmlGetProp (root, (const guchar *) prop); if (val == NULL) return ~0; diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c index f089b22d75..bb2029a32f 100644 --- a/e-util/e-signature-list.c +++ b/e-util/e-signature-list.c @@ -240,7 +240,7 @@ gconf_signatures_changed (GConfClient *client, static gpointer copy_func (gconstpointer data, gpointer closure) { - GObject *object = (GObject *)data; + GObject *object = (GObject *) data; g_object_ref (object); diff --git a/e-util/e-signature.c b/e-util/e-signature.c index a7ab2519ef..434ba1c4b4 100644 --- a/e-util/e-signature.c +++ b/e-util/e-signature.c @@ -69,7 +69,7 @@ xml_set_bool (xmlNodePtr node, gboolean v_boolean; gchar *buf; - if ((buf = (gchar *)xmlGetProp (node, (xmlChar *) name))) { + if ((buf = (gchar *) xmlGetProp (node, (xmlChar *) name))) { v_boolean = (!strcmp (buf, "true") || !strcmp (buf, "yes")); xmlFree (buf); @@ -89,7 +89,7 @@ xml_set_prop (xmlNodePtr node, { gchar *buf, *new_val; - buf = (gchar *)xmlGetProp (node, (xmlChar *) name); + buf = (gchar *) xmlGetProp (node, (xmlChar *) name); new_val = g_strdup (buf); xmlFree (buf); @@ -112,7 +112,7 @@ xml_set_content (xmlNodePtr node, { gchar *buf, *new_val; - buf = (gchar *)xmlNodeGetContent (node); + buf = (gchar *) xmlNodeGetContent (node); new_val = g_strdup (buf); xmlFree (buf); diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c index 2630a6608f..21d3838d96 100644 --- a/e-util/e-sorter-array.c +++ b/e-util/e-sorter-array.c @@ -59,8 +59,8 @@ esort_callback (gconstpointer data1, gconstpointer data2, gpointer user_data) gint ret_val; gint int1, int2; - int1 = *(gint *)data1; - int2 = *(gint *)data2; + int1 = *(gint *) data1; + int2 = *(gint *) data2; ret_val = esa->compare (int1, int2, esa->cmp_cache, esa->closure); if (ret_val != 0) diff --git a/e-util/e-unicode.c b/e-util/e-unicode.c index 0fc5a8b5da..a287cd8236 100644 --- a/e-util/e-unicode.c +++ b/e-util/e-unicode.c @@ -83,7 +83,7 @@ e_utf8_from_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) gint i; /* iso-8859-1 */ ib = (gchar *) string; - new = ob = (gchar *)g_new (unsigned char, bytes * 2 + 1); + new = ob = (gchar *) g_new (unsigned char, bytes * 2 + 1); for (i = 0; i < (bytes); i++) { ob += e_unichar_to_utf8 (ib[i], ob); } @@ -135,7 +135,7 @@ e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) const gchar *u; gunichar uc; - new = (gchar *)g_new (unsigned char, bytes * 4 + 1); + new = (gchar *) g_new (unsigned char, bytes * 4 + 1); u = string; len = 0; @@ -324,15 +324,15 @@ e_xml_get_translated_utf8_string_prop_by_name (const xmlNode *parent, prop = xmlGetProp ((xmlNode *) parent, prop_name); if (prop != NULL) { - ret_val = g_strdup ((gchar *)prop); + ret_val = g_strdup ((gchar *) prop); xmlFree (prop); return ret_val; } combined_name = g_strdup_printf("_%s", prop_name); - prop = xmlGetProp ((xmlNode *) parent, (guchar *)combined_name); + prop = xmlGetProp ((xmlNode *) parent, (guchar *) combined_name); if (prop != NULL) { - ret_val = g_strdup (gettext ((gchar *)prop)); + ret_val = g_strdup (gettext ((gchar *) prop)); xmlFree (prop); } g_free (combined_name); diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c index f67cd514bd..443f59fea9 100644 --- a/e-util/e-xml-utils.c +++ b/e-util/e-xml-utils.c @@ -79,7 +79,7 @@ e_xml_get_child_by_name_by_lang (const xmlNode *parent, child, (const guchar *)"lang"); if (this_lang == NULL) { C = child; - } else if (xmlStrcmp (this_lang, (xmlChar *)lang) == 0) { + } else if (xmlStrcmp (this_lang, (xmlChar *) lang) == 0) { #ifdef G_OS_WIN32 g_free (freeme); #endif @@ -104,7 +104,7 @@ e_xml_get_child_by_name_by_lang_list_with_score (const xmlNode *parent, for (node = parent->xmlChildrenNode; node != NULL; node = node->next) { xmlChar *lang; - if (node->name == NULL || strcmp ((gchar *)node->name, name) != 0) { + if (node->name == NULL || strcmp ((gchar *) node->name, name) != 0) { continue; } lang = xmlGetProp (node, (const guchar *)"xml:lang"); @@ -115,7 +115,7 @@ e_xml_get_child_by_name_by_lang_list_with_score (const xmlNode *parent, for (l = lang_list, i = 0; l != NULL && i < *best_lang_score; l = l->next, i++) { - if (strcmp ((gchar *) l->data, (gchar *)lang) == 0) { + if (strcmp ((gchar *) l->data, (gchar *) lang) == 0) { best_node = node; *best_lang_score = i; } @@ -150,7 +150,7 @@ e_xml_get_child_by_name_by_lang_list (const xmlNode *parent, language_names = g_get_language_names (); while (*language_names != NULL) lang_list = g_list_append ( - (GList *)lang_list, (gchar *)*language_names++); + (GList *) lang_list, (gchar *)*language_names++); } return e_xml_get_child_by_name_by_lang_list_with_score (parent,name, @@ -170,7 +170,7 @@ e_xml_get_child_by_name_no_lang (const xmlNode *parent, for (node = parent->xmlChildrenNode; node != NULL; node = node->next) { xmlChar *lang; - if (node->name == NULL || strcmp ((gchar *)node->name, name) != 0) { + if (node->name == NULL || strcmp ((gchar *) node->name, name) != 0) { continue; } lang = xmlGetProp (node, (const guchar *)"xml:lang"); @@ -223,7 +223,7 @@ e_xml_set_integer_prop_by_name (xmlNode *parent, g_return_if_fail (prop_name != NULL); valuestr = g_strdup_printf ("%d", value); - xmlSetProp (parent, prop_name, (guchar *)valuestr); + xmlSetProp (parent, prop_name, (guchar *) valuestr); g_free (valuestr); } @@ -267,7 +267,7 @@ e_xml_set_uint_prop_by_name (xmlNode *parent, g_return_if_fail (prop_name != NULL); valuestr = g_strdup_printf ("%u", value); - xmlSetProp (parent, prop_name, (guchar *)valuestr); + xmlSetProp (parent, prop_name, (guchar *) valuestr); g_free (valuestr); } @@ -344,7 +344,7 @@ e_xml_get_double_prop_by_name_with_default (const xmlNode *parent, prop = xmlGetProp ((xmlNode *) parent, prop_name); if (prop != NULL) { - ret_val = e_flexible_strtod ((gchar *)prop, NULL); + ret_val = e_flexible_strtod ((gchar *) prop, NULL); xmlFree (prop); } return ret_val; @@ -369,7 +369,7 @@ e_xml_set_double_prop_by_name (xmlNode *parent, e_ascii_dtostr (buffer, sizeof (buffer), format, value); g_free (format); - xmlSetProp (parent, prop_name, (const guchar *)buffer); + xmlSetProp (parent, prop_name, (const guchar *) buffer); } gchar * @@ -394,7 +394,7 @@ e_xml_get_string_prop_by_name_with_default (const xmlNode *parent, prop = xmlGetProp ((xmlNode *) parent, prop_name); if (prop != NULL) { - ret_val = g_strdup ((gchar *)prop); + ret_val = g_strdup ((gchar *) prop); xmlFree (prop); } else { ret_val = g_strdup (def); @@ -411,7 +411,7 @@ e_xml_set_string_prop_by_name (xmlNode *parent, g_return_if_fail (prop_name != NULL); if (value != NULL) { - xmlSetProp (parent, prop_name, (guchar *)value); + xmlSetProp (parent, prop_name, (guchar *) value); } } @@ -428,15 +428,15 @@ e_xml_get_translated_string_prop_by_name (const xmlNode *parent, prop = xmlGetProp ((xmlNode *) parent, prop_name); if (prop != NULL) { - ret_val = g_strdup ((gchar *)prop); + ret_val = g_strdup ((gchar *) prop); xmlFree (prop); return ret_val; } combined_name = g_strdup_printf("_%s", prop_name); - prop = xmlGetProp ((xmlNode *) parent, (guchar *)combined_name); + prop = xmlGetProp ((xmlNode *) parent, (guchar *) combined_name); if (prop != NULL) { - ret_val = g_strdup (gettext ((gchar *)prop)); + ret_val = g_strdup (gettext ((gchar *) prop)); xmlFree (prop); } g_free (combined_name); diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c index ee2f33e231..2207cab22d 100644 --- a/e-util/gconf-bridge.c +++ b/e-util/gconf-bridge.c @@ -588,7 +588,7 @@ gconf_bridge_block_property_bindings (GConfBridge *bridge, g_hash_table_foreach ( bridge->bindings, (GHFunc) - prop_binding_block_cb, (gpointer)key); + prop_binding_block_cb, (gpointer) key); } void @@ -600,7 +600,7 @@ gconf_bridge_unblock_property_bindings (GConfBridge *bridge, g_hash_table_foreach ( bridge->bindings, (GHFunc) - prop_binding_unblock_cb, (gpointer)key); + prop_binding_unblock_cb, (gpointer) key); } /* Unbinds a property binding */ -- cgit v1.2.3