GNOME.org
 

[gnome-commander: 3/3] noop: finfo -> f

commit 586b91181a87b9f915f6553b020b118bbbb8e2fe
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Fri May 8 22:53:06 2009 +0200

    noop: finfo -> f
---
 libgcmd/gnome-cmd-file-info.h     |    2 +-
 src/gnome-cmd-advrename-lexer.h   |    2 +-
 src/gnome-cmd-app.h               |    4 ++--
 src/gnome-cmd-chmod-dialog.cc     |   22 +++++++++++-----------
 src/gnome-cmd-chown-dialog.cc     |   22 +++++++++++-----------
 src/gnome-cmd-delete-dialog.cc    |   12 ++++++------
 src/gnome-cmd-dir.h               |    2 +-
 src/gnome-cmd-file-list.h         |    2 +-
 src/gnome-cmd-file-props-dialog.h |    2 +-
 src/gnome-cmd-make-copy-dialog.h  |    2 +-
 src/gnome-cmd-rename-dialog.cc    |   20 ++++++++++----------
 src/gnome-cmd-rename-dialog.h     |    2 +-
 src/ls_colors.cc                  |    8 ++++----
 src/ls_colors.h                   |    2 +-
 src/utils.h                       |    6 +++---
 15 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/libgcmd/gnome-cmd-file-info.h b/libgcmd/gnome-cmd-file-info.h
index 66b2a62..61a0061 100644
--- a/libgcmd/gnome-cmd-file-info.h
+++ b/libgcmd/gnome-cmd-file-info.h
@@ -50,7 +50,7 @@ struct _GnomeCmdFileInfoClass
 
 GtkType gnome_cmd_file_info_get_type ();
 
-void gnome_cmd_file_info_setup (GnomeCmdFileInfo *finfo, GnomeVFSURI *uri, GnomeVFSFileInfo *info);
+void gnome_cmd_file_info_setup (GnomeCmdFileInfo *f, GnomeVFSURI *uri, GnomeVFSFileInfo *info);
 
 G_END_DECLS
 
diff --git a/src/gnome-cmd-advrename-lexer.h b/src/gnome-cmd-advrename-lexer.h
index 64e868c..04138f7 100644
--- a/src/gnome-cmd-advrename-lexer.h
+++ b/src/gnome-cmd-advrename-lexer.h
@@ -25,7 +25,7 @@
 
 void gnome_cmd_advrename_reset_counter(long start=1, int precision=-1, int step=1);
 void gnome_cmd_advrename_parse_template(const char *template_string, gboolean &has_counters);
-char *gnome_cmd_advrename_gen_fname(char *new_fname, size_t new_fname_size, GnomeCmdFile *finfo);
+char *gnome_cmd_advrename_gen_fname(char *new_fname, size_t new_fname_size, GnomeCmdFile *f);
 
 
 #endif // __GNOME_CMD_ADVRENAME_LEXER_H__
