gnome-commander r1963 - in trunk: libgcmd src

[epiotr svn gnome org]

Author: epiotr
Date: Tue Aug 12 20:42:06 2008
New Revision: 1963
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1963&view=rev

Log:
Code cleanup

Modified:
   trunk/libgcmd/gnome-cmd-dialog.h
   trunk/libgcmd/gnome-cmd-file-info.h
   trunk/libgcmd/gnome-cmd-plugin.h
   trunk/libgcmd/gnome-cmd-string-dialog.h
   trunk/libgcmd/libgcmd-widget-factory.h
   trunk/src/gnome-cmd-options-dialog.cc

Modified: trunk/libgcmd/gnome-cmd-dialog.h
==============================================================================
--- trunk/libgcmd/gnome-cmd-dialog.h	(original)
+++ trunk/libgcmd/gnome-cmd-dialog.h	Tue Aug 12 20:42:06 2008
@@ -52,43 +52,25 @@
 };
 
 
-GtkWidget*
-gnome_cmd_dialog_new (const gchar *title);
+GtkWidget *gnome_cmd_dialog_new (const gchar *title);
 
-void
-gnome_cmd_dialog_setup (GnomeCmdDialog *dialog, const gchar *title);
+void gnome_cmd_dialog_setup (GnomeCmdDialog *dialog, const gchar *title);
 
-GtkType
-gnome_cmd_dialog_get_type (void);
+GtkType gnome_cmd_dialog_get_type (void);
 
-GtkWidget *
-gnome_cmd_dialog_add_button (GnomeCmdDialog *dialog,
-                             const gchar *stock_id,
-                             GtkSignalFunc on_click,
-                             gpointer data);
-
-void
-gnome_cmd_dialog_add_category (GnomeCmdDialog *dialog,
-                               GtkWidget *category);
-
-void
-gnome_cmd_dialog_add_expanding_category (GnomeCmdDialog *dialog,
-                                         GtkWidget *category);
-
-void
-gnome_cmd_dialog_editable_enters (GnomeCmdDialog *dialog,
-                                  GtkEditable *editable);
-
-void
-gnome_cmd_dialog_set_transient_for (GnomeCmdDialog *dialog,
-                                    GtkWindow *win);
-
-void
-gnome_cmd_dialog_set_modal (GnomeCmdDialog *dialog);
-
-void
-gnome_cmd_dialog_set_resizable (GnomeCmdDialog *dialog,
-                                gboolean value);
+GtkWidget *gnome_cmd_dialog_add_button (GnomeCmdDialog *dialog, const gchar *stock_id, GtkSignalFunc on_click, gpointer data);
+
+void gnome_cmd_dialog_add_category (GnomeCmdDialog *dialog, GtkWidget *category);
+
+void gnome_cmd_dialog_add_expanding_category (GnomeCmdDialog *dialog, GtkWidget *category);
+
+void gnome_cmd_dialog_editable_enters (GnomeCmdDialog *dialog, GtkEditable *editable);
+
+void gnome_cmd_dialog_set_transient_for (GnomeCmdDialog *dialog, GtkWindow *win);
+
+void gnome_cmd_dialog_set_modal (GnomeCmdDialog *dialog);
+
+void gnome_cmd_dialog_set_resizable (GnomeCmdDialog *dialog, gboolean value);
 
 G_END_DECLS
 

Modified: trunk/libgcmd/gnome-cmd-file-info.h
==============================================================================
--- trunk/libgcmd/gnome-cmd-file-info.h	(original)
+++ trunk/libgcmd/gnome-cmd-file-info.h	Tue Aug 12 20:42:06 2008
@@ -22,17 +22,14 @@
 
 G_BEGIN_DECLS
 
