From 64f0313d3c53c5d6d3a22aedffd34022fbae9670 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Wed, 17 Jun 2020 19:58:21 +0200
Subject: [PATCH] Remove ifdef's on slots in shortcutsettings page

---
 src/settings/shortcutssettingspage.cpp | 8 +-------
 src/settings/shortcutssettingspage.h   | 7 -------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/settings/shortcutssettingspage.cpp b/src/settings/shortcutssettingspage.cpp
index 3714bfe98..a0a3fd9bf 100644
--- a/src/settings/shortcutssettingspage.cpp
+++ b/src/settings/shortcutssettingspage.cpp
@@ -193,8 +193,6 @@ void GlobalShortcutsSettingsPage::Save() {
 
 }
 
-#if !defined(Q_OS_WIN) && !defined(Q_OS_MACOS)
-#ifdef HAVE_X11
 void GlobalShortcutsSettingsPage::X11Changed(bool) {
 
   if (!ui_->widget_x11->isVisibleTo(this)) return;
@@ -211,8 +209,7 @@ void GlobalShortcutsSettingsPage::X11Changed(bool) {
   }
 
 }
-#endif  // HAVE_X11
-#ifdef HAVE_DBUS
+
 void GlobalShortcutsSettingsPage::GSDChanged(bool) {
 
   if (!ui_->widget_gsd->isVisibleTo(this)) return;
@@ -249,9 +246,6 @@ void GlobalShortcutsSettingsPage::OpenGnomeKeybindingProperties() {
   }
 
 }
-#endif  // HAVE_DBUS
-
-#endif  // !defined(Q_OS_WIN) && !defined(Q_OS_MACOS)
 
 void GlobalShortcutsSettingsPage::SetShortcut(const QString &id, const QKeySequence &key) {
 
diff --git a/src/settings/shortcutssettingspage.h b/src/settings/shortcutssettingspage.h
index 3ff5340f0..729c06843 100644
--- a/src/settings/shortcutssettingspage.h
+++ b/src/settings/shortcutssettingspage.h
@@ -55,16 +55,9 @@ class GlobalShortcutsSettingsPage : public SettingsPage {
   void Save() override;
 
  private slots:
-
-#if !defined(Q_OS_WIN) && !defined(Q_OS_MACOS)
-#ifdef HAVE_X11
   void X11Changed(bool);
-#endif
-#ifdef HAVE_DBUS
   void GSDChanged(bool);
   void OpenGnomeKeybindingProperties();
-#endif
-#endif
 
   void ItemClicked(QTreeWidgetItem*);
   void NoneClicked();