diff --git a/src/gnome-cmd-app.h b/src/gnome-cmd-app.h
index b2fac6a..52f3db1 100644
--- a/src/gnome-cmd-app.h
+++ b/src/gnome-cmd-app.h
@@ -86,9 +86,9 @@ void gnome_cmd_app_set_requires_terminal (GnomeCmdApp *app, gboolean requires_te
 
 GnomeCmdPixmap *gnome_cmd_app_get_pixmap (GnomeCmdApp *app);
 
-inline GnomeVFSMimeApplication *gnome_cmd_app_get_default_application (GnomeCmdFile *finfo)
+inline GnomeVFSMimeApplication *gnome_cmd_app_get_default_application (GnomeCmdFile *f)
 {
-    return finfo && finfo->info->mime_type ? gnome_vfs_mime_get_default_application (finfo->info->mime_type) : NULL;
+    return f && f->info->mime_type ? gnome_vfs_mime_get_default_application (f->info->mime_type) : NULL;
 }
 
 #endif // __GNOME_CMD_APP_H__
diff --git a/src/gnome-cmd-chmod-dialog.cc b/src/gnome-cmd-chmod-dialog.cc
index acda7b4..1a870df 100644
--- a/src/gnome-cmd-chmod-dialog.cc
+++ b/src/gnome-cmd-chmod-dialog.cc
@@ -49,7 +49,7 @@ static gchar *recurse_opts[CHMOD_MAX] = {
 struct GnomeCmdChmodDialogPrivate
 {
     GList *files;
-    GnomeCmdFile *finfo;
+    GnomeCmdFile *f;
     GnomeVFSFilePermissions perms;
 
     GtkWidget *chmod_component;
@@ -89,12 +89,12 @@ static void do_chmod (GnomeCmdFile *in_finfo, GnomeVFSFilePermissions perm,
 
         for (GList *tmp = files; tmp; tmp = tmp->next)
         {
-            GnomeCmdFile *finfo = (GnomeCmdFile *) tmp->data;
-            if (strcmp (finfo->info->name, ".") != 0
-                && strcmp (finfo->info->name, "..") != 0
-                && !GNOME_VFS_FILE_INFO_SYMLINK(finfo->info))
+            GnomeCmdFile *f = (GnomeCmdFile *) tmp->data;
+            if (strcmp (f->info->name, ".") != 0
+                && strcmp (f->info->name, "..") != 0
+                && !GNOME_VFS_FILE_INFO_SYMLINK(f->info))
             {
-                do_chmod (finfo, perm, TRUE, mode);
+                do_chmod (f, perm, TRUE, mode);
             }
         }
         gnome_cmd_dir_unref (dir);
@@ -106,13 +106,13 @@ inline void do_chmod_files (GnomeCmdChmodDialog *dialog)
 {
     for (GList *tmp = dialog->priv->files; tmp; tmp = tmp->next)
     {
-        GnomeCmdFile *finfo = (GnomeCmdFile *) tmp->data;
+        GnomeCmdFile *f = (GnomeCmdFile *) tmp->data;
         gboolean recursive = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->recurse_check));
         const gchar *mode_text = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (dialog->priv->recurse_combo)->entry));
         ChmodRecursiveMode mode = strcmp (mode_text, recurse_opts[CHMOD_ALL_FILES]) == 0 ? CHMOD_ALL_FILES :
                                                                                            CHMOD_DIRS_ONLY;
 
-        do_chmod (finfo, dialog->priv->perms, recursive, mode);
+        do_chmod (f, dialog->priv->perms, recursive, mode);
         view_refresh (NULL, NULL);
     }
 }
@@ -244,10 +244,10 @@ GtkWidget *gnome_cmd_chmod_dialog_new (GList *files)
     GnomeCmdChmodDialog *dialog = (GnomeCmdChmodDialog *) gtk_type_new (gnome_cmd_chmod_dialog_get_type ());
     dialog->priv->files = gnome_cmd_file_list_copy (files);
 
-    dialog->priv->finfo = (GnomeCmdFile *) dialog->priv->files->data;
-    g_return_val_if_fail (dialog->priv->finfo != NULL, NULL);
+    dialog->priv->f = (GnomeCmdFile *) dialog->priv->files->data;
+    g_return_val_if_fail (dialog->priv->f != NULL, NULL);
 
-    dialog->priv->perms = dialog->priv->finfo->info->permissions;
+    dialog->priv->perms = dialog->priv->f->info->permissions;
 
     show_perms (dialog);
 
diff --git a/src/gnome-cmd-chown-dialog.cc b/src/gnome-cmd-chown-dialog.cc
index c252ce1..7afb7de 100644
--- a/src/gnome-cmd-chown-dialog.cc
+++ b/src/gnome-cmd-chown-dialog.cc
@@ -75,12 +75,12 @@ static void do_chown (GnomeCmdFile *in_finfo, uid_t uid, gid_t gid, gboolean rec
 
         for (tmp = files; tmp; tmp = tmp->next)
         {
-            GnomeCmdFile *finfo = (GnomeCmdFile *) tmp->data;
-            if (strcmp (finfo->info->name, ".") != 0
-                && strcmp (finfo->info->name, "..") != 0
-                && !GNOME_VFS_FILE_INFO_SYMLINK(finfo->info))
+            GnomeCmdFile *f = (GnomeCmdFile *) tmp->data;
+            if (strcmp (f->info->name, ".") != 0
+                && strcmp (f->info->name, "..") != 0
+                && !GNOME_VFS_FILE_INFO_SYMLINK(f->info))
             {
-                do_chown (finfo, uid, gid, TRUE);
+                do_chown (f, uid, gid, TRUE);
             }
         }
         gnome_cmd_dir_unref (dir);
@@ -106,12 +106,12 @@ static void on_ok (GtkButton *button, GnomeCmdChownDialog *dialog)
 
     for (GList *tmp = dialog->priv->files; tmp; tmp = tmp->next)
     {
-        GnomeCmdFile *finfo = (GnomeCmdFile *) tmp->data;
+        GnomeCmdFile *f = (GnomeCmdFile *) tmp->data;
 
-        g_return_if_fail (finfo != NULL);
+        g_return_if_fail (f != NULL);
 
-        if (GNOME_VFS_FILE_INFO_LOCAL (finfo->info))
-            do_chown (finfo, uid, gid, recurse);
+        if (GNOME_VFS_FILE_INFO_LOCAL (f->info))
+            do_chown (f, uid, gid, recurse);
     }
 
     view_refresh (NULL, NULL);
@@ -209,9 +209,9 @@ gnome_cmd_chown_dialog_new (GList *files)
 
     GnomeCmdChownDialog *dialog = (GnomeCmdChownDialog *) gtk_type_new (gnome_cmd_chown_dialog_get_type ());
     dialog->priv->files = gnome_cmd_file_list_copy (files);
-    GnomeCmdFile *finfo = GNOME_CMD_FILE (dialog->priv->files->data);
+    GnomeCmdFile *f = GNOME_CMD_FILE (dialog->priv->files->data);
 
-    gnome_cmd_chown_component_set (GNOME_CMD_CHOWN_COMPONENT (dialog->priv->chown_component), finfo->info->uid, finfo->info->gid);
+    gnome_cmd_chown_component_set (GNOME_CMD_CHOWN_COMPONENT (dialog->priv->chown_component), f->info->uid, f->info->gid);
 
     return GTK_WIDGET (dialog);
 }
