[gnome-commander] noop: Method rename
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] noop: Method rename
- Date: Thu, 6 Jan 2022 22:27:52 +0000 (UTC)
commit 208e025a00d4514ce0bdc4b069d118e5f18b1055
Author: Uwe Scholz <u scholz83 gmx de>
Date: Sun Dec 19 13:08:30 2021 +0100
noop: Method rename
src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc | 12 ++++++------
src/dialogs/gnome-cmd-prepare-xfer-dialog.cc | 2 +-
src/dialogs/gnome-cmd-search-dialog.cc | 2 +-
src/gnome-cmd-dir.cc | 2 +-
src/gnome-cmd-file-list.cc | 4 ++--
src/gnome-cmd-file-selector.cc | 2 +-
src/gnome-cmd-file.cc | 4 ++--
src/gnome-cmd-file.h | 2 +-
8 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc
b/src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc
index 9fbf18cc..4e7184f4 100644
--- a/src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc
+++ b/src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc
@@ -1,4 +1,4 @@
-/**
+/**
* @file gnome-cmd-manage-bookmarks-dialog.cc
* @copyright (C) 2001-2006 Marcus Bjurman\n
* @copyright (C) 2007-2012 Piotr Eljasiak\n
@@ -214,7 +214,7 @@ static GtkTreeModel *create_and_fill_model (GtkTreePath *¤t_group)
G_TYPE_STRING,
G_TYPE_POINTER);
fill_tree (store, current_group);
-
+
return GTK_TREE_MODEL (store);
}
@@ -364,9 +364,9 @@ static void remove_clicked_callback (GtkButton *button, GtkWidget *bm_view)
g_free (bookmark->name);
g_free (bookmark->path);
g_free (bookmark);
-
+
main_win->update_bookmarks ();
-
+
gnome_cmd_data.save_bookmarks ();
}
}
@@ -536,7 +536,7 @@ void gnome_cmd_bookmark_goto (GnomeCmdBookmark *bookmark)
void gnome_cmd_bookmark_add_current (GnomeCmdDir *dir)
{
- gchar *path = gnome_cmd_dir_is_local (dir) ? GNOME_CMD_FILE (dir)->get_real_path () : GNOME_CMD_FILE
(dir)->get_path();
+ gchar *path = gnome_cmd_dir_is_local (dir) ? GNOME_CMD_FILE (dir)->get_real_path () : GNOME_CMD_FILE
(dir)->GetPathStringThroughParent();
if (!g_utf8_validate (path, -1, NULL))
{
@@ -560,7 +560,7 @@ void gnome_cmd_bookmark_add_current (GnomeCmdDir *dir)
group->bookmarks = g_list_append (group->bookmarks, bookmark);
main_win->update_bookmarks();
-
+
gnome_cmd_data.save_bookmarks ();
}
else
diff --git a/src/dialogs/gnome-cmd-prepare-xfer-dialog.cc b/src/dialogs/gnome-cmd-prepare-xfer-dialog.cc
index 498b0ff0..cae236f8 100644
--- a/src/dialogs/gnome-cmd-prepare-xfer-dialog.cc
+++ b/src/dialogs/gnome-cmd-prepare-xfer-dialog.cc
@@ -93,7 +93,7 @@ static void on_ok (GtkButton *button, GnomeCmdPrepareXferDialog *dialog)
}
else
{
- gchar *t = GNOME_CMD_FILE (dialog->src_fs->get_directory())->get_path();
+ gchar *t = GNOME_CMD_FILE (dialog->src_fs->get_directory())->GetPathStringThroughParent();
dest_path = g_build_filename (t, user_path, NULL);
g_free (t);
}
diff --git a/src/dialogs/gnome-cmd-search-dialog.cc b/src/dialogs/gnome-cmd-search-dialog.cc
index d9af5b48..14939599 100644
--- a/src/dialogs/gnome-cmd-search-dialog.cc
+++ b/src/dialogs/gnome-cmd-search-dialog.cc
@@ -768,7 +768,7 @@ void GnomeCmdSearchDialog::Private::on_dialog_response(GtkDialog *window, int re
GnomeCmdFileSelector *fs = main_win->fs(ACTIVE);
GnomeCmdCon *con = fs->get_connection();
- gchar *fpath = f->get_path();
+ gchar *fpath = f->GetPathStringThroughParent();
gsize offset = strncmp(fpath, gnome_cmd_con_get_root_path (con), con->root_path->len)==0 ?
con->root_path->len : 0;
gchar *dpath = g_path_get_dirname (fpath + offset);
diff --git a/src/gnome-cmd-dir.cc b/src/gnome-cmd-dir.cc
index b9d5401c..4e411bff 100644
--- a/src/gnome-cmd-dir.cc
+++ b/src/gnome-cmd-dir.cc
@@ -571,7 +571,7 @@ void gnome_cmd_dir_list_files (GnomeCmdDir *dir, gboolean visualProgress)
if (!dir->priv->files || gnome_cmd_dir_is_local (dir))
{
- gchar *path = GNOME_CMD_FILE (dir)->get_path();
+ gchar *path = GNOME_CMD_FILE (dir)->GetPathStringThroughParent();
DEBUG ('l', "relisting files for 0x%x %s %d\n",
dir,
path,
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index fbc2b7e6..95b9dbbc 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -340,7 +340,7 @@ FileFormatData::FileFormatData(GnomeCmdFileList *fl, GnomeCmdFile *f, gboolean t
text[GnomeCmdFileList::COLUMN_ICON] = nullptr;
// Prepare the strings to show
- gchar *t1 = f->get_path();
+ gchar *t1 = f->GetPathStringThroughParent();
gchar *t2 = g_path_get_dirname (t1);
dpath = get_utf8 (t2);
g_free (t1);
@@ -2021,7 +2021,7 @@ void GnomeCmdFileList::show_files(GnomeCmdDir *dir)
}
// Create a parent dir file (..) if appropriate
- gchar *path = GNOME_CMD_FILE (dir)->get_path();
+ gchar *path = GNOME_CMD_FILE (dir)->GetPathStringThroughParent();
if (path && strcmp (path, G_DIR_SEPARATOR_S) != 0)
files = g_list_append (files, gnome_cmd_dir_new_parent_dir_file (dir));
g_free (path);
diff --git a/src/gnome-cmd-file-selector.cc b/src/gnome-cmd-file-selector.cc
index 58449912..9186725b 100644
--- a/src/gnome-cmd-file-selector.cc
+++ b/src/gnome-cmd-file-selector.cc
@@ -525,7 +525,7 @@ static void on_list_dir_changed (GnomeCmdFileList *fl, GnomeCmdDir *dir, GnomeCm
{
if (fs->priv->dir_history && !fs->priv->dir_history->locked())
{
- gchar *fpath = GNOME_CMD_FILE (dir)->get_path();
+ gchar *fpath = GNOME_CMD_FILE (dir)->GetPathStringThroughParent();
fs->priv->dir_history->add(fpath);
g_free (fpath);
}
diff --git a/src/gnome-cmd-file.cc b/src/gnome-cmd-file.cc
index 12644244..0bd951e4 100644
--- a/src/gnome-cmd-file.cc
+++ b/src/gnome-cmd-file.cc
@@ -243,7 +243,7 @@ void gnome_cmd_file_setup (GObject *gObject, GFileInfo *gFileInfo, GnomeCmdDir *
handle_ref (gnomeCmdFile->priv->dir_handle);
}
- auto path = gnomeCmdFile->get_path();
+ auto path = gnomeCmdFile->GetPathStringThroughParent();
if (path)
{
GnomeCmdCon *con = nullptr;
@@ -466,7 +466,7 @@ gchar *GnomeCmdFile::get_quoted_name()
}
-gchar *GnomeCmdFile::get_path()
+gchar *GnomeCmdFile::GetPathStringThroughParent()
{
g_return_val_if_fail (gFileInfo != nullptr, nullptr);
diff --git a/src/gnome-cmd-file.h b/src/gnome-cmd-file.h
index 99f4f7de..627031a4 100644
--- a/src/gnome-cmd-file.h
+++ b/src/gnome-cmd-file.h
@@ -58,7 +58,7 @@ struct GnomeCmdFile
const gchar *get_name();
gchar *get_quoted_name();
- gchar *get_path();
+ gchar *GetPathStringThroughParent();
gchar *get_real_path();
gchar *get_quoted_real_path();
gchar *get_dirname();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]