-#define GNOME_CMD_FILE_INFO(obj) \
-    GTK_CHECK_CAST (obj, gnome_cmd_file_info_get_type (), GnomeCmdFileInfo)
-#define GNOME_CMD_FILE_INFO_CLASS(klass) \
-    GTK_CHECK_CLASS_CAST (klass, gnome_cmd_file_info_get_type (), GnomeCmdFileInfoClass)
-#define GNOME_CMD_IS_FILE_INFO(obj) \
-    GTK_CHECK_TYPE (obj, gnome_cmd_file_info_get_type ())
+#define GNOME_CMD_FILE_INFO(obj)          GTK_CHECK_CAST (obj, gnome_cmd_file_info_get_type (), GnomeCmdFileInfo)
+#define GNOME_CMD_FILE_INFO_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gnome_cmd_file_info_get_type (), GnomeCmdFileInfoClass)
+#define GNOME_CMD_IS_FILE_INFO(obj)       GTK_CHECK_TYPE (obj, gnome_cmd_file_info_get_type ())
 
 
-typedef struct _GnomeCmdFileInfo GnomeCmdFileInfo;
-typedef struct _GnomeCmdFileInfoClass GnomeCmdFileInfoClass;
-typedef struct _GnomeCmdFileInfoPrivate    GnomeCmdFileInfoPrivate;
+typedef struct _GnomeCmdFileInfo        GnomeCmdFileInfo;
+typedef struct _GnomeCmdFileInfoClass   GnomeCmdFileInfoClass;
+typedef struct _GnomeCmdFileInfoPrivate GnomeCmdFileInfoPrivate;
 
 struct _GnomeCmdFileInfo
 {
@@ -50,13 +47,9 @@
 };
 
 
-GtkType
-gnome_cmd_file_info_get_type (void);
+GtkType gnome_cmd_file_info_get_type (void);
 
-void
-gnome_cmd_file_info_setup (GnomeCmdFileInfo *finfo,
-                           GnomeVFSURI *uri,
-                           GnomeVFSFileInfo *info);
+void gnome_cmd_file_info_setup (GnomeCmdFileInfo *finfo, GnomeVFSURI *uri, GnomeVFSFileInfo *info);
 
 G_END_DECLS
 

Modified: trunk/libgcmd/gnome-cmd-plugin.h
==============================================================================
--- trunk/libgcmd/gnome-cmd-plugin.h	(original)
+++ trunk/libgcmd/gnome-cmd-plugin.h	Tue Aug 12 20:42:06 2008
@@ -53,20 +53,15 @@
 };
 
 
-GtkType
-gnome_cmd_plugin_get_type (void);
+GtkType gnome_cmd_plugin_get_type (void);
 
-GtkWidget *
-gnome_cmd_plugin_create_main_menu (GnomeCmdPlugin *plugin, GnomeCmdState *state);
+GtkWidget *gnome_cmd_plugin_create_main_menu (GnomeCmdPlugin *plugin, GnomeCmdState *state);
 
-GList *
-gnome_cmd_plugin_create_popup_menu_items (GnomeCmdPlugin *plugin, GnomeCmdState *state);
+GList *gnome_cmd_plugin_create_popup_menu_items (GnomeCmdPlugin *plugin, GnomeCmdState *state);
 
-void
-gnome_cmd_plugin_update_main_menu_state (GnomeCmdPlugin *plugin, GnomeCmdState *state);
+void gnome_cmd_plugin_update_main_menu_state (GnomeCmdPlugin *plugin, GnomeCmdState *state);
 
-void
-gnome_cmd_plugin_configure (GnomeCmdPlugin *plugin);
+void gnome_cmd_plugin_configure (GnomeCmdPlugin *plugin);
 
 G_END_DECLS
 

Modified: trunk/libgcmd/gnome-cmd-string-dialog.h
==============================================================================
--- trunk/libgcmd/gnome-cmd-string-dialog.h	(original)
+++ trunk/libgcmd/gnome-cmd-string-dialog.h	Tue Aug 12 20:42:06 2008
@@ -91,32 +91,23 @@
                                GnomeCmdStringDialogCallback ok_cb,
                                gpointer user_data);
 
-GtkType
-gnome_cmd_string_dialog_get_type (void);
+GtkType gnome_cmd_string_dialog_get_type (void);
 
-void
-gnome_cmd_string_dialog_set_hidden (GnomeCmdStringDialog *dialog, gint row, gboolean hidden);
+void gnome_cmd_string_dialog_set_hidden (GnomeCmdStringDialog *dialog, gint row, gboolean hidden);
 
