From fca6ce841cec83dd201f3bdb7f125f4273d502dd Mon Sep 17 00:00:00 2001 From: Elias Projahn Date: Sun, 16 Feb 2025 16:30:24 +0100 Subject: [PATCH] Remove unused parameters from callbacks --- src/editor/ensemble_editor.rs | 2 +- src/editor/instrument_editor.rs | 2 +- src/editor/performer_role_selector_popover.rs | 2 +- src/editor/recording_editor.rs | 2 +- src/editor/recording_editor_ensemble_row.rs | 4 ++-- src/editor/recording_editor_performer_row.rs | 4 ++-- src/editor/recording_selector_popover.rs | 4 ++-- src/editor/role_editor.rs | 2 +- src/editor/translation_entry.rs | 4 ++-- src/editor/work_editor.rs | 2 +- src/editor/work_editor_composer_row.rs | 4 ++-- src/editor/work_editor_part_row.rs | 2 +- src/editor/work_selector_popover.rs | 2 +- src/home_page.rs | 8 +++----- src/library_manager.rs | 16 ++++++++-------- src/player_bar.rs | 6 +++--- src/playlist_page.rs | 2 +- src/search_tag.rs | 2 +- src/welcome_page.rs | 2 +- 19 files changed, 35 insertions(+), 37 deletions(-) diff --git a/src/editor/ensemble_editor.rs b/src/editor/ensemble_editor.rs index 62e570c..63d8131 100644 --- a/src/editor/ensemble_editor.rs +++ b/src/editor/ensemble_editor.rs @@ -99,7 +99,7 @@ impl MusicusEnsembleEditor { } #[template_callback] - fn save(&self, _: >k::Button) { + fn save(&self) { let library = self.imp().library.get().unwrap(); let name = self.imp().name_editor.translation(); diff --git a/src/editor/instrument_editor.rs b/src/editor/instrument_editor.rs index 5af5c7f..a2cb12b 100644 --- a/src/editor/instrument_editor.rs +++ b/src/editor/instrument_editor.rs @@ -102,7 +102,7 @@ impl MusicusInstrumentEditor { } #[template_callback] - fn save(&self, _: >k::Button) { + fn save(&self) { let library = self.imp().library.get().unwrap(); let name = self.imp().name_editor.translation(); diff --git a/src/editor/performer_role_selector_popover.rs b/src/editor/performer_role_selector_popover.rs index 313a2ab..ce1a7cb 100644 --- a/src/editor/performer_role_selector_popover.rs +++ b/src/editor/performer_role_selector_popover.rs @@ -172,7 +172,7 @@ impl MusicusPerformerRoleSelectorPopover { } #[template_callback] - fn back_button_clicked(&self, _: >k::Button) { + fn back_button_clicked(&self) { self.imp().stack.set_visible_child(&*self.imp().role_view); self.imp().role_search_entry.grab_focus(); } diff --git a/src/editor/recording_editor.rs b/src/editor/recording_editor.rs index 451787c..15ea936 100644 --- a/src/editor/recording_editor.rs +++ b/src/editor/recording_editor.rs @@ -319,7 +319,7 @@ impl MusicusRecordingEditor { } #[template_callback] - fn save(&self, _: >k::Button) { + fn save(&self) { let library = self.imp().library.get().unwrap(); // TODO: No work selected? diff --git a/src/editor/recording_editor_ensemble_row.rs b/src/editor/recording_editor_ensemble_row.rs index ea480fa..aed9b07 100644 --- a/src/editor/recording_editor_ensemble_row.rs +++ b/src/editor/recording_editor_ensemble_row.rs @@ -138,12 +138,12 @@ impl MusicusRecordingEditorEnsembleRow { } #[template_callback] - fn open_role_popover(&self, _: >k::Button) { + fn open_role_popover(&self) { self.imp().role_popover.get().unwrap().popup(); } #[template_callback] - fn remove(&self, _: >k::Button) { + fn remove(&self) { self.emit_by_name::<()>("remove", &[]); } } diff --git a/src/editor/recording_editor_performer_row.rs b/src/editor/recording_editor_performer_row.rs index 76817e6..d25b249 100644 --- a/src/editor/recording_editor_performer_row.rs +++ b/src/editor/recording_editor_performer_row.rs @@ -177,12 +177,12 @@ impl MusicusRecordingEditorPerformerRow { } #[template_callback] - fn open_role_popover(&self, _: >k::Button) { + fn open_role_popover(&self) { self.imp().role_popover.get().unwrap().popup(); } #[template_callback] - fn remove(&self, _: >k::Button) { + fn remove(&self) { self.emit_by_name::<()>("remove", &[]); } } diff --git a/src/editor/recording_selector_popover.rs b/src/editor/recording_selector_popover.rs index edb0e62..64b1dcb 100644 --- a/src/editor/recording_selector_popover.rs +++ b/src/editor/recording_selector_popover.rs @@ -182,7 +182,7 @@ impl RecordingSelectorPopover { } #[template_callback] - fn back_to_composer(&self, _: >k::Button) { + fn back_to_composer(&self) { self.imp() .stack .set_visible_child(&*self.imp().composer_view); @@ -204,7 +204,7 @@ impl RecordingSelectorPopover { } #[template_callback] - fn back_to_work(&self, _: >k::Button) { + fn back_to_work(&self) { self.imp().stack.set_visible_child(&*self.imp().work_view); self.imp().work_search_entry.grab_focus(); } diff --git a/src/editor/role_editor.rs b/src/editor/role_editor.rs index 2e82791..6500757 100644 --- a/src/editor/role_editor.rs +++ b/src/editor/role_editor.rs @@ -94,7 +94,7 @@ impl MusicusRoleEditor { } #[template_callback] - fn save(&self, _: >k::Button) { + fn save(&self) { let library = self.imp().library.get().unwrap(); let name = self.imp().name_editor.translation(); diff --git a/src/editor/translation_entry.rs b/src/editor/translation_entry.rs index 86bcffa..f2741a6 100644 --- a/src/editor/translation_entry.rs +++ b/src/editor/translation_entry.rs @@ -82,13 +82,13 @@ impl MusicusTranslationEntry { } #[template_callback] - fn open_lang_popover(&self, _: >k::Button) { + fn open_lang_popover(&self) { self.imp().lang_popover.popup(); self.imp().lang_entry.grab_focus(); } #[template_callback] - fn remove(&self, _: >k::Button) { + fn remove(&self) { self.emit_by_name::<()>("remove", &[]); } } diff --git a/src/editor/work_editor.rs b/src/editor/work_editor.rs index 3146c8c..36c2c2b 100644 --- a/src/editor/work_editor.rs +++ b/src/editor/work_editor.rs @@ -317,7 +317,7 @@ impl MusicusWorkEditor { } #[template_callback] - fn save(&self, _: >k::Button) { + fn save(&self) { let library = self.imp().library.get().unwrap(); let name = self.imp().name_editor.translation(); diff --git a/src/editor/work_editor_composer_row.rs b/src/editor/work_editor_composer_row.rs index d635d51..d3fef1a 100644 --- a/src/editor/work_editor_composer_row.rs +++ b/src/editor/work_editor_composer_row.rs @@ -138,12 +138,12 @@ impl MusicusWorkEditorComposerRow { } #[template_callback] - fn open_role_popover(&self, _: >k::Button) { + fn open_role_popover(&self) { self.imp().role_popover.get().unwrap().popup(); } #[template_callback] - fn remove(&self, _: >k::Button) { + fn remove(&self) { self.emit_by_name::<()>("remove", &[]); } } diff --git a/src/editor/work_editor_part_row.rs b/src/editor/work_editor_part_row.rs index 5c8a3f8..21ddf2e 100644 --- a/src/editor/work_editor_part_row.rs +++ b/src/editor/work_editor_part_row.rs @@ -123,7 +123,7 @@ impl MusicusWorkEditorPartRow { } #[template_callback] - fn remove(&self, _: >k::Button) { + fn remove(&self) { self.emit_by_name::<()>("remove", &[]); } } diff --git a/src/editor/work_selector_popover.rs b/src/editor/work_selector_popover.rs index 1de3568..b3b7ed4 100644 --- a/src/editor/work_selector_popover.rs +++ b/src/editor/work_selector_popover.rs @@ -164,7 +164,7 @@ impl MusicusWorkSelectorPopover { } #[template_callback] - fn back_button_clicked(&self, _: >k::Button) { + fn back_button_clicked(&self) { self.imp() .stack .set_visible_child(&*self.imp().composer_view); diff --git a/src/home_page.rs b/src/home_page.rs index b34162e..f4d5172 100644 --- a/src/home_page.rs +++ b/src/home_page.rs @@ -161,12 +161,12 @@ impl MusicusHomePage { } #[template_callback] - fn back_button_clicked(&self, _: >k::Button) { + fn back_button_clicked(&self) { self.imp().search_entry.reset(); } #[template_callback] - fn edit_button_clicked(&self, _: >k::Button) { + fn edit_button_clicked(&self) { if let Some(tag) = self.imp().search_entry.tags().first() { match tag { Tag::Composer(person) | Tag::Performer(person) => { @@ -194,9 +194,7 @@ impl MusicusHomePage { } #[template_callback] - fn play(&self, _: >k::Button) { - log::info!("Play button clicked"); - + fn play(&self) { let program = Program::from_query(self.imp().search_entry.query()); self.player().set_program(program); diff --git a/src/library_manager.rs b/src/library_manager.rs index 40e26a1..bcfc9cc 100644 --- a/src/library_manager.rs +++ b/src/library_manager.rs @@ -219,7 +219,7 @@ impl LibraryManager { } // #[template_callback] - // fn add_person(&self, _: >k::Button) { + // fn add_person(&self) { // self.imp() // .navigation // .get() @@ -232,7 +232,7 @@ impl LibraryManager { // } // #[template_callback] - // fn add_role(&self, _: >k::Button) { + // fn add_role(&self) { // self.imp() // .navigation // .get() @@ -245,7 +245,7 @@ impl LibraryManager { // } // #[template_callback] - // fn add_instrument(&self, _: >k::Button) { + // fn add_instrument(&self) { // self.imp() // .navigation // .get() @@ -258,7 +258,7 @@ impl LibraryManager { // } // #[template_callback] - // fn add_work(&self, _: >k::Button) { + // fn add_work(&self) { // self.imp() // .navigation // .get() @@ -271,7 +271,7 @@ impl LibraryManager { // } // #[template_callback] - // fn add_ensemble(&self, _: >k::Button) { + // fn add_ensemble(&self) { // self.imp() // .navigation // .get() @@ -284,7 +284,7 @@ impl LibraryManager { // } // #[template_callback] - // fn add_recording(&self, _: >k::Button) { + // fn add_recording(&self) { // self.imp() // .navigation // .get() @@ -297,12 +297,12 @@ impl LibraryManager { // } // #[template_callback] - // fn add_medium(&self, _: >k::Button) { + // fn add_medium(&self) { // todo!("Medium import"); // } // #[template_callback] - // fn add_album(&self, _: >k::Button) { + // fn add_album(&self) { // todo!("Album editor"); // // self.imp() // // .navigation diff --git a/src/player_bar.rs b/src/player_bar.rs index 00122c7..8b35b53 100644 --- a/src/player_bar.rs +++ b/src/player_bar.rs @@ -217,7 +217,7 @@ impl PlayerBar { } #[template_callback] - fn previous(&self, _: >k::Button) { + fn previous(&self) { self.player().previous(); } @@ -227,12 +227,12 @@ impl PlayerBar { } #[template_callback] - fn next(&self, _: >k::Button) { + fn next(&self) { self.player().next(); } #[template_callback] - fn play_pause(&self, _: >k::Button) { + fn play_pause(&self) { self.player().play_pause(); } } diff --git a/src/playlist_page.rs b/src/playlist_page.rs index 80a0830..758cc93 100644 --- a/src/playlist_page.rs +++ b/src/playlist_page.rs @@ -111,7 +111,7 @@ impl MusicusPlaylistPage { } #[template_callback] - fn close(&self, _: >k::Button) { + fn close(&self) { self.emit_by_name::<()>("close", &[]); } } diff --git a/src/search_tag.rs b/src/search_tag.rs index d786745..2c78916 100644 --- a/src/search_tag.rs +++ b/src/search_tag.rs @@ -79,7 +79,7 @@ impl MusicusSearchTag { } #[template_callback] - fn remove(&self, _: >k::Button) { + fn remove(&self) { self.emit_by_name::<()>("remove", &[]); } } diff --git a/src/welcome_page.rs b/src/welcome_page.rs index 270be79..608efd2 100644 --- a/src/welcome_page.rs +++ b/src/welcome_page.rs @@ -64,7 +64,7 @@ impl MusicusWelcomePage { } #[template_callback] - async fn choose_library_folder(&self, _: >k::Button) { + async fn choose_library_folder(&self) { let dialog = gtk::FileDialog::builder() .title(gettext("Select music library folder")) .modal(true)