From aedbafabefd4f8795481a010515dba0cf18aabbd Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Fri, 18 Oct 2024 16:07:06 +0100 Subject: [PATCH] Remove explicit namespace where unnecessary --- src/View/Sidebar/AbstractMountableRow.vala | 2 +- src/View/Sidebar/BookmarkListBox.vala | 8 ++++---- src/View/Sidebar/DeviceListBox.vala | 8 ++++---- src/View/Sidebar/DriveRow.vala | 2 +- src/View/Sidebar/NetworkListBox.vala | 8 ++++---- src/View/Sidebar/NetworkRow.vala | 2 +- src/View/Sidebar/SidebarWindow.vala | 2 +- src/View/Sidebar/VolumeRow.vala | 2 +- src/View/Sidebar/VolumelessMountRow.vala | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/View/Sidebar/AbstractMountableRow.vala b/src/View/Sidebar/AbstractMountableRow.vala index d243dffe8..c7d2760d5 100644 --- a/src/View/Sidebar/AbstractMountableRow.vala +++ b/src/View/Sidebar/AbstractMountableRow.vala @@ -199,7 +199,7 @@ public abstract class Files.Sidebar.AbstractMountableRow :Files.Sidebar.Bookmark storage_levelbar.visible = is_mounted; } - protected override void update_plugin_data (Files.Sidebar.SidebarPluginItem item) { + protected override void update_plugin_data (SidebarPluginItem item) { base.update_plugin_data (item); working = item.show_spinner; } diff --git a/src/View/Sidebar/BookmarkListBox.vala b/src/View/Sidebar/BookmarkListBox.vala index c28c45b2a..972f8cc26 100644 --- a/src/View/Sidebar/BookmarkListBox.vala +++ b/src/View/Sidebar/BookmarkListBox.vala @@ -20,14 +20,14 @@ * Authors : Jeremy Wootten */ -public class Files.Sidebar.BookmarkListBox : Gtk.Box, Sidebar.SidebarListInterface { - public Files.Sidebar.SidebarInterface sidebar { get; set construct; } +public class Files.Sidebar.BookmarkListBox : Gtk.Box, SidebarListInterface { + public SidebarInterface sidebar { get; set construct; } public Gtk.ListBox list_box { get; set construct; } private Files.BookmarkList bookmark_list; private unowned Files.TrashMonitor trash_monitor; - public BookmarkListBox (Files.Sidebar.SidebarInterface sidebar) { + public BookmarkListBox (SidebarInterface sidebar) { Object (sidebar: sidebar); } @@ -88,7 +88,7 @@ public class Files.Sidebar.BookmarkListBox : Gtk.Box, Sidebar.SidebarListInterfa return row; } - public override uint32 add_plugin_item (Files.Sidebar.SidebarPluginItem plugin_item) { + public override uint32 add_plugin_item (SidebarPluginItem plugin_item) { var row = add_bookmark (plugin_item.name, plugin_item.uri, plugin_item.icon, diff --git a/src/View/Sidebar/DeviceListBox.vala b/src/View/Sidebar/DeviceListBox.vala index a001fbf50..99c132bf0 100644 --- a/src/View/Sidebar/DeviceListBox.vala +++ b/src/View/Sidebar/DeviceListBox.vala @@ -20,13 +20,13 @@ * Authors : Jeremy Wootten */ -public class Files.Sidebar.DeviceListBox : Gtk.Box, Sidebar.SidebarListInterface { - public Files.Sidebar.SidebarInterface sidebar { get; set construct; } +public class Files.Sidebar.DeviceListBox : Gtk.Box, SidebarListInterface { + public SidebarInterface sidebar { get; set construct; } public Gtk.ListBox list_box { get; set construct; } private VolumeMonitor volume_monitor; - public DeviceListBox (Files.Sidebar.SidebarInterface sidebar) { + public DeviceListBox (SidebarInterface sidebar) { Object (sidebar: sidebar); } @@ -122,7 +122,7 @@ public class Files.Sidebar.DeviceListBox : Gtk.Box, Sidebar.SidebarListInterface return bm; // Should not be null (either an existing bookmark or a new one) } - public override uint32 add_plugin_item (Files.Sidebar.SidebarPluginItem plugin_item) { + public override uint32 add_plugin_item (SidebarPluginItem plugin_item) { var row = add_bookmark (plugin_item.name, plugin_item.uri, plugin_item.icon, diff --git a/src/View/Sidebar/DriveRow.vala b/src/View/Sidebar/DriveRow.vala index b599d8bfb..04c72ebe3 100644 --- a/src/View/Sidebar/DriveRow.vala +++ b/src/View/Sidebar/DriveRow.vala @@ -30,7 +30,7 @@ // For now these drives are not shown. //TODO Add functionality to format/partition such drives. -public class Files.Sidebar.DriveRow : Sidebar.AbstractMountableRow, SidebarItemInterface { +public class Files.Sidebar.DriveRow : AbstractMountableRow, SidebarItemInterface { public override bool is_mounted { get { return false; // Volumeless drives are regarded as unmounted diff --git a/src/View/Sidebar/NetworkListBox.vala b/src/View/Sidebar/NetworkListBox.vala index 166ebebdd..98b2fa6c9 100644 --- a/src/View/Sidebar/NetworkListBox.vala +++ b/src/View/Sidebar/NetworkListBox.vala @@ -20,11 +20,11 @@ * Authors : Jeremy Wootten */ -public class Files.Sidebar.NetworkListBox : Gtk.Box, Sidebar.SidebarListInterface { - public Files.Sidebar.SidebarInterface sidebar { get; set construct; } +public class Files.Sidebar.NetworkListBox : Gtk.Box, SidebarListInterface { + public SidebarInterface sidebar { get; set construct; } public Gtk.ListBox list_box { get; set construct; } - public NetworkListBox (Files.Sidebar.SidebarInterface sidebar) { + public NetworkListBox (SidebarInterface sidebar) { Object (sidebar: sidebar); } @@ -82,7 +82,7 @@ public class Files.Sidebar.NetworkListBox : Gtk.Box, Sidebar.SidebarListInterfac return (BookmarkRow) row; } - public override uint32 add_plugin_item (Files.Sidebar.SidebarPluginItem plugin_item) { + public override uint32 add_plugin_item (SidebarPluginItem plugin_item) { var row = add_bookmark (plugin_item.name, plugin_item.uri, plugin_item.icon, diff --git a/src/View/Sidebar/NetworkRow.vala b/src/View/Sidebar/NetworkRow.vala index d0160b667..9449094df 100644 --- a/src/View/Sidebar/NetworkRow.vala +++ b/src/View/Sidebar/NetworkRow.vala @@ -20,7 +20,7 @@ * Authors : Jeremy Wootten */ -public class Files.Sidebar.NetworkRow : Sidebar.VolumelessMountRow { +public class Files.Sidebar.NetworkRow : VolumelessMountRow { public NetworkRow (string name, string uri, Icon gicon, SidebarListInterface list, bool pinned, bool permanent, string? _uuid, Mount? _mount) { diff --git a/src/View/Sidebar/SidebarWindow.vala b/src/View/Sidebar/SidebarWindow.vala index 5a1a9f5bc..33d94e69c 100644 --- a/src/View/Sidebar/SidebarWindow.vala +++ b/src/View/Sidebar/SidebarWindow.vala @@ -6,7 +6,7 @@ */ -public class Files.Sidebar.SidebarWindow : Gtk.Box, Files.Sidebar.SidebarInterface { +public class Files.Sidebar.SidebarWindow : Gtk.Box, SidebarInterface { public Hdy.HeaderBar headerbar; public View.Chrome.ButtonWithMenu button_back { get; construct; } public View.Chrome.ButtonWithMenu button_forward { get; construct; } diff --git a/src/View/Sidebar/VolumeRow.vala b/src/View/Sidebar/VolumeRow.vala index 2f1a80a4e..7453d69ae 100644 --- a/src/View/Sidebar/VolumeRow.vala +++ b/src/View/Sidebar/VolumeRow.vala @@ -21,7 +21,7 @@ */ /* Most of the storage rows will be volumes associated with a drive. However some devices (e.g. MP3 players may appear as a volume without a drive */ -public class Files.Sidebar.VolumeRow : Sidebar.AbstractMountableRow, SidebarItemInterface { +public class Files.Sidebar.VolumeRow : AbstractMountableRow, SidebarItemInterface { public Volume volume {get; construct;} public string? drive_name { owned get { diff --git a/src/View/Sidebar/VolumelessMountRow.vala b/src/View/Sidebar/VolumelessMountRow.vala index 18f7e4abf..c9f4adf35 100644 --- a/src/View/Sidebar/VolumelessMountRow.vala +++ b/src/View/Sidebar/VolumelessMountRow.vala @@ -23,7 +23,7 @@ // Represents a mount not associated with a volume or drive - usually a bind mount // Also used for builtin row "FileSystem" which has null mount /*FIXME Identify and deal with any other conditions resulting in a volumeless mount */ -public class Files.Sidebar.VolumelessMountRow : Sidebar.AbstractMountableRow, SidebarItemInterface { +public class Files.Sidebar.VolumelessMountRow : AbstractMountableRow, SidebarItemInterface { public VolumelessMountRow (string name, string uri, Icon gicon, SidebarListInterface list, bool pinned, bool permanent, string? _uuid, Mount? _mount) {