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. --- widgets/misc/e-buffer-tagger.c | 4 ++-- widgets/misc/e-image-chooser.c | 8 ++++---- widgets/misc/e-import-assistant.c | 10 +++++----- widgets/misc/e-searching-tokenizer.c | 12 ++++++------ widgets/misc/e-send-options.c | 2 +- widgets/misc/ea-calendar-item.c | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) (limited to 'widgets/misc') diff --git a/widgets/misc/e-buffer-tagger.c b/widgets/misc/e-buffer-tagger.c index cc2444d607..c6ddd99e0e 100644 --- a/widgets/misc/e-buffer-tagger.c +++ b/widgets/misc/e-buffer-tagger.c @@ -424,7 +424,7 @@ textview_event_after (GtkTextView *textview, GdkEvent *ev) g_return_val_if_fail (GTK_IS_TEXT_VIEW (textview), FALSE); if (ev->type == GDK_KEY_PRESS || ev->type == GDK_KEY_RELEASE) { - GdkEventKey *event_key = (GdkEventKey *)ev; + GdkEventKey *event_key = (GdkEventKey *) ev; switch (event_key->keyval) { case GDK_KEY_Control_L: @@ -448,7 +448,7 @@ textview_event_after (GtkTextView *textview, GdkEvent *ev) if (ev->type != GDK_BUTTON_RELEASE) return FALSE; - event = (GdkEventButton *)ev; + event = (GdkEventButton *) ev; if (event->button != 1 || (event->state & GDK_CONTROL_MASK) == 0) return FALSE; diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index 3e9a976c18..e21d1c6c67 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -96,15 +96,15 @@ set_image_from_data (EImageChooser *chooser, || chooser->priv->image_width < new_width) { /* we need to scale down */ if (new_height > new_width) - scale = (gfloat)chooser->priv->image_height / new_height; + scale = (gfloat) chooser->priv->image_height / new_height; else - scale = (gfloat)chooser->priv->image_width / new_width; + scale = (gfloat) chooser->priv->image_width / new_width; } else { /* we need to scale up */ if (new_height > new_width) - scale = (gfloat)new_height / chooser->priv->image_height; + scale = (gfloat) new_height / chooser->priv->image_height; else - scale = (gfloat)new_width / chooser->priv->image_width; + scale = (gfloat) new_width / chooser->priv->image_width; } if (scale == 1.0) { diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c index 99c49ea32e..a87f7ce040 100644 --- a/widgets/misc/e-import-assistant.c +++ b/widgets/misc/e-import-assistant.c @@ -669,7 +669,7 @@ prepare_file_page (GtkAssistant *assistant, } page->target = e_import_target_new_uri (priv->import, NULL, NULL); - importers = e_import_get_importers (priv->import, (EImportTarget *)page->target); + importers = e_import_get_importers (priv->import, (EImportTarget *) page->target); store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (page->filetype))); gtk_list_store_clear (store); @@ -777,7 +777,7 @@ prepare_progress_page (GtkAssistant *assistant, if (is_simple) { priv->import_importer = priv->simple_page.importer; - priv->import_target = (EImportTarget *)priv->simple_page.target; + priv->import_target = (EImportTarget *) priv->simple_page.target; done = import_simple_done; } else if (intelligent_import) { page->current = page->importers; @@ -789,7 +789,7 @@ prepare_progress_page (GtkAssistant *assistant, } else { if (priv->file_page.importer) { priv->import_importer = priv->file_page.importer; - priv->import_target = (EImportTarget *)priv->file_page.target; + priv->import_target = (EImportTarget *) priv->file_page.target; done = import_done; } } @@ -868,7 +868,7 @@ prepare_simple_page (GtkAssistant *assistant, GtkWidget *vbox) uri = g_ptr_array_remove_index (priv->fileuris, 0); page->target = e_import_target_new_uri (priv->import, uri, NULL); g_free (uri); - importers = e_import_get_importers (priv->import, (EImportTarget *)page->target); + importers = e_import_get_importers (priv->import, (EImportTarget *) page->target); store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (page->filetype))); gtk_list_store_clear (store); @@ -908,7 +908,7 @@ prepare_simple_page (GtkAssistant *assistant, GtkWidget *vbox) title = g_strconcat ( _("Import Data"), " - ", - ((EImportImporter *)importers->data)->name, NULL); + ((EImportImporter *) importers->data)->name, NULL); gtk_assistant_set_page_title (assistant, vbox, title); g_free (title); } else { diff --git a/widgets/misc/e-searching-tokenizer.c b/widgets/misc/e-searching-tokenizer.c index 3e7cb7f1dd..0955779534 100644 --- a/widgets/misc/e-searching-tokenizer.c +++ b/widgets/misc/e-searching-tokenizer.c @@ -667,7 +667,7 @@ searcher_next_token (struct _searcher *s) while (g_queue_is_empty (&s->output)) { /* get next token */ - tok = (guchar *)s->next_token (s->next_data); + tok = (guchar *) s->next_token (s->next_data); if (tok == NULL) { output_subpending (s); output_pending (s); @@ -675,15 +675,15 @@ searcher_next_token (struct _searcher *s) } /* we dont always have to copy each token, e.g. if we dont match anything */ - token = append_token (&s->input, (gchar *)tok, -1); + token = append_token (&s->input, (gchar *) tok, -1); token->offset = s->offset; - tok = (guchar *)token->tok; + tok = (guchar *) token->tok; d (printf("new token %d '%s'\n", token->offset, token->tok[0]==TAG_ESCAPE?token->tok+1:token->tok)); /* tag test, reset state on unknown tags */ if (tok[0] == TAG_ESCAPE) { - if (!ignore_tag ((gchar *)tok)) { + if (!ignore_tag ((gchar *) tok)) { /* force reset */ output_subpending (s); output_pending (s); @@ -832,7 +832,7 @@ search_info_add_string (struct _search_info *si, const gchar *s) } /* should probably also strip trailing, but i'm lazy today */ if (start[0]) - g_ptr_array_add (si->strv, g_strdup ((gchar *)start)); + g_ptr_array_add (si->strv, g_strdup ((gchar *) start)); } } @@ -895,7 +895,7 @@ search_info_to_searcher (struct _search_info *si) tage = g_alloca (20); sprintf(tage, "%c", TAG_ESCAPE); - return searcher_new (si->flags, si->strv->len, (guchar **)si->strv->pdata, tags, tage); + return searcher_new (si->flags, si->strv->len, (guchar **) si->strv->pdata, tags, tage); } /* ********************************************************************** */ diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c index 563195d645..9a916fbf0b 100644 --- a/widgets/misc/e-send-options.c +++ b/widgets/misc/e-send-options.c @@ -656,7 +656,7 @@ e_send_options_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type e_send_options_fill_widgets_with_data (sod); sensitize_widgets (sod); init_widgets (sod); - gtk_window_set_modal ((GtkWindow *)priv->main, TRUE); + gtk_window_set_modal ((GtkWindow *) priv->main, TRUE); gtk_widget_show (priv->main); diff --git a/widgets/misc/ea-calendar-item.c b/widgets/misc/ea-calendar-item.c index 6179d45551..80eec98409 100644 --- a/widgets/misc/ea-calendar-item.c +++ b/widgets/misc/ea-calendar-item.c @@ -439,7 +439,7 @@ ea_calendar_item_ref_child (AtkObject *accessible, gint index) #ifdef ACC_DEBUG g_print ("AccDebug: ea_calendar_item children[%d]=%p\n", index, - (gpointer)cell); + (gpointer) cell); #endif return g_object_ref (atk_gobject_accessible_for_object (G_OBJECT (cell))); } @@ -1306,7 +1306,7 @@ ea_calendar_set_focus_object (EaCalendarItem *ea_calitem, AtkObject *item_cell) AtkStateSet *state_set, *old_state_set; AtkObject *old_cell; - old_cell = (AtkObject *)g_object_get_data ( + old_cell = (AtkObject *) g_object_get_data ( G_OBJECT(ea_calitem), "gail-focus-object"); if (old_cell && EA_IS_CALENDAR_CELL (old_cell)) { old_state_set = atk_object_ref_state_set (old_cell); -- cgit v1.2.3