From 2539b2333ca4ac918773e264984f787442dc56e0 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 30 Jan 2021 14:28:03 +0100 Subject: [PATCH] Use new connect syntax in global shortcuts manager --- .../globalshortcutsmanager.cpp | 44 ++++++++++--------- src/globalshortcuts/globalshortcutsmanager.h | 4 +- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/src/globalshortcuts/globalshortcutsmanager.cpp b/src/globalshortcuts/globalshortcutsmanager.cpp index 7ffa994e8..4ab8b7b8d 100644 --- a/src/globalshortcuts/globalshortcutsmanager.cpp +++ b/src/globalshortcuts/globalshortcutsmanager.cpp @@ -21,6 +21,8 @@ #include "config.h" +#include + #include #include #include @@ -63,25 +65,25 @@ GlobalShortcutsManager::GlobalShortcutsManager(QWidget *parent) settings_.beginGroup(GlobalShortcutsSettingsPage::kSettingsGroup); // Create actions - AddShortcut("play", "Play", SIGNAL(Play())); - AddShortcut("pause", "Pause", SIGNAL(Pause())); - AddShortcut("play_pause", "Play/Pause", SIGNAL(PlayPause()), QKeySequence(Qt::Key_MediaPlay)); - AddShortcut("stop", "Stop", SIGNAL(Stop()), QKeySequence(Qt::Key_MediaStop)); - AddShortcut("stop_after", "Stop playing after current track", SIGNAL(StopAfter())); - AddShortcut("next_track", "Next track", SIGNAL(Next()), QKeySequence(Qt::Key_MediaNext)); - AddShortcut("prev_track", "Previous track", SIGNAL(Previous()), QKeySequence(Qt::Key_MediaPrevious)); - AddShortcut("inc_volume", "Increase volume", SIGNAL(IncVolume())); - AddShortcut("dec_volume", "Decrease volume", SIGNAL(DecVolume())); - AddShortcut("mute", tr("Mute"), SIGNAL(Mute())); - AddShortcut("seek_forward", "Seek forward", SIGNAL(SeekForward())); - AddShortcut("seek_backward", "Seek backward", SIGNAL(SeekBackward())); - AddShortcut("show_hide", "Show/Hide", SIGNAL(ShowHide())); - AddShortcut("show_osd", "Show OSD", SIGNAL(ShowOSD())); - AddShortcut("toggle_pretty_osd", "Toggle Pretty OSD", SIGNAL(TogglePrettyOSD())); // Toggling possible only for pretty OSD - AddShortcut("shuffle_mode", "Change shuffle mode", SIGNAL(CycleShuffleMode())); - AddShortcut("repeat_mode", "Change repeat mode", SIGNAL(CycleRepeatMode())); - AddShortcut("toggle_scrobbling", "Enable/disable scrobbling", SIGNAL(ToggleScrobbling())); - AddShortcut("love", "Love", SIGNAL(Love())); + AddShortcut("play", "Play", std::bind(&GlobalShortcutsManager::Play, this)); + AddShortcut("pause", "Pause", std::bind(&GlobalShortcutsManager::Pause, this)); + AddShortcut("play_pause", "Play/Pause", std::bind(&GlobalShortcutsManager::PlayPause, this), QKeySequence(Qt::Key_MediaPlay)); + AddShortcut("stop", "Stop", std::bind(&GlobalShortcutsManager::Stop, this), QKeySequence(Qt::Key_MediaStop)); + AddShortcut("stop_after", "Stop playing after current track", std::bind(&GlobalShortcutsManager::StopAfter, this)); + AddShortcut("next_track", "Next track", std::bind(&GlobalShortcutsManager::Next, this), QKeySequence(Qt::Key_MediaNext)); + AddShortcut("prev_track", "Previous track", std::bind(&GlobalShortcutsManager::Previous, this), QKeySequence(Qt::Key_MediaPrevious)); + AddShortcut("inc_volume", "Increase volume", std::bind(&GlobalShortcutsManager::IncVolume, this)); + AddShortcut("dec_volume", "Decrease volume", std::bind(&GlobalShortcutsManager::DecVolume, this)); + AddShortcut("mute", tr("Mute"), std::bind(&GlobalShortcutsManager::Mute, this)); + AddShortcut("seek_forward", "Seek forward", std::bind(&GlobalShortcutsManager::SeekForward, this)); + AddShortcut("seek_backward", "Seek backward", std::bind(&GlobalShortcutsManager::SeekBackward, this)); + AddShortcut("show_hide", "Show/Hide", std::bind(&GlobalShortcutsManager::ShowHide, this)); + AddShortcut("show_osd", "Show OSD", std::bind(&GlobalShortcutsManager::ShowOSD, this)); + AddShortcut("toggle_pretty_osd", "Toggle Pretty OSD", std::bind(&GlobalShortcutsManager::TogglePrettyOSD, this)); // Toggling possible only for pretty OSD + AddShortcut("shuffle_mode", "Change shuffle mode", std::bind(&GlobalShortcutsManager::CycleShuffleMode, this)); + AddShortcut("repeat_mode", "Change repeat mode", std::bind(&GlobalShortcutsManager::CycleRepeatMode, this)); + AddShortcut("toggle_scrobbling", "Enable/disable scrobbling", std::bind(&GlobalShortcutsManager::ToggleScrobbling, this)); + AddShortcut("love", "Love", std::bind(&GlobalShortcutsManager::Love, this)); // Create backends - these do the actual shortcut registration #ifdef HAVE_DBUS @@ -118,10 +120,10 @@ void GlobalShortcutsManager::ReloadSettings() { } -void GlobalShortcutsManager::AddShortcut(const QString &id, const QString &name, const char *signal, const QKeySequence &default_key) { +void GlobalShortcutsManager::AddShortcut(const QString &id, const QString &name, std::function signal, const QKeySequence &default_key) { Shortcut shortcut = AddShortcut(id, name, default_key); - QObject::connect(shortcut.action, SIGNAL(triggered()), this, signal); + QObject::connect(shortcut.action, &QAction::triggered, this, signal); } diff --git a/src/globalshortcuts/globalshortcutsmanager.h b/src/globalshortcuts/globalshortcutsmanager.h index 9c0029e2a..db6ccb7a1 100644 --- a/src/globalshortcuts/globalshortcutsmanager.h +++ b/src/globalshortcuts/globalshortcutsmanager.h @@ -24,6 +24,8 @@ #include "config.h" +#include + #include #include #include @@ -84,7 +86,7 @@ class GlobalShortcutsManager : public QWidget { void Love(); private: - void AddShortcut(const QString &id, const QString &name, const char *signal, const QKeySequence &default_key = QKeySequence(0)); + void AddShortcut(const QString &id, const QString &name, std::function signal, const QKeySequence &default_key = QKeySequence(0)); Shortcut AddShortcut(const QString &id, const QString &name, const QKeySequence &default_key); private: