From 112257eb9fb277a15d473004f6914988846a07c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Fri, 16 Nov 2018 18:35:18 +0100
Subject: [PATCH] Remove default shortcuts

---
 src/core/globalshortcuts.cpp            | 18 +++++++-----------
 src/core/gnomeglobalshortcutbackend.cpp | 14 +++++++-------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/core/globalshortcuts.cpp b/src/core/globalshortcuts.cpp
index 0f0749443..7fb12baf3 100644
--- a/src/core/globalshortcuts.cpp
+++ b/src/core/globalshortcuts.cpp
@@ -31,7 +31,7 @@
 #include <QSignalMapper>
 #include <QtDebug>
 
-#ifdef QT_DBUS_LIB
+#ifdef HAVE_DBUS
 #include <QtDBus>
 #endif
 
@@ -48,16 +48,12 @@ GlobalShortcuts::GlobalShortcuts(QWidget* parent)
   // Create actions
   AddShortcut("play", tr("Play"), SIGNAL(Play()));
   AddShortcut("pause", tr("Pause"), SIGNAL(Pause()));
-  AddShortcut("play_pause", tr("Play/Pause"), SIGNAL(PlayPause()),
-              QKeySequence(Qt::Key_MediaPlay));
-  AddShortcut("stop", tr("Stop"), SIGNAL(Stop()),
-              QKeySequence(Qt::Key_MediaStop));
+  AddShortcut("play_pause", tr("Play/Pause"), SIGNAL(PlayPause()));
+  AddShortcut("stop", tr("Stop"), SIGNAL(Stop()));
   AddShortcut("stop_after", tr("Stop playing after current track"),
               SIGNAL(StopAfter()));
-  AddShortcut("next_track", tr("Next track"), SIGNAL(Next()),
-              QKeySequence(Qt::Key_MediaNext));
-  AddShortcut("prev_track", tr("Previous track"), SIGNAL(Previous()),
-              QKeySequence(Qt::Key_MediaPrevious));
+  AddShortcut("next_track", tr("Next track"), SIGNAL(Next()));
+  AddShortcut("prev_track", tr("Previous track"), SIGNAL(Previous()));
   AddShortcut("inc_volume", tr("Increase volume"), SIGNAL(IncVolume()));
   AddShortcut("dec_volume", tr("Decrease volume"), SIGNAL(DecVolume()));
   AddShortcut("mute", tr("Mute"), SIGNAL(Mute()));
@@ -147,10 +143,10 @@ GlobalShortcuts::Shortcut GlobalShortcuts::AddShortcut(
 }
 
 bool GlobalShortcuts::IsGsdAvailable() const {
-#ifdef QT_DBUS_LIB
+#ifdef HAVE_DBUS
   return QDBusConnection::sessionBus().interface()->isServiceRegistered(
       GnomeGlobalShortcutBackend::kGsdService);
-#else  // QT_DBUS_LIB
+#else  // HAVE_DBUS
   return false;
 #endif
 }
diff --git a/src/core/gnomeglobalshortcutbackend.cpp b/src/core/gnomeglobalshortcutbackend.cpp
index 8a0f58760..bc9bb5951 100644
--- a/src/core/gnomeglobalshortcutbackend.cpp
+++ b/src/core/gnomeglobalshortcutbackend.cpp
@@ -22,7 +22,7 @@
 #include "core/closure.h"
 #include "core/logging.h"
 
-#ifdef QT_DBUS_LIB
+#ifdef HAVE_DBUS
 #include "dbus/gnomesettingsdaemon.h"
 #endif
 
@@ -31,7 +31,7 @@
 #include <QDateTime>
 #include <QtDebug>
 
-#ifdef QT_DBUS_LIB
+#ifdef HAVE_DBUS
 #include <QtDBus>
 #endif
 
@@ -48,7 +48,7 @@ GnomeGlobalShortcutBackend::GnomeGlobalShortcutBackend(GlobalShortcuts* parent)
       is_connected_(false) {}
 
 bool GnomeGlobalShortcutBackend::DoRegister() {
-#ifdef QT_DBUS_LIB
+#ifdef HAVE_DBUS
   qLog(Debug) << "registering";
   // Check if the GSD service is available
   if (!QDBusConnection::sessionBus().interface()->isServiceRegistered(
@@ -71,7 +71,7 @@ bool GnomeGlobalShortcutBackend::DoRegister() {
              SLOT(RegisterFinished(QDBusPendingCallWatcher*)), watcher);
 
   return true;
-#else  // QT_DBUS_LIB
+#else  // HAVE_DBUS
   qLog(Warning) << "dbus not available";
   return false;
 #endif
@@ -79,7 +79,7 @@ bool GnomeGlobalShortcutBackend::DoRegister() {
 
 void GnomeGlobalShortcutBackend::RegisterFinished(
     QDBusPendingCallWatcher* watcher) {
-#ifdef QT_DBUS_LIB
+#ifdef HAVE_DBUS
   QDBusMessage reply = watcher->reply();
   watcher->deleteLater();
 
@@ -94,12 +94,12 @@ void GnomeGlobalShortcutBackend::RegisterFinished(
   is_connected_ = true;
 
   qLog(Debug) << "registered";
-#endif  // QT_DBUS_LIB
+#endif  // HAVE_DBUS
 }
 
 void GnomeGlobalShortcutBackend::DoUnregister() {
   qLog(Debug) << "unregister";
-#ifdef QT_DBUS_LIB
+#ifdef HAVE_DBUS
   // Check if the GSD service is available
   if (!QDBusConnection::sessionBus().interface()->isServiceRegistered(
            kGsdService))
-- 
2.19.1