GNOME.org
 

[gnome-commander/gcmd-1-3] noop: code cleanup

commit b259bbd65eb1991d76d95f8693721b21dadc84e7
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Thu Oct 22 22:46:30 2009 +0200

    noop: code cleanup

 src/dialogs/gnome-cmd-manage-profiles-dialog.cc |    2 +-
 src/gnome-cmd-key-shortcuts-dialog.cc           |    2 +-
 src/intviewer/bm_byte.cc                        |    4 ++--
 src/intviewer/bm_chartype.cc                    |    6 +++---
 src/intviewer/datapresentation.cc               |    2 +-
 src/intviewer/image-render.cc                   |    2 +-
 src/intviewer/inputmodes.cc                     |    2 +-
 src/intviewer/scroll-box.cc                     |    4 ++--
 src/intviewer/search-dlg.cc                     |   22 +++++++++++-----------
 src/intviewer/search-progress-dlg.cc            |   12 ++++++------
 src/intviewer/searcher.cc                       |   11 +++++------
 src/intviewer/text-render.cc                    |    4 ++--
 src/intviewer/viewer-window.cc                  |    8 ++++----
 src/ls_colors.cc                                |    8 ++++----
 14 files changed, 44 insertions(+), 45 deletions(-)
---
diff --git a/src/dialogs/gnome-cmd-manage-profiles-dialog.cc b/src/dialogs/gnome-cmd-manage-profiles-dialog.cc
index 04647fe..ae6cf95 100644
--- a/src/dialogs/gnome-cmd-manage-profiles-dialog.cc
+++ b/src/dialogs/gnome-cmd-manage-profiles-dialog.cc
@@ -235,7 +235,7 @@ static GtkWidget *create_view_and_model (Profiles &profiles)
 
     col = gnome_cmd_treeview_create_new_text_column (GTK_TREE_VIEW (view), renderer, COL_NAME, _("Profile"));
     gtk_tooltips_set_tip (tips, col->button, _("Profile name"), NULL);
