[nautilus] list-base: Clean provisory name leftwovers
- From: António Fernandes <antoniof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] list-base: Clean provisory name leftwovers
- Date: Wed, 22 Jun 2022 07:11:47 +0000 (UTC)
commit 56d246e8779e0883be289d6b8c6f4a25fd9a6476
Author: António Fernandes <antoniof gnome org>
Date: Wed Jun 22 08:01:35 2022 +0100
list-base: Clean provisory name leftwovers
NautilusListBase was provisorily named NautilusFilesModelView during
its development, and some references to the old name ended up merged.
src/nautilus-grid-view.c | 20 ++++++++++----------
src/nautilus-list-view.c | 20 ++++++++++----------
src/nautilus-types.h | 1 -
3 files changed, 20 insertions(+), 21 deletions(-)
---
diff --git a/src/nautilus-grid-view.c b/src/nautilus-grid-view.c
index 926f5042e..8a0c8b4f2 100644
--- a/src/nautilus-grid-view.c
+++ b/src/nautilus-grid-view.c
@@ -219,26 +219,26 @@ on_grid_view_item_activated (GtkGridView *grid_view,
}
static guint
-real_get_icon_size (NautilusListBase *files_model_view)
+real_get_icon_size (NautilusListBase *list_base_view)
{
- NautilusGridView *self = NAUTILUS_GRID_VIEW (files_model_view);
+ NautilusGridView *self = NAUTILUS_GRID_VIEW (list_base_view);
return get_icon_size_for_zoom_level (self->zoom_level);
}
static GtkWidget *
-real_get_view_ui (NautilusListBase *files_model_view)
+real_get_view_ui (NautilusListBase *list_base_view)
{
- NautilusGridView *self = NAUTILUS_GRID_VIEW (files_model_view);
+ NautilusGridView *self = NAUTILUS_GRID_VIEW (list_base_view);
return GTK_WIDGET (self->view_ui);
}
static void
-real_scroll_to_item (NautilusListBase *files_model_view,
+real_scroll_to_item (NautilusListBase *list_base_view,
guint position)
{
- NautilusGridView *self = NAUTILUS_GRID_VIEW (files_model_view);
+ NautilusGridView *self = NAUTILUS_GRID_VIEW (list_base_view);
gtk_widget_activate_action (GTK_WIDGET (self->view_ui),
"list.scroll-to-item",
@@ -443,7 +443,7 @@ nautilus_grid_view_class_init (NautilusGridViewClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
NautilusFilesViewClass *files_view_class = NAUTILUS_FILES_VIEW_CLASS (klass);
- NautilusListBaseClass *files_model_view_class = NAUTILUS_LIST_BASE_CLASS (klass);
+ NautilusListBaseClass *list_base_view_class = NAUTILUS_LIST_BASE_CLASS (klass);
object_class->dispose = dispose;
object_class->finalize = finalize;
@@ -456,9 +456,9 @@ nautilus_grid_view_class_init (NautilusGridViewClass *klass)
files_view_class->restore_standard_zoom_level = real_restore_standard_zoom_level;
files_view_class->is_zoom_level_default = real_is_zoom_level_default;
- files_model_view_class->get_icon_size = real_get_icon_size;
- files_model_view_class->get_view_ui = real_get_view_ui;
- files_model_view_class->scroll_to_item = real_scroll_to_item;
+ list_base_view_class->get_icon_size = real_get_icon_size;
+ list_base_view_class->get_view_ui = real_get_view_ui;
+ list_base_view_class->scroll_to_item = real_scroll_to_item;
}
static void
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index ab13aaae4..fb14569ec 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -90,17 +90,17 @@ get_icon_size_for_zoom_level (NautilusListZoomLevel zoom_level)
}
static guint
-real_get_icon_size (NautilusListBase *files_model_view)
+real_get_icon_size (NautilusListBase *list_base_view)
{
- NautilusListView *self = NAUTILUS_LIST_VIEW (files_model_view);
+ NautilusListView *self = NAUTILUS_LIST_VIEW (list_base_view);
return get_icon_size_for_zoom_level (self->zoom_level);
}
static GtkWidget *
-real_get_view_ui (NautilusListBase *files_model_view)
+real_get_view_ui (NautilusListBase *list_base_view)
{
- NautilusListView *self = NAUTILUS_LIST_VIEW (files_model_view);
+ NautilusListView *self = NAUTILUS_LIST_VIEW (list_base_view);
return GTK_WIDGET (self->view_ui);
}
@@ -227,10 +227,10 @@ apply_columns_settings (NautilusListView *self,
}
static void
-real_scroll_to_item (NautilusListBase *files_model_view,
+real_scroll_to_item (NautilusListBase *list_base_view,
guint position)
{
- NautilusListView *self = NAUTILUS_LIST_VIEW (files_model_view);
+ NautilusListView *self = NAUTILUS_LIST_VIEW (list_base_view);
GtkWidget *child;
child = gtk_widget_get_last_child (GTK_WIDGET (self->view_ui));
@@ -1140,7 +1140,7 @@ nautilus_list_view_class_init (NautilusListViewClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
NautilusFilesViewClass *files_view_class = NAUTILUS_FILES_VIEW_CLASS (klass);
- NautilusListBaseClass *files_model_view_class = NAUTILUS_LIST_BASE_CLASS (klass);
+ NautilusListBaseClass *list_base_view_class = NAUTILUS_LIST_BASE_CLASS (klass);
object_class->dispose = nautilus_list_view_dispose;
object_class->finalize = nautilus_list_view_finalize;
@@ -1154,9 +1154,9 @@ nautilus_list_view_class_init (NautilusListViewClass *klass)
files_view_class->restore_standard_zoom_level = real_restore_standard_zoom_level;
files_view_class->is_zoom_level_default = real_is_zoom_level_default;
- files_model_view_class->get_icon_size = real_get_icon_size;
- files_model_view_class->get_view_ui = real_get_view_ui;
- files_model_view_class->scroll_to_item = real_scroll_to_item;
+ list_base_view_class->get_icon_size = real_get_icon_size;
+ list_base_view_class->get_view_ui = real_get_view_ui;
+ list_base_view_class->scroll_to_item = real_scroll_to_item;
}
NautilusListView *
diff --git a/src/nautilus-types.h b/src/nautilus-types.h
index 1fe935449..6a13ebb6d 100644
--- a/src/nautilus-types.h
+++ b/src/nautilus-types.h
@@ -36,7 +36,6 @@ typedef struct _NautilusClipboard NautilusClipboard;
typedef struct _NautilusDirectory NautilusDirectory;
typedef struct NautilusFile NautilusFile;
typedef struct NautilusFileQueue NautilusFileQueue;
-typedef struct _NautilusFilesModelView NautilusFilesModelView;
typedef struct _NautilusIconInfo NautilusIconInfo;
typedef struct _NautilusListBase NautilusListBase;
typedef struct NautilusMonitor NautilusMonitor;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]