[gnome-commander] noop: Variable and function renaming
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] noop: Variable and function renaming
- Date: Sun, 24 Jan 2021 16:41:06 +0000 (UTC)
commit 527a31e837561d105688b88ca3fb09661af4d699
Author: Uwe Scholz <u scholz83 gmx de>
Date: Sat Jan 23 18:34:08 2021 +0100
noop: Variable and function renaming
src/gnome-cmd-file-popmenu.cc | 20 ++++++++++----------
src/gnome-cmd-file-popmenu.h | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/gnome-cmd-file-popmenu.cc b/src/gnome-cmd-file-popmenu.cc
index a3baad34..14524dd4 100644
--- a/src/gnome-cmd-file-popmenu.cc
+++ b/src/gnome-cmd-file-popmenu.cc
@@ -394,7 +394,7 @@ static void add_fav_app_menu_item (GtkUIManager *uiManager, guint mergeIdFavApp,
}
-guint32 get_gfile_type(GFile *gFile)
+guint32 get_gfile_standard_type(GFile *gFile)
{
GError *error;
error = nullptr;
@@ -425,8 +425,8 @@ inline gboolean fav_app_matches_files (GnomeCmdApp *app, GList *files)
case APP_TARGET_ALL_DIRS:
for (; files; files = files->next)
{
- auto f = static_cast<GnomeCmdFile*> (files->data);
- if (get_gfile_type(f->gFile) != G_FILE_TYPE_DIRECTORY)
+ auto gnomeCmdFile = static_cast<GnomeCmdFile*> (files->data);
+ if (get_gfile_standard_type(gnomeCmdFile->gFile) != G_FILE_TYPE_DIRECTORY)
return FALSE;
}
return TRUE;
@@ -434,8 +434,8 @@ inline gboolean fav_app_matches_files (GnomeCmdApp *app, GList *files)
case APP_TARGET_ALL_FILES:
for (; files; files = files->next)
{
- auto f = static_cast<GnomeCmdFile*> (files->data);
- if (get_gfile_type(f->gFile) != G_FILE_TYPE_REGULAR)
+ auto gnomeCmdFile = static_cast<GnomeCmdFile*> (files->data);
+ if (get_gfile_standard_type(gnomeCmdFile->gFile) != G_FILE_TYPE_REGULAR)
return FALSE;
}
return TRUE;
@@ -443,8 +443,8 @@ inline gboolean fav_app_matches_files (GnomeCmdApp *app, GList *files)
case APP_TARGET_ALL_DIRS_AND_FILES:
for (; files; files = files->next)
{
- auto f = static_cast<GnomeCmdFile*> (files->data);
- auto gFileType = get_gfile_type(f->gFile);
+ auto gnomeCmdFile = static_cast<GnomeCmdFile*> (files->data);
+ auto gFileType = get_gfile_standard_type(gnomeCmdFile->gFile);
if (gFileType != G_FILE_TYPE_REGULAR && gFileType != G_FILE_TYPE_DIRECTORY)
return FALSE;
}
@@ -460,8 +460,8 @@ inline gboolean fav_app_matches_files (GnomeCmdApp *app, GList *files)
gint fn_flags = FNM_NOESCAPE;
#endif
- auto f = static_cast<GnomeCmdFile*> (files->data);
- if (get_gfile_type(f->gFile) != G_FILE_TYPE_REGULAR)
+ auto gnomeCmdFile = static_cast<GnomeCmdFile*> (files->data);
+ if (get_gfile_standard_type(gnomeCmdFile->gFile) != G_FILE_TYPE_REGULAR)
return FALSE;
// Check that the file matches at least one pattern
@@ -469,7 +469,7 @@ inline gboolean fav_app_matches_files (GnomeCmdApp *app, GList *files)
for (; patterns; patterns = patterns->next)
{
auto pattern = (gchar *) patterns->data;
- ok |= fnmatch (pattern, f->info->name, fn_flags) == 0;
+ ok |= fnmatch (pattern, gnomeCmdFile->info->name, fn_flags) == 0;
}
if (!ok) return FALSE;
diff --git a/src/gnome-cmd-file-popmenu.h b/src/gnome-cmd-file-popmenu.h
index b441d794..f8c95f73 100644
--- a/src/gnome-cmd-file-popmenu.h
+++ b/src/gnome-cmd-file-popmenu.h
@@ -57,4 +57,4 @@ GtkUIManager *get_file_popup_ui_manager (GnomeCmdFileList *gnomeCmdFileList);
guint add_open_with_entries (GtkUIManager *ui_manager, GnomeCmdFileList *gnomeCmdFileList);
guint add_action_script_entries(GtkUIManager *uiManager, GList *files);
void add_execute_entry(GtkUIManager *ui_manager, GnomeCmdFileList *gnomeCmdFileList);
-guint32 get_gfile_type(GFile *gFile);
+guint32 get_gfile_standard_type(GFile *gFile);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]