-void
-gnome_cmd_string_dialog_set_title (GnomeCmdStringDialog *dialog, const gchar *title);
+void gnome_cmd_string_dialog_set_title (GnomeCmdStringDialog *dialog, const gchar *title);
 
-void
-gnome_cmd_string_dialog_set_label (GnomeCmdStringDialog *dialog, gint row, const gchar *label);
+void gnome_cmd_string_dialog_set_label (GnomeCmdStringDialog *dialog, gint row, const gchar *label);
 
-void
-gnome_cmd_string_dialog_set_userdata (GnomeCmdStringDialog *dialog, gpointer user_data);
+void gnome_cmd_string_dialog_set_userdata (GnomeCmdStringDialog *dialog, gpointer user_data);
 
-void
-gnome_cmd_string_dialog_set_ok_cb (GnomeCmdStringDialog *dialog, GnomeCmdStringDialogCallback ok_cb);
+void gnome_cmd_string_dialog_set_ok_cb (GnomeCmdStringDialog *dialog, GnomeCmdStringDialogCallback ok_cb);
 
-void
-gnome_cmd_string_dialog_set_cancel_cb (GnomeCmdStringDialog *dialog, GtkSignalFunc cancel_cb);
+void gnome_cmd_string_dialog_set_cancel_cb (GnomeCmdStringDialog *dialog, GtkSignalFunc cancel_cb);
 
-void
-gnome_cmd_string_dialog_set_value (GnomeCmdStringDialog *dialog, gint row, const gchar *value);
+void gnome_cmd_string_dialog_set_value (GnomeCmdStringDialog *dialog, gint row, const gchar *value);
 
-void
-gnome_cmd_string_dialog_set_error_desc (GnomeCmdStringDialog *dialog, gchar *msg);
+void gnome_cmd_string_dialog_set_error_desc (GnomeCmdStringDialog *dialog, gchar *msg);
 
 
 G_END_DECLS

Modified: trunk/libgcmd/libgcmd-widget-factory.h
==============================================================================
--- trunk/libgcmd/libgcmd-widget-factory.h	(original)
+++ trunk/libgcmd/libgcmd-widget-factory.h	Tue Aug 12 20:42:06 2008
@@ -22,151 +22,101 @@
 
 G_BEGIN_DECLS
 
-GtkWidget *
-lookup_widget (GtkWidget *widget, const gchar *widget_name);
+GtkWidget *lookup_widget (GtkWidget *widget, const gchar *widget_name);
 
-GtkWidget *
-create_frame (GtkWidget *parent, const gchar *text, gint spacing);
+GtkWidget *create_frame (GtkWidget *parent, const gchar *text, gint spacing);
 
-GtkWidget *
-create_tabframe (GtkWidget *parent);
+GtkWidget *create_tabframe (GtkWidget *parent);
 
-GtkWidget *
-create_space_frame (GtkWidget *parent, gint space);
+GtkWidget *create_space_frame (GtkWidget *parent, gint space);
 
-GtkWidget *
-create_table (GtkWidget *parent, gint rows, gint cols);
+GtkWidget *create_table (GtkWidget *parent, gint rows, gint cols);
 
-GtkWidget *
-create_vbox (GtkWidget *parent, gboolean h, gint s);
+GtkWidget *create_vbox (GtkWidget *parent, gboolean h, gint s);
 
-GtkWidget *
-create_hbox (GtkWidget *parent, gboolean h, gint s);
+GtkWidget *create_hbox (GtkWidget *parent, gboolean h, gint s);
 
-GtkWidget *
-create_tabvbox (GtkWidget *parent);
+GtkWidget *create_tabvbox (GtkWidget *parent);
 
-GtkWidget *
-create_tabhbox (GtkWidget *parent);
+GtkWidget *create_tabhbox (GtkWidget *parent);
 
-GtkWidget *
-create_label (GtkWidget *parent, const gchar *text);
+GtkWidget *create_label (GtkWidget *parent, const gchar *text);
 
-GtkWidget *
-create_bold_label (GtkWidget *parent, const gchar *text);
+GtkWidget *create_bold_label (GtkWidget *parent, const gchar *text);
 