diff --git a/src/gnome-cmd-delete-dialog.cc b/src/gnome-cmd-delete-dialog.cc
index 807f24c..71a54d1 100644
--- a/src/gnome-cmd-delete-dialog.cc
+++ b/src/gnome-cmd-delete-dialog.cc
@@ -222,11 +222,11 @@ static gboolean update_delete_status_widgets (DeleteData *data)
         if (data->files)
             for (GList *tmp = data->files; tmp; tmp = tmp->next)
             {
-                GnomeCmdFile *finfo = GNOME_CMD_FILE (tmp->data);
-                GnomeVFSURI *uri = gnome_cmd_file_get_uri (finfo);
+                GnomeCmdFile *f = GNOME_CMD_FILE (tmp->data);
+                GnomeVFSURI *uri = gnome_cmd_file_get_uri (f);
 
                 if (!gnome_vfs_uri_exists (uri))
-                    gnome_cmd_file_is_deleted (finfo);
+                    gnome_cmd_file_is_deleted (f);
             }
 
         gtk_widget_destroy (data->progwin);
@@ -267,12 +267,12 @@ void gnome_cmd_delete_dialog_show (GList *files)
 
         if (n_files == 1)
         {
-            GnomeCmdFile *finfo = (GnomeCmdFile *) g_list_nth_data (files, 0);
+            GnomeCmdFile *f = (GnomeCmdFile *) g_list_nth_data (files, 0);
 
-            if (strcmp (finfo->info->name, "..") == 0)
+            if (strcmp (f->info->name, "..") == 0)
                 return;
 
-            gchar *fname = get_utf8 (finfo->info->name);
+            gchar *fname = get_utf8 (f->info->name);
             msg = g_strdup_printf (_("Do you want to delete \"%s\"?"), fname);
             g_free (fname);
         }
