gnome-commander r2451 - branches/gcmd-1-3/src

[epiotr svn gnome org]

Author: epiotr
Date: Mon Feb  9 17:47:18 2009
New Revision: 2451
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2451&view=rev

Log:
Code cleanup

Modified:
   branches/gcmd-1-3/src/gnome-cmd-prepare-copy-dialog.cc
   branches/gcmd-1-3/src/gnome-cmd-prepare-move-dialog.cc
   branches/gcmd-1-3/src/gnome-cmd-prepare-xfer-dialog.cc
   branches/gcmd-1-3/src/gnome-cmd-prepare-xfer-dialog.h
   branches/gcmd-1-3/src/gnome-cmd-user-actions.cc

Modified: branches/gcmd-1-3/src/gnome-cmd-prepare-copy-dialog.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-prepare-copy-dialog.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-prepare-copy-dialog.cc	Mon Feb  9 17:47:18 2009
@@ -72,8 +72,6 @@
 
     GSList *group = NULL;
     PrepareCopyData *data = g_new0 (PrepareCopyData, 1);
-    GnomeCmdFile *finfo;
-    gint num_files;
     gchar *dest_dir_frame_msg, *text;
     GtkWidget *label;
     GList *tmp = from->file_list()->get_selected_files();
@@ -89,9 +87,8 @@
     gtk_widget_ref (GTK_WIDGET (data->dialog));
 
 
-    /*
-     * Create prepare copy specific widgets
-     */
+    // Create prepare copy specific widgets
+
     data->silent = gtk_radio_button_new_with_label (group, _("Silently"));
     group = gtk_radio_button_group (GTK_RADIO_BUTTON (data->silent));
     gtk_widget_ref (data->silent);
@@ -123,9 +120,8 @@
     gtk_box_pack_start (GTK_BOX (data->dialog->right_vbox), data->follow_links, FALSE, FALSE, 0);
 
 
-    /*
-     * Customize prepare xfer widgets
-     */
+    // Customize prepare xfer widgets
+
     text = get_bold_text (_("Overwrite Files"));
     label = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (data->dialog->left_vbox_frame), "label");
     gtk_label_set_markup (GTK_LABEL (label), text);
@@ -138,12 +134,12 @@
 
     g_return_if_fail (data->dialog->src_files != NULL);
 
-    num_files = g_list_length (data->dialog->src_files);
-    finfo = (GnomeCmdFile *) data->dialog->src_files->data;
+    gint num_files = g_list_length (data->dialog->src_files);
 
     if (num_files == 1)
     {
-        gchar *fname = get_utf8 (finfo->info->name);
+        GnomeCmdFile *f = (GnomeCmdFile *) data->dialog->src_files->data;
+        gchar *fname = get_utf8 (f->info->name);
         dest_dir_frame_msg = g_strdup_printf (_("Copy \"%s\" to"), fname);
         g_free (fname);
     }
@@ -158,14 +154,12 @@
     g_free (dest_dir_frame_msg);
 
 
-    /*
-     * Connect signals
-     */
+    // Connect signals
+
     gtk_signal_connect (GTK_OBJECT (data->dialog->ok_button), "clicked", GTK_SIGNAL_FUNC (on_ok), data);
 
 
-    /*
-     * Show the dialog
-     */
+    // Show the dialog
+
     gtk_widget_show (GTK_WIDGET (data->dialog));
 }

Modified: branches/gcmd-1-3/src/gnome-cmd-prepare-move-dialog.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-prepare-move-dialog.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-prepare-move-dialog.cc	Mon Feb  9 17:47:18 2009
@@ -67,8 +67,6 @@
 
     GSList *group = NULL;
     PrepareMoveData *data = g_new0 (PrepareMoveData, 1);
-    GnomeCmdFile *finfo;
-    gint num_files;
     gchar *dest_dir_frame_msg, *text;
     GtkWidget *label;
 
@@ -86,6 +84,7 @@
 
 
     // Create prepare copy specific widgets
+
     data->silent = gtk_radio_button_new_with_label (group, _("Silently"));
     group = gtk_radio_button_group (GTK_RADIO_BUTTON (data->silent));
     gtk_widget_ref (data->silent);
@@ -111,6 +110,7 @@
 
 
     // Customize prepare xfer widgets
+
     text = get_bold_text (_("Overwrite Files"));
     label = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (data->dialog->left_vbox_frame), "label");
     gtk_label_set_markup (GTK_LABEL (label), text);
@@ -122,12 +122,13 @@
     g_free (text);
 
     g_return_if_fail (data->dialog->src_files != NULL);
-    num_files = g_list_length (data->dialog->src_files);
-    finfo = (GnomeCmdFile *) data->dialog->src_files->data;
+
+    gint num_files = g_list_length (data->dialog->src_files);
 
     if (num_files == 1)
     {
-        gchar *fname = get_utf8 (finfo->info->name);
+        GnomeCmdFile *f = (GnomeCmdFile *) data->dialog->src_files->data;
+        gchar *fname = get_utf8 (f->info->name);
         dest_dir_frame_msg = g_strdup_printf (_("Move \"%s\" to"), fname);
         g_free (fname);
     }
@@ -143,9 +144,11 @@
 
 
     // Connect signals
+
     gtk_signal_connect (GTK_OBJECT (data->dialog->ok_button), "clicked", GTK_SIGNAL_FUNC (on_ok), data);
 
 
     // Show the dialog
+
     gtk_widget_show (GTK_WIDGET (data->dialog));
 }