-GtkWidget *
-create_hsep (GtkWidget *parent);
+GtkWidget *create_hsep (GtkWidget *parent);
 
-GtkWidget *
-create_vsep (GtkWidget *parent);
+GtkWidget *create_vsep (GtkWidget *parent);
 
-GtkWidget *
-create_space_hbox (GtkWidget *parent, GtkWidget *content);
+GtkWidget *create_space_hbox (GtkWidget *parent, GtkWidget *content);
 
-GtkWidget *
-create_category (GtkWidget *parent, GtkWidget *content, gchar *title);
+GtkWidget *create_category (GtkWidget *parent, GtkWidget *content, gchar *title);
 
-GtkWidget *
-create_button (GtkWidget *parent, gchar *label, GtkSignalFunc func);
+GtkWidget *create_button (GtkWidget *parent, gchar *label, GtkSignalFunc func);
 
-GtkWidget *
-create_named_button (GtkWidget *parent, gchar *label, gchar *name, GtkSignalFunc func);
+GtkWidget *create_named_button (GtkWidget *parent, gchar *label, gchar *name, GtkSignalFunc func);
 
-GtkWidget *
-create_button_with_data (GtkWidget *parent, gchar *label, GtkSignalFunc func, gpointer data);
+GtkWidget *create_button_with_data (GtkWidget *parent, gchar *label, GtkSignalFunc func, gpointer data);
 
-GtkWidget *
-create_named_button_with_data (GtkWidget *parent, gchar *label, gchar *name, GtkSignalFunc func, gpointer data);
+GtkWidget *create_named_button_with_data (GtkWidget *parent, gchar *label, gchar *name, GtkSignalFunc func, gpointer data);
 
-GtkWidget *
-create_stock_button (GtkWidget *parent, gconstpointer stock, GtkSignalFunc func);
+GtkWidget *create_stock_button (GtkWidget *parent, gconstpointer stock, GtkSignalFunc func);
 
-GtkWidget *
-create_named_stock_button (GtkWidget *parent, gconstpointer stock, gchar *name, GtkSignalFunc func);
+GtkWidget *create_named_stock_button (GtkWidget *parent, gconstpointer stock, gchar *name, GtkSignalFunc func);
 
-GtkWidget *
-create_stock_button_with_data (GtkWidget *parent, gconstpointer stock, GtkSignalFunc func, gpointer data);
+GtkWidget *create_stock_button_with_data (GtkWidget *parent, gconstpointer stock, GtkSignalFunc func, gpointer data);
 
-GtkWidget *
-create_named_stock_button_with_data (GtkWidget *parent, gconstpointer stock, gchar *name, GtkSignalFunc func, gpointer data);
+GtkWidget *create_named_stock_button_with_data (GtkWidget *parent, gconstpointer stock, gchar *name, GtkSignalFunc func, gpointer data);
 
-GtkWidget *
-create_entry (GtkWidget *parent, gchar *name, const gchar *value);
+GtkWidget *create_entry (GtkWidget *parent, gchar *name, const gchar *value);
 
-GtkWidget *
-create_check (GtkWidget *parent, gchar *text, gchar *name);
+GtkWidget *create_check (GtkWidget *parent, gchar *text, gchar *name);
 
-GtkWidget *
-create_radio (GtkWidget *parent, GSList *group, gchar *text, gchar *name);
+GtkWidget *create_radio (GtkWidget *parent, GSList *group, gchar *text, gchar *name);
 
-GtkWidget *
-create_spin (GtkWidget *parent, gchar *name, gint min, gint max, gint value);
+GtkWidget *create_spin (GtkWidget *parent, gchar *name, gint min, gint max, gint value);
 
-GtkWidget *
-create_color_picker (GtkWidget *parent, gchar *name);
+GtkWidget *create_color_picker (GtkWidget *parent, gchar *name);
 
-GtkWidget *
-create_icon_entry (GtkWidget *parent, gchar *name, const gchar *icon_path);
+GtkWidget *create_icon_entry (GtkWidget *parent, gchar *name, const gchar *icon_path);
 
