From a62288be07882a5c2771029afce0ac20b2a49b67 Mon Sep 17 00:00:00 2001 From: Fabio Lenherr / DashieTM Date: Mon, 13 Nov 2023 10:31:53 +0100 Subject: [PATCH] chore: Remove unused imports --- src/components/base/listEntry.rs | 1 - src/components/base/popupImpl.rs | 11 +---------- src/components/base/settingBoxImpl.rs | 4 ++-- src/components/base/utils.rs | 5 +---- src/components/output/audioBox.rs | 1 - src/components/output/audioBoxImpl.rs | 4 ++-- src/components/output/audioSourceImpl.rs | 4 ++-- src/components/wifi/savedWifiEntry.rs | 1 - src/components/wifi/wifiBox.rs | 8 ++------ src/components/wifi/wifiBoxImpl.rs | 3 --- src/components/wifi/wifiEntry.rs | 2 +- src/components/window/handleSidebarClick.rs | 1 - src/components/window/sidebarEntry.rs | 1 - src/components/window/sidebarEntryImpl.rs | 1 - src/components/window/windowImpl.rs | 1 - 15 files changed, 11 insertions(+), 37 deletions(-) diff --git a/src/components/base/listEntry.rs b/src/components/base/listEntry.rs index e0c1ffd..7bcfaea 100644 --- a/src/components/base/listEntry.rs +++ b/src/components/base/listEntry.rs @@ -1,7 +1,6 @@ use crate::components::base::listEntryImpl; use adw::glib; use adw::glib::{IsA, Object}; -use dbus::Path; use gtk::prelude::ListBoxRowExt; use gtk::Widget; diff --git a/src/components/base/popupImpl.rs b/src/components/base/popupImpl.rs index ecf032b..cab6fa4 100644 --- a/src/components/base/popupImpl.rs +++ b/src/components/base/popupImpl.rs @@ -1,17 +1,8 @@ use std::cell::RefCell; use std::sync::Arc; -use adw::subclass::prelude::{ActionRowImpl, PreferencesRowImpl}; -use adw::subclass::window::AdwWindowImpl; -use gtk::gdk_pixbuf::subclass::prelude::{ - PixbufAnimationImpl, PixbufAnimationIterImpl, PixbufLoaderImpl, -}; -use gtk::prelude::PopupExt; use gtk::subclass::prelude::*; -use gtk::{ - gdk, glib, Button, CompositeTemplate, Entry, EntryBuffer, Label, PasswordEntry, - PasswordEntryBuffer, Popover, -}; +use gtk::{glib, Button, CompositeTemplate, Label, PasswordEntry, PasswordEntryBuffer, Popover}; use super::popup; diff --git a/src/components/base/settingBoxImpl.rs b/src/components/base/settingBoxImpl.rs index b0009f1..b446b44 100644 --- a/src/components/base/settingBoxImpl.rs +++ b/src/components/base/settingBoxImpl.rs @@ -1,6 +1,6 @@ -use gtk::{CompositeTemplate, glib, Label}; -use gtk::subclass::prelude::*; use crate::components::base::settingBox; +use gtk::subclass::prelude::*; +use gtk::{glib, CompositeTemplate}; #[allow(non_snake_case)] #[derive(Default, CompositeTemplate)] diff --git a/src/components/base/utils.rs b/src/components/base/utils.rs index c920f02..771ebdb 100644 --- a/src/components/base/utils.rs +++ b/src/components/base/utils.rs @@ -1,8 +1,5 @@ use std::{ - sync::{ - atomic::{AtomicBool, Ordering}, - Arc, - }, + sync::atomic::{AtomicBool, Ordering}, thread, time::Duration, }; diff --git a/src/components/output/audioBox.rs b/src/components/output/audioBox.rs index 8c53aca..6bd0d02 100644 --- a/src/components/output/audioBox.rs +++ b/src/components/output/audioBox.rs @@ -3,7 +3,6 @@ use adw::glib::Object; use glib::subclass::prelude::ObjectSubclassIsExt; use glib::Variant; use gtk::prelude::ActionableExt; -use crate::components::base::listEntry::ListEntry; use crate::components::output::audioBoxImpl; glib::wrapper! { diff --git a/src/components/output/audioBoxImpl.rs b/src/components/output/audioBoxImpl.rs index 2da87c9..af4f4e5 100644 --- a/src/components/output/audioBoxImpl.rs +++ b/src/components/output/audioBoxImpl.rs @@ -1,4 +1,4 @@ -use gtk::{CompositeTemplate, DropDown, TemplateChild, glib, Button}; +use gtk::{CompositeTemplate, DropDown, TemplateChild, glib}; use gtk::prelude::*; use gtk::subclass::prelude::*; use crate::components::output::audioBox; @@ -50,4 +50,4 @@ impl WidgetImpl for AudioBox {} impl WindowImpl for AudioBox {} -impl ApplicationWindowImpl for AudioBox {} \ No newline at end of file +impl ApplicationWindowImpl for AudioBox {} diff --git a/src/components/output/audioSourceImpl.rs b/src/components/output/audioSourceImpl.rs index 13b4156..262257f 100644 --- a/src/components/output/audioSourceImpl.rs +++ b/src/components/output/audioSourceImpl.rs @@ -1,4 +1,4 @@ -use gtk::{Button, CompositeTemplate, glib, Image, Label, ProgressBar, Scale}; +use gtk::{Button, CompositeTemplate, glib, Label, ProgressBar, Scale}; use gtk::subclass::prelude::*; use crate::components::output::audioSource; @@ -37,4 +37,4 @@ impl BoxImpl for AudioSourceEntry {} impl ObjectImpl for AudioSourceEntry {} -impl WidgetImpl for AudioSourceEntry {} \ No newline at end of file +impl WidgetImpl for AudioSourceEntry {} diff --git a/src/components/wifi/savedWifiEntry.rs b/src/components/wifi/savedWifiEntry.rs index 9983778..c1bb03c 100644 --- a/src/components/wifi/savedWifiEntry.rs +++ b/src/components/wifi/savedWifiEntry.rs @@ -1,4 +1,3 @@ -use std::sync::Arc; use std::time::Duration; use crate::components::wifi::savedWifiEntryImpl; diff --git a/src/components/wifi/wifiBox.rs b/src/components/wifi/wifiBox.rs index 70b1a1c..f26f89a 100644 --- a/src/components/wifi/wifiBox.rs +++ b/src/components/wifi/wifiBox.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; use std::sync::atomic::Ordering; use std::sync::mpsc::{channel, Receiver, Sender}; -use std::sync::{atomic::AtomicBool, Arc}; +use std::sync::Arc; use std::thread; use std::time::Duration; @@ -9,7 +9,7 @@ use crate::components::base::listEntry::ListEntry; use crate::components::base::utils::Listeners; use adw::glib; use adw::glib::Object; -use adw::prelude::{BoxExt, ListBoxRowExt}; +use adw::prelude::ListBoxRowExt; use adw::subclass::prelude::ObjectSubclassIsExt; use dbus::arg::{AppendAll, ReadAll, RefArg}; use dbus::blocking::Connection; @@ -311,7 +311,3 @@ pub fn start_event_listener< }); Ok(()) } - -pub fn stop_listener(active_listener: Arc) { - active_listener.store(false, Ordering::SeqCst); -} diff --git a/src/components/wifi/wifiBoxImpl.rs b/src/components/wifi/wifiBoxImpl.rs index 0161872..f366bbc 100644 --- a/src/components/wifi/wifiBoxImpl.rs +++ b/src/components/wifi/wifiBoxImpl.rs @@ -1,8 +1,5 @@ use std::collections::HashMap; -use std::sync::atomic::AtomicBool; use std::sync::{Arc, Mutex}; -use ReSet_Lib::network::network::AccessPoint; -use dbus::Path; use gtk::{CompositeTemplate, glib, ListBox, Switch}; use gtk::prelude::*; use gtk::subclass::prelude::*; diff --git a/src/components/wifi/wifiEntry.rs b/src/components/wifi/wifiEntry.rs index 1b7724a..0b4ba7c 100644 --- a/src/components/wifi/wifiEntry.rs +++ b/src/components/wifi/wifiEntry.rs @@ -4,7 +4,7 @@ use std::time::Duration; use adw::glib; use adw::glib::{Object, PropertySet}; -use adw::prelude::{ButtonExt, EditableExt, EntryExt, PopoverExt}; +use adw::prelude::{ButtonExt, EditableExt, PopoverExt}; use adw::subclass::prelude::ObjectSubclassIsExt; use dbus::blocking::Connection; use dbus::Error; diff --git a/src/components/window/handleSidebarClick.rs b/src/components/window/handleSidebarClick.rs index 0632fea..35521cb 100644 --- a/src/components/window/handleSidebarClick.rs +++ b/src/components/window/handleSidebarClick.rs @@ -5,7 +5,6 @@ use std::sync::atomic::Ordering; use crate::components::base::settingBox::SettingBox; use crate::components::base::utils::Listeners; use crate::components::bluetooth::bluetoothBox::BluetoothBox; -use crate::components::input::sourceBox; use crate::components::input::sourceBox::SourceBox; use crate::components::output::audioBox::AudioBox; use crate::components::wifi::wifiBox::{scanForWifi, show_stored_connections, WifiBox}; diff --git a/src/components/window/sidebarEntry.rs b/src/components/window/sidebarEntry.rs index e8b78f9..4bad443 100644 --- a/src/components/window/sidebarEntry.rs +++ b/src/components/window/sidebarEntry.rs @@ -1,5 +1,4 @@ use std::sync::Arc; -use std::sync::atomic::AtomicBool; use adw::subclass::prelude::ObjectSubclassIsExt; use glib::Object; diff --git a/src/components/window/sidebarEntryImpl.rs b/src/components/window/sidebarEntryImpl.rs index 7be22fa..e0b3475 100644 --- a/src/components/window/sidebarEntryImpl.rs +++ b/src/components/window/sidebarEntryImpl.rs @@ -1,6 +1,5 @@ use std::cell::{Cell, RefCell}; use std::sync::Arc; -use std::sync::atomic::AtomicBool; use glib::subclass::InitializingObject; use gtk::{CompositeTemplate, FlowBox, glib, Image, Label, ListBoxRow}; diff --git a/src/components/window/windowImpl.rs b/src/components/window/windowImpl.rs index 3a578b4..662a3b2 100644 --- a/src/components/window/windowImpl.rs +++ b/src/components/window/windowImpl.rs @@ -1,6 +1,5 @@ use std::cell::RefCell; use std::sync::Arc; -use std::sync::atomic::AtomicBool; use adw::glib::StaticTypeExt; use adw::subclass::prelude::AdwApplicationWindowImpl;