Modified: branches/gcmd-1-3/src/gnome-cmd-prepare-xfer-dialog.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-prepare-xfer-dialog.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-prepare-xfer-dialog.cc	Mon Feb  9 17:47:18 2009
@@ -293,8 +293,6 @@
 static void init (GnomeCmdPrepareXferDialog *dialog)
 {
     GtkWidget *dest_dir_vbox;
-    GtkWidget *dest_dir_fileentry;
-    GtkWidget *options_hbox;
 
     // dest dir
     dest_dir_vbox = create_vbox (GTK_WIDGET (dialog), FALSE, 0);
@@ -302,16 +300,15 @@
     dialog->dest_dir_frame = create_category (GTK_WIDGET (dialog), dest_dir_vbox, "");
     gnome_cmd_dialog_add_category (GNOME_CMD_DIALOG (dialog), dialog->dest_dir_frame);
 
-    dest_dir_fileentry = create_file_entry (GTK_WIDGET (dialog), "file-entry", "");
+    GtkWidget *dest_dir_fileentry = create_file_entry (GTK_WIDGET (dialog), "file-entry", "");
     gtk_box_pack_start (GTK_BOX (dest_dir_vbox), dest_dir_fileentry, FALSE, FALSE, 0);
     dialog->dest_dir_entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (dest_dir_fileentry));
 
     gtk_signal_connect (GTK_OBJECT (dialog->dest_dir_entry), "key-press-event",
                         GTK_SIGNAL_FUNC (on_dest_dir_entry_keypressed), dialog);
 
-
     // options
-    options_hbox = create_hbox (GTK_WIDGET (dialog), TRUE, 6);
+    GtkWidget *options_hbox = create_hbox (GTK_WIDGET (dialog), TRUE, 6);
     gnome_cmd_dialog_add_category (GNOME_CMD_DIALOG (dialog), options_hbox);
 
     dialog->left_vbox = create_vbox (GTK_WIDGET (dialog), FALSE, 0);

Modified: branches/gcmd-1-3/src/gnome-cmd-prepare-xfer-dialog.h
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-prepare-xfer-dialog.h	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-prepare-xfer-dialog.h	Mon Feb  9 17:47:18 2009
@@ -21,23 +21,14 @@
 #define __GNOME_CMD_PREPARE_XFER_DIALOG_H__
 
 #include "gnome-cmd-dir.h"
-#include "gnome-cmd-file-list.h"
 #include "gnome-cmd-file-selector.h"
 
-#define GNOME_CMD_PREPARE_XFER_DIALOG(obj) \
-    GTK_CHECK_CAST (obj, gnome_cmd_prepare_xfer_dialog_get_type (), GnomeCmdPrepareXferDialog)
-#define GNOME_CMD_PREPARE_XFER_DIALOG_CLASS(klass) \
-    GTK_CHECK_CLASS_CAST (klass, gnome_cmd_prepare_xfer_dialog_get_type (), GnomeCmdPrepareXferDialogClass)
-#define GNOME_CMD_IS_PREPARE_XFER_DIALOG(obj) \
-    GTK_CHECK_TYPE (obj, gnome_cmd_prepare_xfer_dialog_get_type ())
+#define GNOME_CMD_PREPARE_XFER_DIALOG(obj)          GTK_CHECK_CAST (obj, gnome_cmd_prepare_xfer_dialog_get_type (), GnomeCmdPrepareXferDialog)
+#define GNOME_CMD_PREPARE_XFER_DIALOG_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gnome_cmd_prepare_xfer_dialog_get_type (), GnomeCmdPrepareXferDialogClass)
+#define GNOME_CMD_IS_PREPARE_XFER_DIALOG(obj)       GTK_CHECK_TYPE (obj, gnome_cmd_prepare_xfer_dialog_get_type ())
 
 
-typedef struct _GnomeCmdPrepareXferDialog GnomeCmdPrepareXferDialog;
-typedef struct _GnomeCmdPrepareXferDialogClass GnomeCmdPrepareXferDialogClass;
-
-
-
-struct _GnomeCmdPrepareXferDialog
+struct GnomeCmdPrepareXferDialog
 {
     GnomeCmdDialog parent;
 
@@ -59,17 +50,14 @@
 };
 
 
-struct _GnomeCmdPrepareXferDialogClass
+struct GnomeCmdPrepareXferDialogClass
 {
     GnomeCmdDialogClass parent_class;
 };
 
 
-GtkWidget*
-gnome_cmd_prepare_xfer_dialog_new (GnomeCmdFileSelector *from,
-                                   GnomeCmdFileSelector *to);
+GtkWidget *gnome_cmd_prepare_xfer_dialog_new (GnomeCmdFileSelector *from, GnomeCmdFileSelector *to);
 
-GtkType
-gnome_cmd_prepare_xfer_dialog_get_type ();
+GtkType gnome_cmd_prepare_xfer_dialog_get_type ();
 
 #endif // __GNOME_CMD_PREPARE_XFER_DIALOG_H__

Modified: branches/gcmd-1-3/src/gnome-cmd-user-actions.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-user-actions.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-user-actions.cc	Mon Feb  9 17:47:18 2009
@@ -1560,7 +1560,7 @@
 
 void help_keyboard (GtkMenuItem *menuitem, gpointer not_used)
 {
-    gnome_cmd_help_display ("gnome-commander.xml","gnome-commander-keyboard");
+    gnome_cmd_help_display ("gnome-commander.xml", "gnome-commander-keyboard");
 }