-GtkWidget *
-create_scale (GtkWidget *parent, gchar *name, gint value, gint min, gint max);
+GtkWidget *create_scale (GtkWidget *parent, gchar *name, gint value, gint min, gint max);
 
-GtkWidget *
-create_file_entry (GtkWidget *parent, gchar *name, const gchar *value);
+GtkWidget *create_file_entry (GtkWidget *parent, gchar *name, const gchar *value);
 
-GtkWidget *
-create_clist (GtkWidget *parent, gchar *name, gint cols, gint rowh,
-              GtkSignalFunc on_row_selected, GtkSignalFunc on_row_moved);
+GtkWidget *create_clist (GtkWidget *parent, gchar *name, gint cols, gint rowh, GtkSignalFunc on_row_selected, GtkSignalFunc on_row_moved);
 
-void
-create_clist_column (GtkWidget *sw, gint col, gint width, gchar *label);
+void create_clist_column (GtkWidget *sw, gint col, gint width, gchar *label);
 
-GtkWidget *
-create_vbuttonbox (GtkWidget *parent);
+GtkWidget *create_vbuttonbox (GtkWidget *parent);
 
-GtkWidget *
-create_hbuttonbox (GtkWidget *parent);
+GtkWidget *create_hbuttonbox (GtkWidget *parent);
 
-GtkWidget *
-create_combo (GtkWidget *parent);
+GtkWidget *create_combo (GtkWidget *parent);
 
-GtkWidget *
-create_option_menu (GtkWidget *parent, gchar **items);
+GtkWidget *create_option_menu (GtkWidget *parent, gchar **items);
 
-const gchar *
-get_combo_text (GtkWidget *combo);
+const gchar *get_combo_text (GtkWidget *combo);
 
-GSList *
-get_radio_group (GtkWidget *radio);
+GSList *get_radio_group (GtkWidget *radio);
 
-void
-table_add (GtkWidget *table, GtkWidget *w, gint x, gint y, GtkAttachOptions x_opts);
+void table_add (GtkWidget *table, GtkWidget *w, gint x, gint y, GtkAttachOptions x_opts);
 
-void
-table_add_y (GtkWidget *table, GtkWidget *w, gint x, gint y,
-             GtkAttachOptions x_opts, GtkAttachOptions y_opts);
+void table_add_y (GtkWidget *table, GtkWidget *w, gint x, gint y, GtkAttachOptions x_opts, GtkAttachOptions y_opts);
 
-GtkWidget *
-create_pixmap (GtkWidget *parent, GdkPixmap *pm, GdkBitmap *mask);
+GtkWidget *create_pixmap (GtkWidget *parent, GdkPixmap *pm, GdkBitmap *mask);
 
-GtkWidget *
-create_progress_bar (GtkWidget *parent);
+GtkWidget *create_progress_bar (GtkWidget *parent);
 
-GtkWidget *
-create_sw (GtkWidget *parent);
+GtkWidget *create_sw (GtkWidget *parent);
 
-void
-progress_bar_update (GtkWidget *pbar, gint max);
+void progress_bar_update (GtkWidget *pbar, gint max);
 
-const char *
-get_entry_text (GtkWidget *parent, gchar *entry_name);
+const char *get_entry_text (GtkWidget *parent, gchar *entry_name);
 
-void
-create_error_dialog (const gchar *msg, ...);
+void create_error_dialog (const gchar *msg, ...);
 
-void
-create_warning_dialog (const gchar *msg, ...);
+void create_warning_dialog (const gchar *msg, ...);
 
 G_END_DECLS
 

Modified: trunk/src/gnome-cmd-options-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-options-dialog.cc	(original)
+++ trunk/src/gnome-cmd-options-dialog.cc	Tue Aug 12 20:42:06 2008
@@ -590,8 +590,7 @@
     gnome_cmd_data_set_icon_size (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (iconsize_spin)));
 
     {
-        GtkAdjustment *adj;
-        adj = gtk_range_get_adjustment (GTK_RANGE (iconquality_scale));
+        GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (iconquality_scale));
         gnome_cmd_data_set_icon_scale_quality ((GdkInterpType) adj->value);
     }