From a0e923eb7d3f49321e90d3a3987cda9d7ba5ad11 Mon Sep 17 00:00:00 2001 From: yggverse Date: Fri, 8 Nov 2024 05:09:19 +0200 Subject: [PATCH] remove extra referencers --- src/app/browser.rs | 2 +- src/app/browser/window.rs | 2 +- src/app/browser/window/header.rs | 2 +- src/app/browser/window/header/bar.rs | 2 +- src/app/browser/window/header/bar/control.rs | 2 +- src/app/browser/window/header/bar/menu.rs | 2 +- src/app/browser/window/header/bar/tab.rs | 2 +- src/app/browser/window/header/bar/tab/append.rs | 2 +- src/app/browser/window/tab/item.rs | 2 +- src/app/browser/window/tab/item/page.rs | 2 +- .../window/tab/item/page/content/player/default.rs | 2 +- .../window/tab/item/page/content/text/gemini.rs | 4 ++-- .../tab/item/page/content/text/gemini/reader.rs | 2 +- .../item/page/content/text/gemini/reader/tag.rs | 14 +++++++------- src/app/browser/window/tab/item/page/input.rs | 2 +- .../browser/window/tab/item/page/input/response.rs | 2 +- .../window/tab/item/page/input/response/control.rs | 2 +- .../item/page/input/response/control/counter.rs | 2 +- .../tab/item/page/input/response/control/send.rs | 2 +- .../window/tab/item/page/input/response/form.rs | 2 +- .../window/tab/item/page/input/response/title.rs | 2 +- .../window/tab/item/page/input/sensitive.rs | 2 +- .../window/tab/item/page/input/sensitive/form.rs | 2 +- src/app/browser/window/tab/item/page/navigation.rs | 2 +- .../window/tab/item/page/navigation/bookmark.rs | 2 +- .../window/tab/item/page/navigation/history.rs | 2 +- .../tab/item/page/navigation/history/back.rs | 8 +++----- .../tab/item/page/navigation/history/forward.rs | 8 +++----- .../window/tab/item/page/navigation/home.rs | 2 +- .../window/tab/item/page/navigation/reload.rs | 5 ++--- .../window/tab/item/page/navigation/request.rs | 2 +- 31 files changed, 43 insertions(+), 48 deletions(-) diff --git a/src/app/browser.rs b/src/app/browser.rs index ee97d326..a2048027 100644 --- a/src/app/browser.rs +++ b/src/app/browser.rs @@ -252,7 +252,7 @@ impl Browser { // Getters pub fn gobject(&self) -> &ApplicationWindow { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window.rs b/src/app/browser/window.rs index e46e990a..919f61e5 100644 --- a/src/app/browser/window.rs +++ b/src/app/browser/window.rs @@ -173,7 +173,7 @@ impl Window { // Getters pub fn gobject(&self) -> &Box { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/header.rs b/src/app/browser/window/header.rs index 4fbad526..a3605f9a 100644 --- a/src/app/browser/window/header.rs +++ b/src/app/browser/window/header.rs @@ -56,6 +56,6 @@ impl Header { // Getters pub fn gobject(&self) -> &ToolbarView { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/header/bar.rs b/src/app/browser/window/header/bar.rs index c2cc0c8b..9920c41d 100644 --- a/src/app/browser/window/header/bar.rs +++ b/src/app/browser/window/header/bar.rs @@ -59,6 +59,6 @@ impl Bar { // Getters pub fn gobject(&self) -> &Box { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/header/bar/control.rs b/src/app/browser/window/header/bar/control.rs index b4690818..3919027d 100644 --- a/src/app/browser/window/header/bar/control.rs +++ b/src/app/browser/window/header/bar/control.rs @@ -19,6 +19,6 @@ impl Control { // Getters pub fn gobject(&self) -> &WindowControls { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/header/bar/menu.rs b/src/app/browser/window/header/bar/menu.rs index 633aa697..466bbde9 100644 --- a/src/app/browser/window/header/bar/menu.rs +++ b/src/app/browser/window/header/bar/menu.rs @@ -77,7 +77,7 @@ impl Menu { // Getters pub fn gobject(&self) -> &MenuButton { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/header/bar/tab.rs b/src/app/browser/window/header/bar/tab.rs index a628d1d9..a2302692 100644 --- a/src/app/browser/window/header/bar/tab.rs +++ b/src/app/browser/window/header/bar/tab.rs @@ -22,6 +22,6 @@ impl Tab { // Getters pub fn gobject(&self) -> &TabBar { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/header/bar/tab/append.rs b/src/app/browser/window/header/bar/tab/append.rs index 571dad3d..60a9a8cb 100644 --- a/src/app/browser/window/header/bar/tab/append.rs +++ b/src/app/browser/window/header/bar/tab/append.rs @@ -19,6 +19,6 @@ impl Append { // Getters pub fn gobject(&self) -> &Button { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item.rs b/src/app/browser/window/tab/item.rs index b966a263..9383529c 100644 --- a/src/app/browser/window/tab/item.rs +++ b/src/app/browser/window/tab/item.rs @@ -217,7 +217,7 @@ impl Item { } pub fn gobject(&self) -> &TabPage { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page.rs b/src/app/browser/window/tab/item/page.rs index 4c0a4206..0bc93080 100644 --- a/src/app/browser/window/tab/item/page.rs +++ b/src/app/browser/window/tab/item/page.rs @@ -420,7 +420,7 @@ impl Page { } pub fn gobject(&self) -> &Box { - &self.widget.gobject() + self.widget.gobject() } // Private helpers @TODO move outside diff --git a/src/app/browser/window/tab/item/page/content/player/default.rs b/src/app/browser/window/tab/item/page/content/player/default.rs index f6851927..5741cdfc 100644 --- a/src/app/browser/window/tab/item/page/content/player/default.rs +++ b/src/app/browser/window/tab/item/page/content/player/default.rs @@ -15,6 +15,6 @@ impl Default { } pub fn gobject(&self) -> &Video { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/content/text/gemini.rs b/src/app/browser/window/tab/item/page/content/text/gemini.rs index 4fe2ceb1..b7d7780f 100644 --- a/src/app/browser/window/tab/item/page/content/text/gemini.rs +++ b/src/app/browser/window/tab/item/page/content/text/gemini.rs @@ -37,10 +37,10 @@ impl Gemini { // Getters pub fn reader_title(&self) -> &Option { - &self.reader.title() + self.reader.title() } pub fn gobject(&self) -> &ClampScrollable { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/content/text/gemini/reader.rs b/src/app/browser/window/tab/item/page/content/text/gemini/reader.rs index 87948b81..2cb80708 100644 --- a/src/app/browser/window/tab/item/page/content/text/gemini/reader.rs +++ b/src/app/browser/window/tab/item/page/content/text/gemini/reader.rs @@ -355,6 +355,6 @@ impl Reader { } pub fn gobject(&self) -> &TextView { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/content/text/gemini/reader/tag.rs b/src/app/browser/window/tab/item/page/content/text/gemini/reader/tag.rs index ef0ac5aa..4a87d78b 100644 --- a/src/app/browser/window/tab/item/page/content/text/gemini/reader/tag.rs +++ b/src/app/browser/window/tab/item/page/content/text/gemini/reader/tag.rs @@ -75,30 +75,30 @@ impl Tag { } pub fn code(&self) -> &TextTag { - &self.code.gobject() + self.code.gobject() } pub fn h1(&self) -> &TextTag { - &self.h1.gobject() + self.h1.gobject() } pub fn h2(&self) -> &TextTag { - &self.h2.gobject() + self.h2.gobject() } pub fn h3(&self) -> &TextTag { - &self.h3.gobject() + self.h3.gobject() } pub fn list(&self) -> &TextTag { - &self.list.gobject() + self.list.gobject() } pub fn quote(&self) -> &TextTag { - &self.quote.gobject() + self.quote.gobject() } pub fn title(&self) -> &TextTag { - &self.title.gobject() + self.title.gobject() } } diff --git a/src/app/browser/window/tab/item/page/input.rs b/src/app/browser/window/tab/item/page/input.rs index 42e34dda..b1acfcc4 100644 --- a/src/app/browser/window/tab/item/page/input.rs +++ b/src/app/browser/window/tab/item/page/input.rs @@ -56,6 +56,6 @@ impl Input { // Getters pub fn gobject(&self) -> &Clamp { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/input/response.rs b/src/app/browser/window/tab/item/page/input/response.rs index 6a3164f3..5e3061ba 100644 --- a/src/app/browser/window/tab/item/page/input/response.rs +++ b/src/app/browser/window/tab/item/page/input/response.rs @@ -81,6 +81,6 @@ impl Response { // Getters pub fn gobject(&self) -> &Box { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/input/response/control.rs b/src/app/browser/window/tab/item/page/input/response/control.rs index 5ca57d22..744f0622 100644 --- a/src/app/browser/window/tab/item/page/input/response/control.rs +++ b/src/app/browser/window/tab/item/page/input/response/control.rs @@ -45,6 +45,6 @@ impl Control { // Getters pub fn gobject(&self) -> &Box { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/input/response/control/counter.rs b/src/app/browser/window/tab/item/page/input/response/control/counter.rs index 8aaf14bd..9cab69ff 100644 --- a/src/app/browser/window/tab/item/page/input/response/control/counter.rs +++ b/src/app/browser/window/tab/item/page/input/response/control/counter.rs @@ -26,6 +26,6 @@ impl Counter { // Getters pub fn gobject(&self) -> &Label { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/input/response/control/send.rs b/src/app/browser/window/tab/item/page/input/response/control/send.rs index e51607a7..f1884931 100644 --- a/src/app/browser/window/tab/item/page/input/response/control/send.rs +++ b/src/app/browser/window/tab/item/page/input/response/control/send.rs @@ -26,6 +26,6 @@ impl Send { // Getters pub fn gobject(&self) -> &Button { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/input/response/form.rs b/src/app/browser/window/tab/item/page/input/response/form.rs index 562cb1aa..81c3212c 100644 --- a/src/app/browser/window/tab/item/page/input/response/form.rs +++ b/src/app/browser/window/tab/item/page/input/response/form.rs @@ -30,6 +30,6 @@ impl Form { } pub fn gobject(&self) -> &TextView { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/input/response/title.rs b/src/app/browser/window/tab/item/page/input/response/title.rs index 9f40fa44..278a299b 100644 --- a/src/app/browser/window/tab/item/page/input/response/title.rs +++ b/src/app/browser/window/tab/item/page/input/response/title.rs @@ -21,6 +21,6 @@ impl Title { // Getters pub fn gobject(&self) -> &Label { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/input/sensitive.rs b/src/app/browser/window/tab/item/page/input/sensitive.rs index 16ec6d95..0ff505b8 100644 --- a/src/app/browser/window/tab/item/page/input/sensitive.rs +++ b/src/app/browser/window/tab/item/page/input/sensitive.rs @@ -66,6 +66,6 @@ impl Sensitive { // Getters pub fn gobject(&self) -> &Box { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/input/sensitive/form.rs b/src/app/browser/window/tab/item/page/input/sensitive/form.rs index dbc214a6..a9045b12 100644 --- a/src/app/browser/window/tab/item/page/input/sensitive/form.rs +++ b/src/app/browser/window/tab/item/page/input/sensitive/form.rs @@ -35,6 +35,6 @@ impl Form { } pub fn gobject(&self) -> &PasswordEntryRow { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/navigation.rs b/src/app/browser/window/tab/item/page/navigation.rs index 1b11471e..2209dca3 100644 --- a/src/app/browser/window/tab/item/page/navigation.rs +++ b/src/app/browser/window/tab/item/page/navigation.rs @@ -159,7 +159,7 @@ impl Navigation { // Getters pub fn gobject(&self) -> &Box { - &self.widget.gobject() + self.widget.gobject() } pub fn home_url(&self) -> Option { diff --git a/src/app/browser/window/tab/item/page/navigation/bookmark.rs b/src/app/browser/window/tab/item/page/navigation/bookmark.rs index 9ca1af68..a4be9329 100644 --- a/src/app/browser/window/tab/item/page/navigation/bookmark.rs +++ b/src/app/browser/window/tab/item/page/navigation/bookmark.rs @@ -24,6 +24,6 @@ impl Bookmark { // Getters pub fn gobject(&self) -> &Button { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/navigation/history.rs b/src/app/browser/window/tab/item/page/navigation/history.rs index 2ef7a751..906fe3ce 100644 --- a/src/app/browser/window/tab/item/page/navigation/history.rs +++ b/src/app/browser/window/tab/item/page/navigation/history.rs @@ -125,6 +125,6 @@ impl History { // Getters pub fn gobject(&self) -> &Box { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/navigation/history/back.rs b/src/app/browser/window/tab/item/page/navigation/history/back.rs index 335ad9b9..563e0d6a 100644 --- a/src/app/browser/window/tab/item/page/navigation/history/back.rs +++ b/src/app/browser/window/tab/item/page/navigation/history/back.rs @@ -15,8 +15,7 @@ impl Back { pub fn new_arc(action_page_history_back: SimpleAction) -> Arc { // Return activated struct Arc::new(Self { - action_page_history_back: action_page_history_back - .clone(), + action_page_history_back: action_page_history_back.clone(), widget: Widget::new_arc(action_page_history_back), }) } @@ -24,8 +23,7 @@ impl Back { // Actions pub fn update(&self, status: bool) { // Update actions - self.action_page_history_back - .set_enabled(status); + self.action_page_history_back.set_enabled(status); // Update child components self.widget.update(status); @@ -33,6 +31,6 @@ impl Back { // Getters pub fn gobject(&self) -> &Button { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/navigation/history/forward.rs b/src/app/browser/window/tab/item/page/navigation/history/forward.rs index 27310e7b..b126d6a5 100644 --- a/src/app/browser/window/tab/item/page/navigation/history/forward.rs +++ b/src/app/browser/window/tab/item/page/navigation/history/forward.rs @@ -15,8 +15,7 @@ impl Forward { pub fn new_arc(action_page_history_forward: SimpleAction) -> Arc { // Return activated struct Arc::new(Self { - action_page_history_forward: action_page_history_forward - .clone(), + action_page_history_forward: action_page_history_forward.clone(), widget: Widget::new_arc(action_page_history_forward), }) } @@ -24,8 +23,7 @@ impl Forward { // Actions pub fn update(&self, status: bool) { // Update actions - self.action_page_history_forward - .set_enabled(status); + self.action_page_history_forward.set_enabled(status); // Update child components self.widget.update(status); @@ -33,6 +31,6 @@ impl Forward { // Getters pub fn gobject(&self) -> &Button { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/navigation/home.rs b/src/app/browser/window/tab/item/page/navigation/home.rs index 35491dd2..6fd76c9e 100644 --- a/src/app/browser/window/tab/item/page/navigation/home.rs +++ b/src/app/browser/window/tab/item/page/navigation/home.rs @@ -45,7 +45,7 @@ impl Home { // Getters pub fn gobject(&self) -> &Button { - &self.widget.gobject() + self.widget.gobject() } pub fn url(&self) -> Option { diff --git a/src/app/browser/window/tab/item/page/navigation/reload.rs b/src/app/browser/window/tab/item/page/navigation/reload.rs index dced5514..6458dacd 100644 --- a/src/app/browser/window/tab/item/page/navigation/reload.rs +++ b/src/app/browser/window/tab/item/page/navigation/reload.rs @@ -22,8 +22,7 @@ impl Reload { // Actions pub fn update(&self, is_enabled: bool) { // Update actions - self.action_page_reload - .set_enabled(is_enabled); + self.action_page_reload.set_enabled(is_enabled); // Update child components self.widget.update(is_enabled); @@ -31,6 +30,6 @@ impl Reload { // Getters pub fn gobject(&self) -> &Button { - &self.widget.gobject() + self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/navigation/request.rs b/src/app/browser/window/tab/item/page/navigation/request.rs index 05be6e78..938f336f 100644 --- a/src/app/browser/window/tab/item/page/navigation/request.rs +++ b/src/app/browser/window/tab/item/page/navigation/request.rs @@ -100,7 +100,7 @@ impl Request { // Getters pub fn gobject(&self) -> &Entry { - &self.widget.gobject() + self.widget.gobject() } pub fn text(&self) -> GString {