-    g_signal_connect(renderer, "edited", (GCallback) cell_edited_callback, view);
+    g_signal_connect (renderer, "edited", (GCallback) cell_edited_callback, view);
 
     g_object_set (renderer,
                   "editable", TRUE,
diff --git a/src/gnome-cmd-key-shortcuts-dialog.cc b/src/gnome-cmd-key-shortcuts-dialog.cc
index 293375c..f68f02d 100644
--- a/src/gnome-cmd-key-shortcuts-dialog.cc
+++ b/src/gnome-cmd-key-shortcuts-dialog.cc
@@ -359,7 +359,7 @@ inline GtkWidget *create_view_and_model (GnomeCmdUserActions &user_actions)
     col = gnome_cmd_treeview_create_new_text_column (GTK_TREE_VIEW (view), renderer, COL_OPTION, _("Options"));
     gtk_tooltips_set_tip (tips, col->button, _("Optional data"), NULL);
     gtk_tree_view_column_set_sort_column_id (col, SORTID_OPTION);
-    g_signal_connect(renderer, "edited", (GCallback) cell_edited_callback, view);
+    g_signal_connect (renderer, "edited", (GCallback) cell_edited_callback, view);
 
     g_object_set (renderer,
                   "editable", TRUE,
diff --git a/src/intviewer/bm_byte.cc b/src/intviewer/bm_byte.cc
index e784568..5e61751 100644
--- a/src/intviewer/bm_byte.cc
+++ b/src/intviewer/bm_byte.cc
@@ -72,7 +72,7 @@ inline void suffices(guint8 *pattern, int m, /* out */ int *suff)
 
 inline void goodsuff_compute(guint8 *pattern, int m, /*out*/ int *good)
 {
-   int *suff = g_new0(int, m);
+   int *suff = g_new0 (int, m);
 
    suffices(pattern, m, suff);
 
@@ -99,7 +99,7 @@ GViewerBMByteData *create_bm_byte_data(const guint8 *pattern, const gint length)
     GViewerBMByteData *data = g_new0 (GViewerBMByteData, 1);
 
     data->pattern_len = length;
-    data->pattern = g_new(guint8, length);
+    data->pattern = g_new (guint8, length);
     memcpy(data->pattern, pattern, length);
 
     data->bad = g_new0 (int, 256);
diff --git a/src/intviewer/bm_chartype.cc b/src/intviewer/bm_chartype.cc
index de9def5..0a547ab 100644
--- a/src/intviewer/bm_chartype.cc
+++ b/src/intviewer/bm_chartype.cc
@@ -97,7 +97,7 @@ inline void suffices(char_type *pattern, int m, gboolean case_sens, int *suff)
 
 static void goodsuff_compute(char_type *pattern, int m, gboolean case_sens, /*out*/ int *good)
 {
-   int *suff = g_new0(int, m);
+   int *suff = g_new0 (int, m);
    int j;
 
    suffices(pattern, m, case_sens, suff);
@@ -119,7 +119,7 @@ static void goodsuff_compute(char_type *pattern, int m, gboolean case_sens, /*ou
 
 GViewerBMChartypeData *create_bm_chartype_data(const gchar *pattern, gboolean case_sensitive)
 {
-    GViewerBMChartypeData *data = g_new0(GViewerBMChartypeData, 1);
+    GViewerBMChartypeData *data = g_new0 (GViewerBMChartypeData, 1);
 
     data->case_sensitive = case_sensitive;
 
@@ -130,7 +130,7 @@ GViewerBMChartypeData *create_bm_chartype_data(const gchar *pattern, gboolean ca
     data->bad = bch_create();
     bch_compute(data->bad, data->pattern, data->pattern_len, case_sensitive);
 
-    data->good = g_new0(int, data->pattern_len);
+    data->good = g_new0 (int, data->pattern_len);
     goodsuff_compute(data->pattern, data->pattern_len, case_sensitive, data->good);
 
     return data;
diff --git a/src/intviewer/datapresentation.cc b/src/intviewer/datapresentation.cc
index 25b5fb8..a9d5d56 100644
--- a/src/intviewer/datapresentation.cc
+++ b/src/intviewer/datapresentation.cc
@@ -76,7 +76,7 @@ static offset_type binfixed_get_eol(GVDataPresentation *dp, offset_type start_of
 *********************************************************/
 GVDataPresentation *gv_data_presentation_new()
 {
-    return g_new0(GVDataPresentation, 1);
+    return g_new0 (GVDataPresentation, 1);
 }
 
 
diff --git a/src/intviewer/image-render.cc b/src/intviewer/image-render.cc
index 91863c7..69c5822 100644
--- a/src/intviewer/image-render.cc
+++ b/src/intviewer/image-render.cc
@@ -239,7 +239,7 @@ static void image_render_class_init (ImageRenderClass *klass)
 
 static void image_render_init (ImageRender *w)
 {
-    w->priv = g_new0(ImageRenderPrivate, 1);
+    w->priv = g_new0 (ImageRenderPrivate, 1);
 
     w->priv->button = 0;
 
diff --git a/src/intviewer/inputmodes.cc b/src/intviewer/inputmodes.cc
index abd70e9..a89bc60 100644
--- a/src/intviewer/inputmodes.cc
+++ b/src/intviewer/inputmodes.cc
@@ -75,7 +75,7 @@ static void inputmode_utf8_activate(GVInputModesData *imd);
 
 GVInputModesData *gv_input_modes_new()
 {
-    return g_new0(GVInputModesData, 1);
+    return g_new0 (GVInputModesData, 1);
 }
 
 /*
diff --git a/src/intviewer/scroll-box.cc b/src/intviewer/scroll-box.cc
index e7d65d8..4beed68 100644
--- a/src/intviewer/scroll-box.cc
+++ b/src/intviewer/scroll-box.cc
@@ -119,8 +119,8 @@ static void scroll_box_init (ScrollBox *w)
             (GtkAttachOptions) (GTK_FILL), 0, 0);
     w->priv->client = NULL;
 
-    g_signal_connect(w, "button-press-event", G_CALLBACK(scroll_box_button_press), w);
-    g_signal_connect(w, "destroy-event", G_CALLBACK(scroll_box_destroy), w);
+    g_signal_connect (w, "button-press-event", G_CALLBACK (scroll_box_button_press), w);
+    g_signal_connect (w, "destroy-event", G_CALLBACK (scroll_box_destroy), w);
 }
 
 
diff --git a/src/intviewer/search-dlg.cc b/src/intviewer/search-dlg.cc
index c74a17e..4586129 100644
--- a/src/intviewer/search-dlg.cc
+++ b/src/intviewer/search-dlg.cc
@@ -238,17 +238,17 @@ static void search_dlg_init (GViewerSearchDlg *sdlg)
     GtkTable *table;
     GtkWidget *entry;
 
-    sdlg->priv = g_new0(GViewerSearchDlgPrivate, 1);
+    sdlg->priv = g_new0 (GViewerSearchDlgPrivate, 1);
 
     sdlg->priv->searchmode = (SEARCHMODE) gnome_cmd_data.intviewer_defaults.search_mode;
 
-    gtk_window_set_title(GTK_WINDOW (dlg), _("Find"));
-    gtk_window_set_modal(GTK_WINDOW (dlg), TRUE);
-    gtk_dialog_add_button(dlg, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-    gtk_dialog_add_button(dlg, GTK_STOCK_FIND, GTK_RESPONSE_OK);
-    gtk_dialog_set_default_response(dlg, GTK_RESPONSE_OK);
+    gtk_window_set_title (GTK_WINDOW (dlg), _("Find"));
+    gtk_window_set_modal (GTK_WINDOW (dlg), TRUE);
+    gtk_dialog_add_button (dlg, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+    gtk_dialog_add_button (dlg, GTK_STOCK_FIND, GTK_RESPONSE_OK);
+    gtk_dialog_set_default_response (dlg, GTK_RESPONSE_OK);
 
-    g_signal_connect_swapped(GTK_WIDGET (dlg), "response", G_CALLBACK (search_dlg_action_response), sdlg);
+    g_signal_connect_swapped (GTK_WIDGET (dlg), "response", G_CALLBACK (search_dlg_action_response), sdlg);
 
     // 2x4 Table
     table = GTK_TABLE (gtk_table_new (2, 2, FALSE));
@@ -275,11 +275,11 @@ static void search_dlg_init (GViewerSearchDlg *sdlg)
     sdlg->priv->text_mode = gtk_radio_button_new_with_mnemonic(NULL, _("_Text"));
     sdlg->priv->hex_mode = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(sdlg->priv->text_mode), _("_Hexadecimal"));
 
-    g_signal_connect(sdlg->priv->text_mode, "toggled", G_CALLBACK (search_mode_text), sdlg);
-    g_signal_connect(sdlg->priv->hex_mode, "toggled", G_CALLBACK (search_mode_hex), sdlg);
+    g_signal_connect (sdlg->priv->text_mode, "toggled", G_CALLBACK (search_mode_text), sdlg);
+    g_signal_connect (sdlg->priv->hex_mode, "toggled", G_CALLBACK (search_mode_hex), sdlg);
 
-    gtk_table_attach(table, sdlg->priv->text_mode, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
-    gtk_table_attach(table, sdlg->priv->hex_mode, 1, 2, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+    gtk_table_attach (table, sdlg->priv->text_mode, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+    gtk_table_attach (table, sdlg->priv->hex_mode, 1, 2, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
 
     // Case-Sensitive Checkbox
     sdlg->priv->case_sensitive_checkbox = gtk_check_button_new_with_mnemonic(_("_Match case"));
diff --git a/src/intviewer/search-progress-dlg.cc b/src/intviewer/search-progress-dlg.cc
index 0f5f1cb..776591e 100644
--- a/src/intviewer/search-progress-dlg.cc
+++ b/src/intviewer/search-progress-dlg.cc
@@ -69,16 +69,16 @@ static void search_progress_dlg_class_init(GViewerSearchProgressDlgClass *klass)
 
 static void search_progress_dlg_init (GViewerSearchProgressDlg *sdlg)
 {
-    sdlg->priv = g_new0(GViewerSearchProgressDlgPrivate, 1);
+    sdlg->priv = g_new0 (GViewerSearchProgressDlgPrivate, 1);
 
     GtkDialog *dlg = GTK_DIALOG(sdlg);
-    sdlg->priv->progress = 0;
+    // sdlg->priv->progress = 0;
 
-    gtk_window_set_title(GTK_WINDOW (dlg), _("Searching..."));
-    gtk_window_set_modal(GTK_WINDOW (dlg), TRUE);
-    gtk_dialog_add_button(dlg, GTK_STOCK_STOP, 12);
+    gtk_window_set_title (GTK_WINDOW (dlg), _("Searching..."));
+    gtk_window_set_modal (GTK_WINDOW (dlg), TRUE);
+    gtk_dialog_add_button (dlg, GTK_STOCK_STOP, 12);
 
-    g_signal_connect_swapped(GTK_WIDGET (dlg), "response", G_CALLBACK (search_progress_dlg_action_response), sdlg);
+    g_signal_connect_swapped (GTK_WIDGET (dlg), "response", G_CALLBACK (search_progress_dlg_action_response), sdlg);
 
     // Text Label
     sdlg->priv->label = gtk_label_new("");
diff --git a/src/intviewer/searcher.cc b/src/intviewer/searcher.cc
index 7c9f618..9852d85 100644
--- a/src/intviewer/searcher.cc
+++ b/src/intviewer/searcher.cc
@@ -126,15 +126,14 @@ static void g_viewer_searcher_class_init(GViewerSearcherClass *klass)
 
 static void g_viewer_searcher_init(GViewerSearcher *obj)
 {
-    obj->priv = g_new0(GViewerSearcherPrivate, 1);
+    obj->priv = g_new0 (GViewerSearcherPrivate, 1);
     // Initialize private members, etc.
 
-    obj->priv->abort_indicator = 0;
-    obj->priv->completed_indicator = 0;
-    obj->priv->progress_value = 0;
-
-    obj->priv->search_thread = NULL;
+    // obj->priv->abort_indicator = 0;
+    // obj->priv->completed_indicator = 0;
+    // obj->priv->progress_value = 0;
 
+    // obj->priv->search_thread = NULL;
 }
 
 
diff --git a/src/intviewer/text-render.cc b/src/intviewer/text-render.cc
index 40b574f..324db11 100644
--- a/src/intviewer/text-render.cc
+++ b/src/intviewer/text-render.cc
@@ -291,7 +291,7 @@ static void text_render_class_init (TextRenderClass *klass)
 
 static void text_render_init (TextRender *w)
 {
-    w->priv = g_new0(TextRenderPrivate, 1);
+    w->priv = g_new0 (TextRenderPrivate, 1);
 
     w->priv->button = 0;
     w->priv->dispmode = TR_DISP_MODE_TEXT;
@@ -324,7 +324,7 @@ static void text_render_init (TextRender *w)
 
     w->priv->fixed_font_name = g_strdup ("Monospace");
 
-    g_signal_connect(w, "key-press-event", G_CALLBACK (text_render_key_pressed), NULL);
+    g_signal_connect (w, "key-press-event", G_CALLBACK (text_render_key_pressed), NULL);
 
     w->priv->layout = gtk_widget_create_pango_layout(GTK_WIDGET (w), NULL);
 
diff --git a/src/intviewer/viewer-window.cc b/src/intviewer/viewer-window.cc
index 6594bb6..afc31b7 100644
--- a/src/intviewer/viewer-window.cc
+++ b/src/intviewer/viewer-window.cc
@@ -230,9 +230,9 @@ static void gviewer_window_init (GViewerWindow *w)
     w->priv->current_scale_index = 5;
 
     GtkWindow *win = GTK_WINDOW (w);
-    gtk_window_set_title(win, "GViewer");
+    gtk_window_set_title (win, "GViewer");
 
-    g_signal_connect(w, "key-press-event", G_CALLBACK (gviewer_window_key_pressed), NULL);
+    g_signal_connect (w, "key-press-event", G_CALLBACK (gviewer_window_key_pressed), NULL);
 
     w->priv->vbox = gtk_vbox_new (FALSE, 0);
     gtk_widget_show (w->priv->vbox);
@@ -246,7 +246,7 @@ static void gviewer_window_init (GViewerWindow *w)
     gtk_widget_show (GTK_WIDGET (w->priv->viewer));
     gtk_box_pack_start (GTK_BOX (w->priv->vbox), GTK_WIDGET (w->priv->viewer), TRUE, TRUE, 0);
 
-    g_signal_connect(w->priv->viewer, "status-line-changed", G_CALLBACK (gviewer_window_status_line_changed), w);
+    g_signal_connect (w->priv->viewer, "status-line-changed", G_CALLBACK (gviewer_window_status_line_changed), w);
 
     w->priv->statusbar = gtk_statusbar_new ();
     gtk_widget_show (w->priv->statusbar);
@@ -256,7 +256,7 @@ static void gviewer_window_init (GViewerWindow *w)
 
     gtk_widget_grab_focus (GTK_WIDGET (w->priv->viewer));
 
-    gtk_container_add(GTK_CONTAINER (w), w->priv->vbox);
+    gtk_container_add (GTK_CONTAINER (w), w->priv->vbox);
 }
 
 
diff --git a/src/ls_colors.cc b/src/ls_colors.cc
index 7e0a2fb..d2bd447 100644
--- a/src/ls_colors.cc
+++ b/src/ls_colors.cc
@@ -113,10 +113,10 @@ static LsColor *ext_color (gchar *key, gchar *val)
 static LsColor *type_color (gchar *key, gchar *val)
 {
     int i, n[3];
-    LsColor *col = g_new (LsColor, 1);
-    col->ext = NULL;
-    col->fg = NULL;
-    col->bg = NULL;
+    LsColor *col = g_new0 (LsColor, 1);
+    // col->ext = NULL;
+    // col->fg = NULL;
+    // col->bg = NULL;
 
     if (strcmp (key, "fi") == 0)
         col->type = GNOME_VFS_FILE_TYPE_REGULAR;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]