dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove ifdef's on slots in shortcutsettings page

Browse Source
This commit is contained in:
Jonas Kvinge
2020-06-17 19:58:21 +02:00
parent d3958e757b
commit 64f0313d3c
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/settings/shortcutssettingspage.cpp
View File

@@ -193,8 +193,6 @@ void GlobalShortcutsSettingsPage::Save() {
} }
#if !defined(Q_OS_WIN) && !defined(Q_OS_MACOS)
#ifdef HAVE_X11
void GlobalShortcutsSettingsPage::X11Changed(bool) { void GlobalShortcutsSettingsPage::X11Changed(bool) {
if (!ui_->widget_x11->isVisibleTo(this)) return; 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) { void GlobalShortcutsSettingsPage::GSDChanged(bool) {
if (!ui_->widget_gsd->isVisibleTo(this)) return; 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) { void GlobalShortcutsSettingsPage::SetShortcut(const QString &id, const QKeySequence &key) {

7
src/settings/shortcutssettingspage.h
View File

@@ -55,16 +55,9 @@ class GlobalShortcutsSettingsPage : public SettingsPage {
void Save() override; void Save() override;
private slots: private slots:
#if !defined(Q_OS_WIN) && !defined(Q_OS_MACOS)
#ifdef HAVE_X11
void X11Changed(bool); void X11Changed(bool);
#endif
#ifdef HAVE_DBUS
void GSDChanged(bool); void GSDChanged(bool);
void OpenGnomeKeybindingProperties(); void OpenGnomeKeybindingProperties();
#endif
#endif
void ItemClicked(QTreeWidgetItem*); void ItemClicked(QTreeWidgetItem*);
void NoneClicked(); void NoneClicked();