GNOME.org
 

[gnome-commander] noop: code cleanup

commit 8d829c10ae412c42c4f71acf7faaeb2e54997fee
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Wed Feb 10 18:46:07 2010 +0100

    noop: code cleanup

 libgcmd/gnome-cmd-file-info.cc   |   38 ++----
 libgcmd/gnome-cmd-file-info.h    |    9 ++-
 src/gnome-cmd-file-collection.cc |   20 ++--
 src/gnome-cmd-file-collection.h  |    4 +-
 src/gnome-cmd-file-list.cc       |    4 +-
 src/gnome-cmd-file-selector.cc   |    6 +-
 src/gnome-cmd-file.cc            |  234 +++++++++++++++++++-------------------
 src/gnome-cmd-file.h             |   10 +-
 8 files changed, 159 insertions(+), 166 deletions(-)
---
diff --git a/libgcmd/gnome-cmd-file-info.cc b/libgcmd/gnome-cmd-file-info.cc
index 847fab4..7690578 100644
--- a/libgcmd/gnome-cmd-file-info.cc
+++ b/libgcmd/gnome-cmd-file-info.cc
@@ -36,24 +36,22 @@ struct _GnomeCmdFileInfoPrivate
  * Gtk class implementation
  *******************************/
 
-static void
-destroy (GtkObject *object)
+static void destroy (GtkObject *object)
 {
-    GnomeCmdFileInfo *file = GNOME_CMD_FILE_INFO (object);
+    GnomeCmdFileInfo *f = GNOME_CMD_FILE_INFO (object);
 
-    gnome_vfs_file_info_unref (file->info);
-    if (file->uri)
-        gnome_vfs_uri_unref (file->uri);
+    gnome_vfs_file_info_unref (f->info);
+    if (f->uri)
+        gnome_vfs_uri_unref (f->uri);
 
-    g_free (file->priv);
+    g_free (f->priv);
 
     if (GTK_OBJECT_CLASS (parent_class)->destroy)
         (*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
 
 
-static void
-class_init (GnomeCmdFileInfoClass *klass)
+static void class_init (GnomeCmdFileInfoClass *klass)
 {
     GtkObjectClass *object_class;
 
@@ -64,13 +62,12 @@ class_init (GnomeCmdFileInfoClass *klass)
 }
 
 
-static void
-init (GnomeCmdFileInfo *file)
+static void init (GnomeCmdFileInfo *f)
 {
-    file->info = NULL;
-    file->uri = NULL;
+    f->info = NULL;
+    f->uri = NULL;
 
-    file->priv = g_new0 (GnomeCmdFileInfoPrivate, 1);
+    f->priv = g_new0 (GnomeCmdFileInfoPrivate, 1);
 }
 
 
@@ -78,8 +75,7 @@ init (GnomeCmdFileInfo *file)
  * Public functions
  ***********************************/
 
-GtkType
-gnome_cmd_file_info_get_type ()
+GtkType gnome_cmd_file_info_get_type ()
 {
     static GtkType type = 0;
 
@@ -101,13 +97,3 @@ gnome_cmd_file_info_get_type ()
     }
     return type;
 }
-
-
-void
-gnome_cmd_file_info_setup (GnomeCmdFileInfo *f, GnomeVFSURI *uri, GnomeVFSFileInfo *info)
-{
-    g_return_if_fail (GNOME_CMD_IS_FILE_INFO (f));
-
-    f->info = info;
-    f->uri = uri;
-}
diff --git a/libgcmd/gnome-cmd-file-info.h b/libgcmd/gnome-cmd-file-info.h
index cbf87cc..d492104 100644
--- a/libgcmd/gnome-cmd-file-info.h
+++ b/libgcmd/gnome-cmd-file-info.h
@@ -48,6 +48,13 @@ struct _GnomeCmdFileInfoClass
 
 GtkType gnome_cmd_file_info_get_type ();
 
-void gnome_cmd_file_info_setup (GnomeCmdFileInfo *f, GnomeVFSURI *uri, GnomeVFSFileInfo *info);
+
+inline void gnome_cmd_file_info_setup (GnomeCmdFileInfo *f, GnomeVFSURI *uri, GnomeVFSFileInfo *info)
+{
+    g_return_if_fail (GNOME_CMD_IS_FILE_INFO (f));
+
+    f->info = info;
+    f->uri = uri;
+}
 
 #endif //__GNOME_CMD_FILE_INFO_H__
diff --git a/src/gnome-cmd-file-collection.cc b/src/gnome-cmd-file-collection.cc
index 3a4a56f..723512f 100644
--- a/src/gnome-cmd-file-collection.cc
+++ b/src/gnome-cmd-file-collection.cc
@@ -26,25 +26,25 @@
 using namespace std;
 
 
-void GnomeCmdFileCollection::add(GnomeCmdFile *file)
+void GnomeCmdFileCollection::add(GnomeCmdFile *f)
 {
-    g_return_if_fail (GNOME_CMD_IS_FILE (file));
+    g_return_if_fail (GNOME_CMD_IS_FILE (f));
 
-    list = g_list_append (list, file);
+    list = g_list_append (list, f);
 
-    gchar *uri_str = gnome_cmd_file_get_uri_str (file);
-    g_hash_table_insert (map, uri_str, file);
-    gnome_cmd_file_ref (file);
+    gchar *uri_str = gnome_cmd_file_get_uri_str (f);
+    g_hash_table_insert (map, uri_str, f);
+    gnome_cmd_file_ref (f);
 }
 
 
-gboolean GnomeCmdFileCollection::remove(GnomeCmdFile *file)
+gboolean GnomeCmdFileCollection::remove(GnomeCmdFile *f)
 {
-    g_return_val_if_fail (GNOME_CMD_IS_FILE (file), FALSE);
+    g_return_val_if_fail (GNOME_CMD_IS_FILE (f), FALSE);
 
-    list = g_list_remove (list, file);
+    list = g_list_remove (list, f);
 
-    gchar *uri_str = gnome_cmd_file_get_uri_str (file);
+    gchar *uri_str = gnome_cmd_file_get_uri_str (f);
     gboolean retval = g_hash_table_remove (map, uri_str);
     g_free (uri_str);
 
diff --git a/src/gnome-cmd-file-collection.h b/src/gnome-cmd-file-collection.h
index 71ad485..68733dd 100644
--- a/src/gnome-cmd-file-collection.h
+++ b/src/gnome-cmd-file-collection.h
@@ -39,9 +39,9 @@ class GnomeCmdFileCollection
     gboolean empty()    {  return list==NULL;            }
     void clear();
 
-    void add(GnomeCmdFile *file);
+    void add(GnomeCmdFile *f);
     void add(GList *files);
-    gboolean remove(GnomeCmdFile *file);
+    gboolean remove(GnomeCmdFile *f);
     gboolean remove(const gchar *uri_str);
 
     GList *get_list()   {  return list;  }
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index 8f36604..733b276 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -1688,9 +1688,9 @@ GList *GnomeCmdFileList::get_selected_files()
     if (priv->selected_files)
         return g_list_copy (priv->selected_files);
 
-    GnomeCmdFile *file = get_selected_file();
+    GnomeCmdFile *f = get_selected_file();
 
-    return file ? g_list_append (NULL, file) : NULL;
+    return f ? g_list_append (NULL, f) : NULL;
 }
 
 
diff --git a/src/gnome-cmd-file-selector.cc b/src/gnome-cmd-file-selector.cc
index 1efa56b..3649baa 100644
--- a/src/gnome-cmd-file-selector.cc
+++ b/src/gnome-cmd-file-selector.cc
@@ -1463,10 +1463,10 @@ void gnome_cmd_file_selector_set_directory_to_opposite (GnomeCmdMainWin *mw, Fil
 
     if (!fs_is_active)
     {
-        GnomeCmdFile *file = other->file_list()->get_selected_file();
+        GnomeCmdFile *f = other->file_list()->get_selected_file();
 
-        if (file && file->info->type==GNOME_VFS_FILE_TYPE_DIRECTORY)
-            dir = gnome_cmd_dir_new_from_info (file->info, dir);
+        if (f && f->info->type==GNOME_VFS_FILE_TYPE_DIRECTORY)
+            dir = gnome_cmd_dir_new_from_info (f->info, dir);
     }
 
     set_connection (fs, other->get_connection(), dir);
diff --git a/src/gnome-cmd-file.cc b/src/gnome-cmd-file.cc
index ceec416..a84933e 100644
--- a/src/gnome-cmd-file.cc
+++ b/src/gnome-cmd-file.cc
@@ -79,25 +79,25 @@ inline GnomeCmdDir *get_parent_dir (GnomeCmdFile *f)
 
 static void destroy (GtkObject *object)
 {
-    GnomeCmdFile *file = GNOME_CMD_FILE (object);
+    GnomeCmdFile *f = GNOME_CMD_FILE (object);
 
-    delete file->metadata;
+    delete f->metadata;
 
-    if (file->info->name[0] != '.')
-        DEBUG ('f', "file destroying 0x%p %s\n", file, file->info->name);
+    if (f->info->name[0] != '.')
+        DEBUG ('f', "file destroying 0x%p %s\n", f, f->info->name);
 
-    g_free (file->collate_key);
-    gnome_vfs_file_info_unref (file->info);
-    if (file->priv->dir_handle)
-        handle_unref (file->priv->dir_handle);
+    g_free (f->collate_key);
+    gnome_vfs_file_info_unref (f->info);
+    if (f->priv->dir_handle)
+        handle_unref (f->priv->dir_handle);
 
     if (DEBUG_ENABLED ('c'))
     {
-        all_files = g_list_remove (all_files, file);
+        all_files = g_list_remove (all_files, f);
         deleted_files_cnt++;
     }
 
-    g_free (file->priv);
+    g_free (f->priv);
 
     if (GTK_OBJECT_CLASS (parent_class)->destroy)
         (*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
@@ -114,24 +114,24 @@ static void class_init (GnomeCmdFileClass *klass)
 }
 
 
-static void init (GnomeCmdFile *file)
+static void init (GnomeCmdFile *f)
 {
-    file->info = NULL;
-    file->collate_key = NULL;
+    f->info = NULL;
+    f->collate_key = NULL;
 
-    file->priv = g_new0 (GnomeCmdFilePrivate, 1);
-    file->priv->dir_handle = NULL;
+    f->priv = g_new0 (GnomeCmdFilePrivate, 1);
+    f->priv->dir_handle = NULL;
 
-    file->priv->tree_size = -1;
+    f->priv->tree_size = -1;
 
     if (DEBUG_ENABLED ('c'))
     {
-        all_files = g_list_append (all_files, file);
+        all_files = g_list_append (all_files, f);
         created_files_cnt++;
     }
 
-    file->priv->last_update.tv_sec = 0;
-    file->priv->last_update.tv_usec = 0;
+    f->priv->last_update.tv_sec = 0;
+    f->priv->last_update.tv_usec = 0;
 
 }
 
@@ -241,51 +241,51 @@ void gnome_cmd_file_setup (GnomeCmdFile *f, GnomeVFSFileInfo *info, GnomeCmdDir
 }
 
 
-GnomeCmdFile *gnome_cmd_file_ref (GnomeCmdFile *file)
+GnomeCmdFile *gnome_cmd_file_ref (GnomeCmdFile *f)
 {
-    g_return_val_if_fail (file != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
 
-    file->priv->ref_cnt++;
+    f->priv->ref_cnt++;
 
-    if (file->priv->ref_cnt == 1)
-        gtk_object_ref (GTK_OBJECT (file));
+    if (f->priv->ref_cnt == 1)
+        gtk_object_ref (GTK_OBJECT (f));
 
-    char c = GNOME_CMD_IS_DIR (file) ? 'd' : 'f';
+    char c = GNOME_CMD_IS_DIR (f) ? 'd' : 'f';
 
-    DEBUG (c, "refing: 0x%p %s to %d\n", file, file->info->name, file->priv->ref_cnt);
+    DEBUG (c, "refing: 0x%p %s to %d\n", f, f->info->name, f->priv->ref_cnt);
 
-    return file;
+    return f;
 }
 
 
-void gnome_cmd_file_unref (GnomeCmdFile *file)
+void gnome_cmd_file_unref (GnomeCmdFile *f)
 {
-    g_return_if_fail (file != NULL);
+    g_return_if_fail (f != NULL);
 
-    file->priv->ref_cnt--;
+    f->priv->ref_cnt--;
 
-    char c = GNOME_CMD_IS_DIR (file) ? 'd' : 'f';
+    char c = GNOME_CMD_IS_DIR (f) ? 'd' : 'f';
 
-    DEBUG (c, "un-refing: 0x%p %s to %d\n", file, file->info->name, file->priv->ref_cnt);
-    if (file->priv->ref_cnt < 1)
-        gtk_object_destroy (GTK_OBJECT (file));
+    DEBUG (c, "un-refing: 0x%p %s to %d\n", f, f->info->name, f->priv->ref_cnt);
+    if (f->priv->ref_cnt < 1)
+        gtk_object_destroy (GTK_OBJECT (f));
 }
 
 
-GnomeVFSResult gnome_cmd_file_chmod (GnomeCmdFile *file, GnomeVFSFilePermissions perm)
+GnomeVFSResult gnome_cmd_file_chmod (GnomeCmdFile *f, GnomeVFSFilePermissions perm)
 {
-    g_return_val_if_fail (file != NULL, GNOME_VFS_ERROR_CORRUPTED_DATA);
-    g_return_val_if_fail (file->info != NULL, GNOME_VFS_ERROR_CORRUPTED_DATA);
+    g_return_val_if_fail (f != NULL, GNOME_VFS_ERROR_CORRUPTED_DATA);
+    g_return_val_if_fail (f->info != NULL, GNOME_VFS_ERROR_CORRUPTED_DATA);
 
-    file->info->permissions = perm;
-    GnomeVFSURI *uri = gnome_cmd_file_get_uri (file);
-    GnomeVFSResult ret = gnome_vfs_set_file_info_uri (uri, file->info, GNOME_VFS_SET_FILE_INFO_PERMISSIONS);
+    f->info->permissions = perm;
+    GnomeVFSURI *uri = gnome_cmd_file_get_uri (f);
+    GnomeVFSResult ret = gnome_vfs_set_file_info_uri (uri, f->info, GNOME_VFS_SET_FILE_INFO_PERMISSIONS);
     gnome_vfs_uri_unref (uri);
 
-    if (has_parent_dir (file))
+    if (has_parent_dir (f))
     {
-        GnomeCmdDir *dir = get_parent_dir (file);
-        gchar *uri_str = gnome_cmd_file_get_uri_str (file);
+        GnomeCmdDir *dir = get_parent_dir (f);
+        gchar *uri_str = gnome_cmd_file_get_uri_str (f);
         gnome_cmd_dir_file_changed (dir, uri_str);
         g_free (uri_str);
     }
@@ -294,23 +294,23 @@ GnomeVFSResult gnome_cmd_file_chmod (GnomeCmdFile *file, GnomeVFSFilePermissions
 }
 
 
-GnomeVFSResult gnome_cmd_file_chown (GnomeCmdFile *file, uid_t uid, gid_t gid)
+GnomeVFSResult gnome_cmd_file_chown (GnomeCmdFile *f, uid_t uid, gid_t gid)
 {
-    g_return_val_if_fail (file != NULL, GNOME_VFS_ERROR_CORRUPTED_DATA);
-    g_return_val_if_fail (file->info != NULL, GNOME_VFS_ERROR_CORRUPTED_DATA);
+    g_return_val_if_fail (f != NULL, GNOME_VFS_ERROR_CORRUPTED_DATA);
+    g_return_val_if_fail (f->info != NULL, GNOME_VFS_ERROR_CORRUPTED_DATA);
 
     if (uid != -1)
-        file->info->uid = uid;
-    file->info->gid = gid;
+        f->info->uid = uid;
+    f->info->gid = gid;
 
-    GnomeVFSURI *uri = gnome_cmd_file_get_uri (file);
-    GnomeVFSResult ret = gnome_vfs_set_file_info_uri (uri, file->info, GNOME_VFS_SET_FILE_INFO_OWNER);
+    GnomeVFSURI *uri = gnome_cmd_file_get_uri (f);
+    GnomeVFSResult ret = gnome_vfs_set_file_info_uri (uri, f->info, GNOME_VFS_SET_FILE_INFO_OWNER);
     gnome_vfs_uri_unref (uri);
 
-    if (has_parent_dir (file))
+    if (has_parent_dir (f))
     {
-        GnomeCmdDir *dir = get_parent_dir (file);
-        gchar *uri_str = gnome_cmd_file_get_uri_str (file);
+        GnomeCmdDir *dir = get_parent_dir (f);
+        gchar *uri_str = gnome_cmd_file_get_uri_str (f);
         gnome_cmd_dir_file_changed (dir, uri_str);
         g_free (uri_str);
     }
@@ -355,12 +355,12 @@ GnomeVFSResult gnome_cmd_file_rename (GnomeCmdFile *f, const gchar *new_name)
 }
 
 
-gchar *gnome_cmd_file_get_quoted_name (GnomeCmdFile *file)
+gchar *gnome_cmd_file_get_quoted_name (GnomeCmdFile *f)
 {
-    g_return_val_if_fail (file != NULL, NULL);
-    g_return_val_if_fail (file->info != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
+    g_return_val_if_fail (f->info != NULL, NULL);
 
-    return quote_if_needed (file->info->name);
+    return quote_if_needed (f->info->name);
 }
 
 
@@ -470,48 +470,48 @@ gchar *gnome_cmd_file_get_uri_str (GnomeCmdFile *f, GnomeVFSURIHideOptions hide_
 }
 
 
-const gchar *gnome_cmd_file_get_extension (GnomeCmdFile *file)
+const gchar *gnome_cmd_file_get_extension (GnomeCmdFile *f)
 {
-    g_return_val_if_fail (file != NULL, NULL);
-    g_return_val_if_fail (file->info != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
+    g_return_val_if_fail (f->info != NULL, NULL);
 
-    if (file->info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
+    if (f->info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
         return NULL;
 
-    const char *s = strrchr (file->info->name, '.');        // does NOT work on UTF-8 strings, should be (MUCH SLOWER):
-    // const char *s = g_utf8_strrchr (file->info->name, -1, '.');
+    const char *s = strrchr (f->info->name, '.');        // does NOT work on UTF-8 strings, should be (MUCH SLOWER):
+    // const char *s = g_utf8_strrchr (f->info->name, -1, '.');
 
     return s ? s+1 : NULL;
 }
 
 
-const gchar *gnome_cmd_file_get_owner (GnomeCmdFile *file)
+const gchar *gnome_cmd_file_get_owner (GnomeCmdFile *f)
 {
-    g_return_val_if_fail (file != NULL, NULL);
-    g_return_val_if_fail (file->info != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
+    g_return_val_if_fail (f->info != NULL, NULL);
 
-    if (GNOME_VFS_FILE_INFO_LOCAL (file->info))
-        return gcmd_owner.get_name_by_uid(file->info->uid);
+    if (GNOME_VFS_FILE_INFO_LOCAL (f->info))
+        return gcmd_owner.get_name_by_uid(f->info->uid);
     else
     {
         static gchar owner_str[MAX_OWNER_LENGTH];
-        g_snprintf (owner_str, MAX_OWNER_LENGTH, "%d", file->info->uid);
+        g_snprintf (owner_str, MAX_OWNER_LENGTH, "%d", f->info->uid);
         return owner_str;
     }
 }
 
 
-const gchar *gnome_cmd_file_get_group (GnomeCmdFile *file)
+const gchar *gnome_cmd_file_get_group (GnomeCmdFile *f)
 {
-    g_return_val_if_fail (file != NULL, NULL);
-    g_return_val_if_fail (file->info != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
+    g_return_val_if_fail (f->info != NULL, NULL);
 
-    if (GNOME_VFS_FILE_INFO_LOCAL (file->info))
-        return gcmd_owner.get_name_by_gid(file->info->gid);
+    if (GNOME_VFS_FILE_INFO_LOCAL (f->info))
+        return gcmd_owner.get_name_by_gid(f->info->gid);
     else
     {
         static gchar group_str[MAX_GROUP_LENGTH];
-        g_snprintf (group_str, MAX_GROUP_LENGTH, "%d", file->info->gid);
+        g_snprintf (group_str, MAX_GROUP_LENGTH, "%d", f->info->gid);
         return group_str;
     }
 }
@@ -523,91 +523,91 @@ inline const gchar *date2string (time_t date, gboolean overide_disp_setting)
 }
 
 
-const gchar *gnome_cmd_file_get_adate (GnomeCmdFile *file, gboolean overide_disp_setting)
+const gchar *gnome_cmd_file_get_adate (GnomeCmdFile *f, gboolean overide_disp_setting)
 {
-    g_return_val_if_fail (file != NULL, NULL);
-    g_return_val_if_fail (file->info != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
+    g_return_val_if_fail (f->info != NULL, NULL);
 
-    return date2string (file->info->atime, overide_disp_setting);
+    return date2string (f->info->atime, overide_disp_setting);
 }
 
 
-const gchar *gnome_cmd_file_get_mdate (GnomeCmdFile *file, gboolean overide_disp_setting)
+const gchar *gnome_cmd_file_get_mdate (GnomeCmdFile *f, gboolean overide_disp_setting)
 {
-    g_return_val_if_fail (file != NULL, NULL);
-    g_return_val_if_fail (file->info != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
+    g_return_val_if_fail (f->info != NULL, NULL);
 
-    return date2string (file->info->mtime, overide_disp_setting);
+    return date2string (f->info->mtime, overide_disp_setting);
 }
 
 
-const gchar *gnome_cmd_file_get_cdate (GnomeCmdFile *file, gboolean overide_disp_setting)
+const gchar *gnome_cmd_file_get_cdate (GnomeCmdFile *f, gboolean overide_disp_setting)
 {
-    g_return_val_if_fail (file != NULL, NULL);
-    g_return_val_if_fail (file->info != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
+    g_return_val_if_fail (f->info != NULL, NULL);
 
-    return date2string (file->info->ctime, overide_disp_setting);
+    return date2string (f->info->ctime, overide_disp_setting);
 }
 
 
-const gchar *gnome_cmd_file_get_size (GnomeCmdFile *file)
+const gchar *gnome_cmd_file_get_size (GnomeCmdFile *f)
 {
     static gchar dir_indicator[] = "<DIR> ";
 
-    g_return_val_if_fail (file != NULL, NULL);
-    g_return_val_if_fail (file->info != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
+    g_return_val_if_fail (f->info != NULL, NULL);
 
-    if (file->info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
+    if (f->info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
         return dir_indicator;
 
-    return size2string (file->info->size, gnome_cmd_data.size_disp_mode);
+    return size2string (f->info->size, gnome_cmd_data.size_disp_mode);
 }
 
 
-GnomeVFSFileSize gnome_cmd_file_get_tree_size (GnomeCmdFile *file)
+GnomeVFSFileSize gnome_cmd_file_get_tree_size (GnomeCmdFile *f)
 {
-    g_return_val_if_fail (file != NULL, 0);
+    g_return_val_if_fail (f != NULL, 0);
 
-    if (file->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
-        return file->info->size;
+    if (f->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
+        return f->info->size;
 
-    if (strcmp (file->info->name, "..") == 0)
+    if (strcmp (f->info->name, "..") == 0)
         return 0;
 
-    if (file->priv->tree_size != -1)
-        return file->priv->tree_size;
+    if (f->priv->tree_size != -1)
+        return f->priv->tree_size;
 
-    GnomeVFSURI *uri = gnome_cmd_file_get_uri (file);
-    file->priv->tree_size = calc_tree_size (uri);
+    GnomeVFSURI *uri = gnome_cmd_file_get_uri (f);
+    f->priv->tree_size = calc_tree_size (uri);
     gnome_vfs_uri_unref (uri);
 
-    return file->priv->tree_size;
+    return f->priv->tree_size;
 }
 
 
-const gchar *gnome_cmd_file_get_tree_size_as_str (GnomeCmdFile *file)
+const gchar *gnome_cmd_file_get_tree_size_as_str (GnomeCmdFile *f)
 {
-    g_return_val_if_fail (file != NULL, NULL);
-    g_return_val_if_fail (file->info != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
+    g_return_val_if_fail (f->info != NULL, NULL);
 
-    if (file->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
-        return gnome_cmd_file_get_size (file);
+    if (f->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
+        return gnome_cmd_file_get_size (f);
 
-    if (strcmp (file->info->name, "..") == 0)
-        return gnome_cmd_file_get_size (file);
+    if (strcmp (f->info->name, "..") == 0)
+        return gnome_cmd_file_get_size (f);
 
-    return size2string (gnome_cmd_file_get_tree_size (file), gnome_cmd_data.size_disp_mode);
+    return size2string (gnome_cmd_file_get_tree_size (f), gnome_cmd_data.size_disp_mode);
 }
 
 
-const gchar *gnome_cmd_file_get_perm (GnomeCmdFile *file)
+const gchar *gnome_cmd_file_get_perm (GnomeCmdFile *f)
 {
     static gchar perm_str[MAX_PERM_LENGTH];
 
-    g_return_val_if_fail (file != NULL, NULL);
-    g_return_val_if_fail (file->info != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
+    g_return_val_if_fail (f->info != NULL, NULL);
 
-    perm2string (file->info->permissions, perm_str, MAX_PERM_LENGTH);
+    perm2string (f->info->permissions, perm_str, MAX_PERM_LENGTH);
     return perm_str;
 }
 
@@ -1002,15 +1002,15 @@ inline gulong tv2ms (const GTimeVal &t)
 }
 
 
-gboolean gnome_cmd_file_needs_update (GnomeCmdFile *file)
+gboolean gnome_cmd_file_needs_update (GnomeCmdFile *f)
 {
     GTimeVal t;
 
     g_get_current_time (&t);
 
-    if (tv2ms (t) - tv2ms (file->priv->last_update) > gnome_cmd_data.gui_update_rate)
+    if (tv2ms (t) - tv2ms (f->priv->last_update) > gnome_cmd_data.gui_update_rate)
     {
-        file->priv->last_update = t;
+        f->priv->last_update = t;
         return TRUE;
     }
 
diff --git a/src/gnome-cmd-file.h b/src/gnome-cmd-file.h
index cf6f9a3..aa834ca 100644
--- a/src/gnome-cmd-file.h
+++ b/src/gnome-cmd-file.h
@@ -66,15 +66,15 @@ GnomeVFSResult gnome_cmd_file_chmod (GnomeCmdFile *f, GnomeVFSFilePermissions pe
 GnomeVFSResult gnome_cmd_file_chown (GnomeCmdFile *f, uid_t uid, gid_t gid);
 GnomeVFSResult gnome_cmd_file_rename (GnomeCmdFile *f, const gchar *new_name);
 
-inline gchar *gnome_cmd_file_get_name (GnomeCmdFile *file)
+inline gchar *gnome_cmd_file_get_name (GnomeCmdFile *f)
 {
-    g_return_val_if_fail (file != NULL, NULL);
-    g_return_val_if_fail (file->info != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
+    g_return_val_if_fail (f->info != NULL, NULL);
 
-    return file->info->name;
+    return f->info->name;
 }
 
-gchar *gnome_cmd_file_get_quoted_name (GnomeCmdFile *file);
+gchar *gnome_cmd_file_get_quoted_name (GnomeCmdFile *f);
 
 gchar *gnome_cmd_file_get_path (GnomeCmdFile *f);
 gchar *gnome_cmd_file_get_real_path (GnomeCmdFile *f);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]