From ed435d6347cdc0b937fa06575cf4655de27859a3 Mon Sep 17 00:00:00 2001 From: Fabio Lenherr / DashieTM Date: Mon, 11 Mar 2024 20:24:24 +0100 Subject: [PATCH] chore: Fix all warnings --- src/components/base/card_entry.rs | 1 - src/components/base/card_entry_impl.rs | 2 +- src/components/base/error.rs | 3 --- src/components/base/error_impl.rs | 8 ++------ src/components/base/list_entry.rs | 1 - src/components/base/list_entry_impl.rs | 2 +- src/components/base/popup.rs | 1 - src/components/base/popup_impl.rs | 2 +- src/components/base/setting_box.rs | 1 - src/components/base/setting_box_impl.rs | 2 +- src/components/bluetooth/bluetooth_box.rs | 5 ++--- src/components/bluetooth/bluetooth_box_impl.rs | 2 +- src/components/bluetooth/bluetooth_entry.rs | 3 +-- src/components/bluetooth/bluetooth_entry_impl.rs | 2 +- src/components/input/output_stream_entry.rs | 1 - src/components/input/output_stream_entry_impl.rs | 2 +- src/components/input/source_box.rs | 13 +++---------- src/components/input/source_box_impl.rs | 4 ++-- src/components/input/source_entry.rs | 3 --- src/components/input/source_entry_impl.rs | 2 +- src/components/output/input_stream_entry.rs | 1 - src/components/output/input_stream_entry_impl.rs | 2 +- src/components/output/sink_box.rs | 2 +- src/components/output/sink_box_impl.rs | 2 +- src/components/output/sink_entry.rs | 1 - src/components/output/sink_entry_impl.rs | 2 +- src/components/wifi/saved_wifi_entry.rs | 1 - src/components/wifi/saved_wifi_entry_impl.rs | 2 +- src/components/wifi/wifi_address_entry.rs | 1 - src/components/wifi/wifi_address_entry_impl.rs | 2 +- src/components/wifi/wifi_box.rs | 7 +++---- src/components/wifi/wifi_box_impl.rs | 2 +- src/components/wifi/wifi_entry.rs | 1 - src/components/wifi/wifi_entry_impl.rs | 2 +- src/components/wifi/wifi_options.rs | 2 +- src/components/wifi/wifi_options_impl.rs | 2 +- src/components/wifi/wifi_route_entry.rs | 1 - src/components/wifi/wifi_route_entry_impl.rs | 2 +- src/components/window/reset_window.rs | 2 +- src/components/window/reset_window_impl.rs | 2 +- src/components/window/sidebar_entry.rs | 2 +- src/components/window/sidebar_entry_impl.rs | 2 +- 42 files changed, 36 insertions(+), 67 deletions(-) diff --git a/src/components/base/card_entry.rs b/src/components/base/card_entry.rs index e1aab70..150006e 100644 --- a/src/components/base/card_entry.rs +++ b/src/components/base/card_entry.rs @@ -1,6 +1,5 @@ use std::time::Duration; -use adw::glib; use adw::glib::Object; use adw::prelude::{ComboRowExt, PreferencesRowExt}; use dbus::blocking::Connection; diff --git a/src/components/base/card_entry_impl.rs b/src/components/base/card_entry_impl.rs index 48adb33..41538c0 100644 --- a/src/components/base/card_entry_impl.rs +++ b/src/components/base/card_entry_impl.rs @@ -6,7 +6,7 @@ use std::cell::RefCell; use std::collections::HashMap; use gtk::subclass::prelude::*; -use gtk::{glib, CompositeTemplate}; +use gtk::CompositeTemplate; use super::card_entry; diff --git a/src/components/base/error.rs b/src/components/base/error.rs index a0f9c25..d7c2dc4 100644 --- a/src/components/base/error.rs +++ b/src/components/base/error.rs @@ -1,6 +1,3 @@ -use std::{rc::Rc, sync::Arc}; - -use adw::glib; use adw::glib::Object; use glib::{clone, subclass::types::ObjectSubclassIsExt}; use gtk::{ diff --git a/src/components/base/error_impl.rs b/src/components/base/error_impl.rs index d337d04..9830b3c 100644 --- a/src/components/base/error_impl.rs +++ b/src/components/base/error_impl.rs @@ -1,12 +1,8 @@ -use std::cell::RefCell; use std::sync::Arc; -use glib::clone; use gtk::prelude::{ButtonExt, PopoverExt}; use gtk::subclass::prelude::*; -use gtk::{glib, Button, CompositeTemplate, Label, PasswordEntry, PasswordEntryBuffer, Popover}; - -use crate::components::input::source_box::SourceBox; +use gtk::{Button, CompositeTemplate, Label, Popover}; use super::error; @@ -61,7 +57,7 @@ pub fn show_error( // TODO: Add error to log glib::spawn_future(async move { glib::idle_add_once(move || { - let mut error = parent.error(); + let error = parent.error(); let parent_ref = parent.clone(); let imp = error.imp(); imp.reset_error_label.set_text(message); diff --git a/src/components/base/list_entry.rs b/src/components/base/list_entry.rs index 735c808..27ed7c9 100644 --- a/src/components/base/list_entry.rs +++ b/src/components/base/list_entry.rs @@ -1,5 +1,4 @@ use crate::components::base::list_entry_impl; -use adw::glib; use adw::glib::{IsA, Object}; use gtk::prelude::ListBoxRowExt; use gtk::Widget; diff --git a/src/components/base/list_entry_impl.rs b/src/components/base/list_entry_impl.rs index bec99dc..d1db591 100644 --- a/src/components/base/list_entry_impl.rs +++ b/src/components/base/list_entry_impl.rs @@ -1,6 +1,6 @@ use crate::components::base::list_entry; use gtk::subclass::prelude::*; -use gtk::{glib, CompositeTemplate}; +use gtk::CompositeTemplate; #[derive(Default, CompositeTemplate)] #[template(resource = "/org/Xetibo/ReSet/resetListBoxRow.ui")] diff --git a/src/components/base/popup.rs b/src/components/base/popup.rs index d2725b0..52235fc 100644 --- a/src/components/base/popup.rs +++ b/src/components/base/popup.rs @@ -1,4 +1,3 @@ -use adw::glib; use adw::glib::Object; use gtk::{gdk, Editable, Popover}; diff --git a/src/components/base/popup_impl.rs b/src/components/base/popup_impl.rs index 9b3fab0..1f74269 100644 --- a/src/components/base/popup_impl.rs +++ b/src/components/base/popup_impl.rs @@ -2,7 +2,7 @@ use std::cell::RefCell; use std::sync::Arc; use gtk::subclass::prelude::*; -use gtk::{glib, Button, CompositeTemplate, Label, PasswordEntry, PasswordEntryBuffer, Popover}; +use gtk::{Button, CompositeTemplate, Label, PasswordEntry, PasswordEntryBuffer, Popover}; use super::popup; diff --git a/src/components/base/setting_box.rs b/src/components/base/setting_box.rs index 64c3b2a..c6ca3d6 100644 --- a/src/components/base/setting_box.rs +++ b/src/components/base/setting_box.rs @@ -1,5 +1,4 @@ use crate::components::base::setting_box_impl; -use adw::glib; use adw::glib::{IsA, Object}; use gtk::prelude::BoxExt; use gtk::Widget; diff --git a/src/components/base/setting_box_impl.rs b/src/components/base/setting_box_impl.rs index 8c16d2e..715e97e 100644 --- a/src/components/base/setting_box_impl.rs +++ b/src/components/base/setting_box_impl.rs @@ -1,6 +1,6 @@ use crate::components::base::setting_box; use gtk::subclass::prelude::*; -use gtk::{glib, CompositeTemplate}; +use gtk::CompositeTemplate; #[derive(Default, CompositeTemplate)] #[template(resource = "/org/Xetibo/ReSet/resetSettingBox.ui")] diff --git a/src/components/bluetooth/bluetooth_box.rs b/src/components/bluetooth/bluetooth_box.rs index 2c44744..65cb7c1 100644 --- a/src/components/bluetooth/bluetooth_box.rs +++ b/src/components/bluetooth/bluetooth_box.rs @@ -2,7 +2,6 @@ use std::sync::atomic::Ordering; use std::sync::Arc; use std::time::{Duration, SystemTime}; -use adw::glib; use adw::glib::Object; use adw::prelude::{ComboRowExt, PreferencesGroupExt}; use adw::subclass::prelude::ObjectSubclassIsExt; @@ -325,8 +324,8 @@ pub fn start_bluetooth_listener(listeners: Arc, bluetooth_box: Arc, sources: Vec) let input_box_ref_slider = input_box.clone(); let input_box_ref_toggle = input_box.clone(); let input_box_ref_mute = input_box.clone(); - let input_box_ref = input_box.clone(); let input_box_imp = input_box.imp(); let default_sink = input_box_imp.reset_default_source.clone(); let source = default_sink.borrow(); @@ -188,11 +185,7 @@ fn populate_source_information(input_box: Arc, sources: Vec) input_box_imp .reset_source_dropdown .connect_selected_notify(move |dropdown| { - if let ControlFlow::Break = - dropdown_handler(input_box_ref_toggle.clone(), dropdown) - { - return; - } + dropdown_handler(input_box_ref_toggle.clone(), dropdown); }); input_box_imp .reset_volume_slider diff --git a/src/components/input/source_box_impl.rs b/src/components/input/source_box_impl.rs index 316c36d..d22d5ea 100644 --- a/src/components/input/source_box_impl.rs +++ b/src/components/input/source_box_impl.rs @@ -5,12 +5,12 @@ use std::collections::HashMap; use std::sync::{Arc, RwLock}; use std::time::SystemTime; -use crate::components::base::error::{self, ReSetError}; +use crate::components::base::error::ReSetError; use crate::components::base::list_entry::ListEntry; use crate::components::input::source_box; use gtk::subclass::prelude::*; -use gtk::{glib, CheckButton, CompositeTemplate, StringList, TemplateChild}; use gtk::{prelude::*, Button, Label, Scale}; +use gtk::{CheckButton, CompositeTemplate, StringList}; use super::output_stream_entry::OutputStreamEntry; use super::source_entry::SourceEntry; diff --git a/src/components/input/source_entry.rs b/src/components/input/source_entry.rs index 7b42366..3763c34 100644 --- a/src/components/input/source_entry.rs +++ b/src/components/input/source_entry.rs @@ -1,17 +1,14 @@ use std::sync::Arc; use std::time::{Duration, SystemTime}; -use crate::components::base::error::ReSetError; use crate::components::base::error_impl::show_error; use crate::components::utils::set_action_row_ellipsis; -use adw::glib; use adw::glib::Object; use adw::prelude::{ButtonExt, CheckButtonExt, PreferencesRowExt, RangeExt}; use dbus::blocking::Connection; use dbus::Error; use glib::subclass::types::ObjectSubclassIsExt; use glib::{clone, Propagation}; -use gtk::prelude::PopoverExt; use gtk::{gio, CheckButton}; use re_set_lib::audio::audio_structures::Source; diff --git a/src/components/input/source_entry_impl.rs b/src/components/input/source_entry_impl.rs index 142b8a5..16a9900 100644 --- a/src/components/input/source_entry_impl.rs +++ b/src/components/input/source_entry_impl.rs @@ -6,7 +6,7 @@ use std::sync::Arc; use std::time::SystemTime; use gtk::subclass::prelude::*; -use gtk::{glib, Button, CheckButton, CompositeTemplate, Label, Scale}; +use gtk::{Button, CheckButton, CompositeTemplate, Label, Scale}; use super::source_entry; diff --git a/src/components/output/input_stream_entry.rs b/src/components/output/input_stream_entry.rs index 6eea4ce..350b268 100644 --- a/src/components/output/input_stream_entry.rs +++ b/src/components/output/input_stream_entry.rs @@ -5,7 +5,6 @@ use crate::components::base::error_impl::show_error; use crate::components::utils::{ create_dropdown_label_factory, set_combo_row_ellipsis, AUDIO, BASE, DBUS_PATH, }; -use adw::glib; use adw::glib::Object; use adw::prelude::{ButtonExt, ComboRowExt, PreferencesRowExt, RangeExt}; use dbus::blocking::Connection; diff --git a/src/components/output/input_stream_entry_impl.rs b/src/components/output/input_stream_entry_impl.rs index acdf98f..b336409 100644 --- a/src/components/output/input_stream_entry_impl.rs +++ b/src/components/output/input_stream_entry_impl.rs @@ -6,7 +6,7 @@ use std::sync::Arc; use std::time::SystemTime; use gtk::subclass::prelude::*; -use gtk::{glib, Button, CompositeTemplate, Label, Scale}; +use gtk::{Button, CompositeTemplate, Label, Scale}; use super::input_stream_entry; diff --git a/src/components/output/sink_box.rs b/src/components/output/sink_box.rs index cdc7601..692bbb7 100644 --- a/src/components/output/sink_box.rs +++ b/src/components/output/sink_box.rs @@ -13,8 +13,8 @@ use std::sync::Arc; use std::time::{Duration, SystemTime}; use adw::glib::Object; +use adw::prelude::ListBoxRowExt; use adw::prelude::{BoxExt, ButtonExt, CheckButtonExt, ComboRowExt, RangeExt}; -use adw::{glib, prelude::ListBoxRowExt}; use dbus::blocking::Connection; use dbus::message::SignalArgs; use dbus::{Error, Path}; diff --git a/src/components/output/sink_box_impl.rs b/src/components/output/sink_box_impl.rs index 91f0909..99c9b7d 100644 --- a/src/components/output/sink_box_impl.rs +++ b/src/components/output/sink_box_impl.rs @@ -9,8 +9,8 @@ use crate::components::base::error::ReSetError; use crate::components::base::list_entry::ListEntry; use crate::components::output::input_stream_entry::InputStreamEntry; use gtk::subclass::prelude::*; -use gtk::{glib, Box, Button, CheckButton, CompositeTemplate, Label, StringList, TemplateChild}; use gtk::{prelude::*, Scale}; +use gtk::{Box, Button, CheckButton, CompositeTemplate, Label, StringList}; use super::sink_box; use super::sink_entry::SinkEntry; diff --git a/src/components/output/sink_entry.rs b/src/components/output/sink_entry.rs index 509e728..0fea70f 100644 --- a/src/components/output/sink_entry.rs +++ b/src/components/output/sink_entry.rs @@ -3,7 +3,6 @@ use std::time::{Duration, SystemTime}; use crate::components::base::error_impl::show_error; use crate::components::utils::set_action_row_ellipsis; -use adw::glib; use adw::glib::Object; use adw::prelude::{ButtonExt, CheckButtonExt, PreferencesRowExt, RangeExt}; use dbus::blocking::Connection; diff --git a/src/components/output/sink_entry_impl.rs b/src/components/output/sink_entry_impl.rs index f51bc7d..1b82529 100644 --- a/src/components/output/sink_entry_impl.rs +++ b/src/components/output/sink_entry_impl.rs @@ -7,7 +7,7 @@ use std::time::SystemTime; use crate::components::output::sink_entry; use gtk::subclass::prelude::*; -use gtk::{glib, Button, CheckButton, CompositeTemplate, Label, Scale}; +use gtk::{Button, CheckButton, CompositeTemplate, Label, Scale}; #[derive(Default, CompositeTemplate)] #[template(resource = "/org/Xetibo/ReSet/resetSinkEntry.ui")] diff --git a/src/components/wifi/saved_wifi_entry.rs b/src/components/wifi/saved_wifi_entry.rs index 9ab8fbe..5e4f6fd 100644 --- a/src/components/wifi/saved_wifi_entry.rs +++ b/src/components/wifi/saved_wifi_entry.rs @@ -6,7 +6,6 @@ use crate::components::wifi::saved_wifi_entry_impl; use crate::components::wifi::utils::get_connection_settings; use crate::components::wifi::wifi_box_impl::WifiBox; use crate::components::wifi::wifi_options::WifiOptions; -use adw::glib; use adw::glib::Object; use adw::prelude::{ActionRowExt, ButtonExt, PreferencesGroupExt, PreferencesRowExt}; use dbus::blocking::Connection; diff --git a/src/components/wifi/saved_wifi_entry_impl.rs b/src/components/wifi/saved_wifi_entry_impl.rs index 9c310d3..4bd90a4 100644 --- a/src/components/wifi/saved_wifi_entry_impl.rs +++ b/src/components/wifi/saved_wifi_entry_impl.rs @@ -6,7 +6,7 @@ use std::cell::RefCell; use dbus::Path; use gtk::subclass::prelude::*; -use gtk::{glib, CompositeTemplate}; +use gtk::CompositeTemplate; use super::saved_wifi_entry; diff --git a/src/components/wifi/wifi_address_entry.rs b/src/components/wifi/wifi_address_entry.rs index c6e86f5..3d3264d 100644 --- a/src/components/wifi/wifi_address_entry.rs +++ b/src/components/wifi/wifi_address_entry.rs @@ -4,7 +4,6 @@ use std::net::{IpAddr, Ipv4Addr, Ipv6Addr}; use std::rc::Rc; use std::str::FromStr; -use adw::glib; use adw::glib::Object; use adw::prelude::PreferencesRowExt; use glib::clone; diff --git a/src/components/wifi/wifi_address_entry_impl.rs b/src/components/wifi/wifi_address_entry_impl.rs index 9498bf5..932b924 100644 --- a/src/components/wifi/wifi_address_entry_impl.rs +++ b/src/components/wifi/wifi_address_entry_impl.rs @@ -2,7 +2,7 @@ use crate::components::wifi::utils::IpProtocol; use crate::components::wifi::wifi_address_entry; use adw::{EntryRow, ExpanderRow}; use gtk::subclass::prelude::*; -use gtk::{glib, Button, CompositeTemplate}; +use gtk::{Button, CompositeTemplate}; use std::cell::{Cell, RefCell}; #[derive(Default, CompositeTemplate)] diff --git a/src/components/wifi/wifi_box.rs b/src/components/wifi/wifi_box.rs index df09495..58bf042 100644 --- a/src/components/wifi/wifi_box.rs +++ b/src/components/wifi/wifi_box.rs @@ -7,9 +7,8 @@ use std::time::Duration; use crate::components::base::error_impl::{show_error, ReSetErrorImpl}; use crate::components::base::utils::Listeners; use crate::components::utils::{set_combo_row_ellipsis, BASE, DBUS_PATH, WIRELESS}; -use adw::glib; use adw::glib::Object; -use adw::prelude::{ComboRowExt, ListBoxRowExt, PreferencesGroupExt, PreferencesRowExt}; +use adw::prelude::{ComboRowExt, ListBoxRowExt, PreferencesGroupExt}; use adw::subclass::prelude::ObjectSubclassIsExt; use dbus::blocking::Connection; use dbus::message::SignalArgs; @@ -17,9 +16,9 @@ use dbus::Error; use dbus::Path; use glib::{clone, Cast, ControlFlow, PropertySet}; use gtk::glib::Variant; -use gtk::prelude::{ActionableExt, WidgetExt}; +use gtk::prelude::ActionableExt; use gtk::{gio, StringList, StringObject}; -use re_set_lib::network::network_structures::{AccessPoint, WifiDevice, WifiStrength}; +use re_set_lib::network::network_structures::{AccessPoint, WifiDevice}; use re_set_lib::signals::{AccessPointAdded, WifiDeviceChanged, WifiDeviceReset}; use re_set_lib::signals::{AccessPointChanged, AccessPointRemoved}; diff --git a/src/components/wifi/wifi_box_impl.rs b/src/components/wifi/wifi_box_impl.rs index f6b0530..ff7bc8a 100644 --- a/src/components/wifi/wifi_box_impl.rs +++ b/src/components/wifi/wifi_box_impl.rs @@ -3,8 +3,8 @@ use crate::components::wifi::wifi_box; use adw::{ActionRow, ComboRow, NavigationView, PreferencesGroup}; use dbus::Path; use gtk::subclass::prelude::*; -use gtk::{glib, CompositeTemplate, Switch}; use gtk::{prelude::*, StringList}; +use gtk::{CompositeTemplate, Switch}; use re_set_lib::network::network_structures::WifiDevice; use std::cell::RefCell; use std::collections::HashMap; diff --git a/src/components/wifi/wifi_entry.rs b/src/components/wifi/wifi_entry.rs index aa4746a..5051c0f 100644 --- a/src/components/wifi/wifi_entry.rs +++ b/src/components/wifi/wifi_entry.rs @@ -4,7 +4,6 @@ use std::time::Duration; use crate::components::utils::{BASE, DBUS_PATH, WIRELESS}; use crate::components::wifi::utils::get_connection_settings; -use adw::glib; use adw::glib::{Object, PropertySet}; use adw::prelude::{ActionRowExt, ButtonExt, EditableExt, PopoverExt, PreferencesRowExt}; use adw::subclass::prelude::ObjectSubclassIsExt; diff --git a/src/components/wifi/wifi_entry_impl.rs b/src/components/wifi/wifi_entry_impl.rs index 4f97518..0961838 100644 --- a/src/components/wifi/wifi_entry_impl.rs +++ b/src/components/wifi/wifi_entry_impl.rs @@ -4,7 +4,7 @@ use adw::subclass::preferences_row::PreferencesRowImpl; use adw::subclass::prelude::ActionRowImpl; use adw::ActionRow; use gtk::subclass::prelude::*; -use gtk::{glib, Button, CompositeTemplate, Image, Label}; +use gtk::{Button, CompositeTemplate, Image, Label}; use re_set_lib::network::network_structures::{AccessPoint, WifiStrength}; use std::cell::RefCell; diff --git a/src/components/wifi/wifi_options.rs b/src/components/wifi/wifi_options.rs index 062e892..c8ef059 100644 --- a/src/components/wifi/wifi_options.rs +++ b/src/components/wifi/wifi_options.rs @@ -4,10 +4,10 @@ use std::str::FromStr; use std::sync::Arc; use std::time::Duration; +use adw::gio; use adw::glib::Object; use adw::prelude::{ActionRowExt, ComboRowExt, PreferencesGroupExt}; use adw::subclass::prelude::ObjectSubclassIsExt; -use adw::{gio, glib}; use dbus::arg::PropMap; use dbus::{Error, Path}; use glib::{clone, PropertySet}; diff --git a/src/components/wifi/wifi_options_impl.rs b/src/components/wifi/wifi_options_impl.rs index 44dd5a9..741ccb1 100644 --- a/src/components/wifi/wifi_options_impl.rs +++ b/src/components/wifi/wifi_options_impl.rs @@ -4,7 +4,7 @@ use adw::{ ActionRow, ComboRow, EntryRow, NavigationPage, PasswordEntryRow, PreferencesGroup, SwitchRow, }; use gtk::subclass::prelude::*; -use gtk::{glib, Button, CompositeTemplate, Label}; +use gtk::{Button, CompositeTemplate, Label}; use re_set_lib::network::connection::Connection; use std::cell::RefCell; use std::rc::Rc; diff --git a/src/components/wifi/wifi_route_entry.rs b/src/components/wifi/wifi_route_entry.rs index 031214a..b6ae08e 100644 --- a/src/components/wifi/wifi_route_entry.rs +++ b/src/components/wifi/wifi_route_entry.rs @@ -1,5 +1,4 @@ use crate::components::wifi::utils::IpProtocol; -use adw::glib; use adw::glib::Object; use adw::prelude::{ExpanderRowExt, PreferencesRowExt}; use glib::clone; diff --git a/src/components/wifi/wifi_route_entry_impl.rs b/src/components/wifi/wifi_route_entry_impl.rs index 9c16014..8372797 100644 --- a/src/components/wifi/wifi_route_entry_impl.rs +++ b/src/components/wifi/wifi_route_entry_impl.rs @@ -2,7 +2,7 @@ use crate::components::wifi::utils::IpProtocol; use crate::components::wifi::wifi_route_entry; use adw::{EntryRow, ExpanderRow}; use gtk::subclass::prelude::*; -use gtk::{glib, Button, CompositeTemplate}; +use gtk::{Button, CompositeTemplate}; use std::cell::{Cell, RefCell}; #[derive(Default, CompositeTemplate)] diff --git a/src/components/window/reset_window.rs b/src/components/window/reset_window.rs index ce1ecf0..e653cd9 100644 --- a/src/components/window/reset_window.rs +++ b/src/components/window/reset_window.rs @@ -5,7 +5,7 @@ use adw::subclass::prelude::ObjectSubclassIsExt; use adw::BreakpointCondition; use glib::Object; use gtk::gio::ActionEntry; -use gtk::{gio, glib, AccessibleRole, Application, ListBoxRow, Orientation, StateFlags}; +use gtk::{gio, AccessibleRole, Application, ListBoxRow, Orientation, StateFlags}; use gtk::{prelude::*, DirectionType}; use crate::components::window::handle_sidebar_click::*; diff --git a/src/components/window/reset_window_impl.rs b/src/components/window/reset_window_impl.rs index ae24032..b58e69f 100644 --- a/src/components/window/reset_window_impl.rs +++ b/src/components/window/reset_window_impl.rs @@ -8,7 +8,7 @@ use adw::{Breakpoint, OverlaySplitView}; use glib::subclass::InitializingObject; use gtk::prelude::WidgetExt; use gtk::subclass::prelude::*; -use gtk::{glib, Button, CompositeTemplate, FlowBox, ListBox, SearchEntry}; +use gtk::{Button, CompositeTemplate, FlowBox, ListBox, SearchEntry}; use crate::components::base::error::ReSetError; use crate::components::base::utils::{Listeners, Position}; diff --git a/src/components/window/sidebar_entry.rs b/src/components/window/sidebar_entry.rs index cbca66a..4af9971 100644 --- a/src/components/window/sidebar_entry.rs +++ b/src/components/window/sidebar_entry.rs @@ -8,7 +8,7 @@ use crate::components::window::sidebar_entry_impl::{Categories, SidebarAction}; use adw::subclass::prelude::ObjectSubclassIsExt; use glib::Object; use gtk::prelude::*; -use gtk::{glib, FlowBox}; +use gtk::FlowBox; glib::wrapper! { pub struct SidebarEntry(ObjectSubclass) diff --git a/src/components/window/sidebar_entry_impl.rs b/src/components/window/sidebar_entry_impl.rs index 80a6b10..81c4a06 100644 --- a/src/components/window/sidebar_entry_impl.rs +++ b/src/components/window/sidebar_entry_impl.rs @@ -4,7 +4,7 @@ use std::sync::Arc; use glib::subclass::InitializingObject; use gtk::subclass::prelude::*; -use gtk::{glib, CompositeTemplate, FlowBox, Image, Label, ListBoxRow}; +use gtk::{CompositeTemplate, FlowBox, Image, Label, ListBoxRow}; use crate::components::base::utils::{Listeners, Position}; use crate::components::window::handle_sidebar_click::HANDLE_HOME;