diff --git a/src/gnome-cmd-dir.h b/src/gnome-cmd-dir.h
index f65e532..4d02aa2 100644
--- a/src/gnome-cmd-dir.h
+++ b/src/gnome-cmd-dir.h
@@ -141,7 +141,7 @@ GnomeVFSURI *gnome_cmd_dir_get_absolute_path_uri (GnomeCmdDir *dir, std::string
 void gnome_cmd_dir_file_created (GnomeCmdDir *dir, const gchar *uri_str);
 void gnome_cmd_dir_file_deleted (GnomeCmdDir *dir, const gchar *uri_str);
 void gnome_cmd_dir_file_changed (GnomeCmdDir *dir, const gchar *uri_str);
-void gnome_cmd_dir_file_renamed (GnomeCmdDir *dir, GnomeCmdFile *finfo, const gchar *old_uri_str);
+void gnome_cmd_dir_file_renamed (GnomeCmdDir *dir, GnomeCmdFile *f, const gchar *old_uri_str);
 gboolean gnome_cmd_dir_uses_fam (GnomeCmdDir *dir);
 
 void gnome_cmd_dir_start_monitoring (GnomeCmdDir *dir);
diff --git a/src/gnome-cmd-file-list.h b/src/gnome-cmd-file-list.h
index 7334b31..bda1e14 100644
--- a/src/gnome-cmd-file-list.h
+++ b/src/gnome-cmd-file-list.h
@@ -163,7 +163,7 @@ struct GnomeCmdFileListClass
 {
     GnomeCmdCListClass parent_class;
 
-    void (* file_clicked)        (GnomeCmdFileList *fl, GnomeCmdFile *finfo, GdkEventButton *button);
+    void (* file_clicked)        (GnomeCmdFileList *fl, GnomeCmdFile *f, GdkEventButton *button);
     void (* list_clicked)        (GnomeCmdFileList *fl, GdkEventButton *button);
     void (* empty_space_clicked) (GnomeCmdFileList *fl, GdkEventButton *button);
     void (* files_changed)       (GnomeCmdFileList *fl);
diff --git a/src/gnome-cmd-file-props-dialog.h b/src/gnome-cmd-file-props-dialog.h
index e692f3c..0e115a9 100644
--- a/src/gnome-cmd-file-props-dialog.h
+++ b/src/gnome-cmd-file-props-dialog.h
@@ -23,6 +23,6 @@
 
 #include "gnome-cmd-file.h"
 
-GtkWidget *gnome_cmd_file_props_dialog_create (GnomeCmdFile *finfo);
+GtkWidget *gnome_cmd_file_props_dialog_create (GnomeCmdFile *f);
 
 #endif // __GNOME_CMD_FILE_PROPS_DIALOG_H__
diff --git a/src/gnome-cmd-make-copy-dialog.h b/src/gnome-cmd-make-copy-dialog.h
index 60184ab..bbd922d 100644
--- a/src/gnome-cmd-make-copy-dialog.h
+++ b/src/gnome-cmd-make-copy-dialog.h
@@ -47,7 +47,7 @@ struct GnomeCmdMakeCopyDialogClass
 };
 
 
-GtkWidget *gnome_cmd_make_copy_dialog_new (GnomeCmdFile *finfo, GnomeCmdDir *dir);
+GtkWidget *gnome_cmd_make_copy_dialog_new (GnomeCmdFile *f, GnomeCmdDir *dir);
 
 GtkType gnome_cmd_make_copy_dialog_get_type ();
 
diff --git a/src/gnome-cmd-rename-dialog.cc b/src/gnome-cmd-rename-dialog.cc
index f668ae7..715b35b 100644
--- a/src/gnome-cmd-rename-dialog.cc
+++ b/src/gnome-cmd-rename-dialog.cc
@@ -32,7 +32,7 @@ using namespace std;
 
 struct GnomeCmdRenameDialogPrivate
 {
-    GnomeCmdFile *finfo;
+    GnomeCmdFile *f;
     GnomeCmdMainWin *mw;
     GtkEntry *textbox;
 };
@@ -52,7 +52,7 @@ static gboolean on_dialog_keypressed (GtkWidget *widget, GdkEventKey *event, gpo
     switch (event->keyval)
     {
         case GDK_Escape:
-            gnome_cmd_file_unref (dialog->priv->finfo);
+            gnome_cmd_file_unref (dialog->priv->f);
             gtk_widget_destroy(widget);
             return TRUE;
 
@@ -60,12 +60,12 @@ static gboolean on_dialog_keypressed (GtkWidget *widget, GdkEventKey *event, gpo
         case GDK_KP_Enter:
             {
                 gchar *new_fname = g_strdup (gtk_entry_get_text (dialog->priv->textbox));
-                GnomeVFSResult result = gnome_cmd_file_rename (dialog->priv->finfo, new_fname);
+                GnomeVFSResult result = gnome_cmd_file_rename (dialog->priv->f, new_fname);
 
                 if (result==GNOME_VFS_OK)
                     gnome_cmd_main_win_get_fs (main_win, ACTIVE)->file_list()->focus_file(new_fname, TRUE);
 
-                gnome_cmd_file_unref (dialog->priv->finfo);
+                gnome_cmd_file_unref (dialog->priv->f);
                 gtk_widget_destroy (widget);
 
                 if (result!=GNOME_VFS_OK)
@@ -89,7 +89,7 @@ static gboolean on_dialog_keypressed (GtkWidget *widget, GdkEventKey *event, gpo
 
 static gboolean on_focus_out (GtkWidget *widget, GdkEventKey *event)
 {
-    gnome_cmd_file_unref (GNOME_CMD_RENAME_DIALOG(widget)->priv->finfo);
+    gnome_cmd_file_unref (GNOME_CMD_RENAME_DIALOG(widget)->priv->f);
     gtk_widget_destroy (widget);
     return TRUE;
 }
@@ -139,14 +139,14 @@ static void init (GnomeCmdRenameDialog *dialog)
  * Public functions
  ***********************************/
 
-GtkWidget *gnome_cmd_rename_dialog_new (GnomeCmdFile *finfo, gint x, gint y, gint width, gint height)
+GtkWidget *gnome_cmd_rename_dialog_new (GnomeCmdFile *f, gint x, gint y, gint width, gint height)
 {
-    g_return_val_if_fail (finfo != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
 
     GnomeCmdRenameDialog *dialog = (GnomeCmdRenameDialog *) gtk_type_new (gnome_cmd_rename_dialog_get_type ());
 
-    dialog->priv->finfo = finfo;
-    gnome_cmd_file_ref (finfo);
+    dialog->priv->f = f;
+    gnome_cmd_file_ref (f);
 
     gtk_window_set_has_frame (GTK_WINDOW (dialog), 0);
     gtk_window_set_decorated (GTK_WINDOW (dialog), 0);
@@ -159,7 +159,7 @@ GtkWidget *gnome_cmd_rename_dialog_new (GnomeCmdFile *finfo, gint x, gint y, gin
     gtk_container_add (GTK_CONTAINER (dialog), GTK_WIDGET (dialog->priv->textbox));
     gtk_widget_set_style (GTK_WIDGET (dialog->priv->textbox), list_style);
 
-    gchar *fname = get_utf8 (gnome_cmd_file_get_name (finfo));
+    gchar *fname = get_utf8 (gnome_cmd_file_get_name (f));
 
     gtk_entry_set_text (dialog->priv->textbox, fname);
 
diff --git a/src/gnome-cmd-rename-dialog.h b/src/gnome-cmd-rename-dialog.h
index 460243c..690af71 100644
--- a/src/gnome-cmd-rename-dialog.h
+++ b/src/gnome-cmd-rename-dialog.h
@@ -48,7 +48,7 @@ struct GnomeCmdRenameDialogClass
 };
 
 
-GtkWidget *gnome_cmd_rename_dialog_new (GnomeCmdFile *finfo, gint x, gint y, gint width, gint height);
+GtkWidget *gnome_cmd_rename_dialog_new (GnomeCmdFile *f, gint x, gint y, gint width, gint height);
 
 GtkType gnome_cmd_rename_dialog_get_type ();
 
diff --git a/src/ls_colors.cc b/src/ls_colors.cc
index ad1d941..7e0a2fb 100644
--- a/src/ls_colors.cc
+++ b/src/ls_colors.cc
@@ -205,19 +205,19 @@ void ls_colors_init ()
 }
 
 
-LsColor *ls_colors_get (GnomeCmdFile *finfo)
+LsColor *ls_colors_get (GnomeCmdFile *f)
 {
-    if (finfo->info->symlink_name)
+    if (f->info->symlink_name)
         return type_colors[GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK];
 
     LsColor *col = NULL;
-    const gchar *ext = gnome_cmd_file_get_extension (finfo);
+    const gchar *ext = gnome_cmd_file_get_extension (f);
 
     if (ext)
         col = (LsColor *) g_hash_table_lookup (map, ext);
 
     if (!col)
-        col = type_colors[finfo->info->type];
+        col = type_colors[f->info->type];
 
     return col;
 }
diff --git a/src/ls_colors.h b/src/ls_colors.h
index dbccd13..bad95fd 100644
--- a/src/ls_colors.h
+++ b/src/ls_colors.h
@@ -31,6 +31,6 @@ struct LsColor
 };
 
 void     ls_colors_init ();
-LsColor *ls_colors_get (GnomeCmdFile *finfo);
+LsColor *ls_colors_get (GnomeCmdFile *f);
 
 #endif // __LS_COLORS_H__
diff --git a/src/utils.h b/src/utils.h
index fc1758a..a3bbd8f 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -113,7 +113,7 @@ const gchar *perm2numstring (GnomeVFSFilePermissions p, gchar *buf, guint max);
 const gchar *size2string (GnomeVFSFileSize size, GnomeCmdSizeDispMode size_disp_mode);
 const gchar *time2string (time_t t, const gchar *date_format);
 
-void mime_exec_single (GnomeCmdFile *finfo);
+void mime_exec_single (GnomeCmdFile *f);
 void mime_exec_multiple (GList *files, GnomeCmdApp *app);
 
 void clear_event_key (GdkEventKey *event);
@@ -188,8 +188,8 @@ inline void set_cursor_default_for_widget (GtkWidget *widget)
 void set_cursor_busy ();
 void set_cursor_default ();
 
-GList *app_get_linked_libs (GnomeCmdFile *finfo);
-gboolean app_needs_terminal (GnomeCmdFile *finfo);
+GList *app_get_linked_libs (GnomeCmdFile *f);
+gboolean app_needs_terminal (GnomeCmdFile *f);
 
 gchar *get_temp_download_filepath (const gchar *fname);
 void remove_temp_download_dir ();
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]