Rename global shortcuts classes

src/settings/globalshortcutssettingspage.cpp

@@ -46,11 +46,11 @@
 #  include "core/mac_utilities.h"
 #endif
 #include "globalshortcuts/globalshortcutgrabber.h"
-#include "globalshortcuts/globalshortcuts.h"
+#include "globalshortcuts/globalshortcutsmanager.h"
 #include "settingspage.h"
 #include "settingsdialog.h"
-#include "shortcutssettingspage.h"
-#include "ui_shortcutssettingspage.h"
+#include "globalshortcutssettingspage.h"
+#include "ui_globalshortcutssettingspage.h"
 
 const char *GlobalShortcutsSettingsPage::kSettingsGroup = "GlobalShortcuts";
 
@@ -108,7 +108,7 @@ void GlobalShortcutsSettingsPage::Load() {
   QSettings s;
   s.beginGroup(kSettingsGroup);
 
-  GlobalShortcuts *manager = dialog()->global_shortcuts_manager();
+  GlobalShortcutsManager *manager = dialog()->global_shortcuts_manager();
 
   if (!initialized_) {
     initialized_ = true;
@@ -116,7 +116,7 @@ void GlobalShortcutsSettingsPage::Load() {
     de_ = Utilities::DesktopEnvironment();
     ui_->widget_warning->hide();
 
-    QObject::connect(ui_->button_macos_open, &QPushButton::clicked, manager, &GlobalShortcuts::ShowMacAccessibilityDialog);
+    QObject::connect(ui_->button_macos_open, &QPushButton::clicked, manager, &GlobalShortcutsManager::ShowMacAccessibilityDialog);
 
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
     if (manager->IsGsdAvailable()) {
@@ -147,7 +147,7 @@ void GlobalShortcutsSettingsPage::Load() {
     }
 #endif
 
-    for (const GlobalShortcuts::Shortcut &i : manager->shortcuts().values()) {
+    for (const GlobalShortcutsManager::Shortcut &i : manager->shortcuts().values()) {
       Shortcut shortcut;
       shortcut.s = i;
       shortcut.key = i.action->shortcut();
@@ -291,7 +291,7 @@ void GlobalShortcutsSettingsPage::DefaultClicked() {
 
 void GlobalShortcutsSettingsPage::ChangeClicked() {
 
-  GlobalShortcuts *manager = dialog()->global_shortcuts_manager();
+  GlobalShortcutsManager *manager = dialog()->global_shortcuts_manager();
   manager->Unregister();
   QKeySequence key = grabber_->GetKey(shortcuts_[current_id_].s.action->text());
   manager->Register();

src/settings/globalshortcutssettingspage.h

@@ -32,7 +32,7 @@
 #include <QString>
 #include <QKeySequence>
 
-#include "globalshortcuts/globalshortcuts.h"
+#include "globalshortcuts/globalshortcutsmanager.h"
 #include "settingspage.h"
 
 class QTreeWidgetItem;
@@ -65,7 +65,7 @@ class GlobalShortcutsSettingsPage : public SettingsPage {
 
  private:
   struct Shortcut {
-    GlobalShortcuts::Shortcut s;
+    GlobalShortcutsManager::Shortcut s;
     QKeySequence key;
     QTreeWidgetItem *item;
   };

src/settings/globalshortcutssettingspage.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Shortcuts</string>
+   <string>Global Shortcuts</string>
   </property>
   <property name="windowIcon">
    <iconset resource="../../data/icons.qrc">

src/settings/settingsdialog.cpp

@@ -68,7 +68,7 @@
 #include "appearancesettingspage.h"
 #include "contextsettingspage.h"
 #include "notificationssettingspage.h"
-#include "shortcutssettingspage.h"
+#include "globalshortcutssettingspage.h"
 #ifdef HAVE_MOODBAR
 #  include "moodbarsettingspage.h"
 #endif

src/settings/settingsdialog.h

@@ -51,7 +51,7 @@ class Application;
 class Player;
 class Appearance;
 class CollectionDirectoryModel;
-class GlobalShortcuts;
+class GlobalShortcutsManager;
 class SettingsPage;
 
 class Ui_SettingsDialog;
@@ -97,7 +97,7 @@ class SettingsDialog : public QDialog {
     Role_IsSeparator = Qt::UserRole
   };
 
-  void SetGlobalShortcutManager(GlobalShortcuts *manager) { manager_ = manager; }
+  void SetGlobalShortcutManager(GlobalShortcutsManager *manager) { manager_ = manager; }
 
   bool is_loading_settings() const { return loading_settings_; }
 
@@ -106,7 +106,7 @@ class SettingsDialog : public QDialog {
   Player *player() const { return player_; }
   EngineBase *engine() const { return engine_; }
   CollectionDirectoryModel *collection_directory_model() const { return model_; }
-  GlobalShortcuts *global_shortcuts_manager() const { return manager_; }
+  GlobalShortcutsManager *global_shortcuts_manager() const { return manager_; }
   Appearance *appearance() const { return appearance_; }
 
   void OpenAtPage(Page page);
@@ -152,7 +152,7 @@ class SettingsDialog : public QDialog {
   Player *player_;
   EngineBase *engine_;
   CollectionDirectoryModel *model_;
-  GlobalShortcuts *manager_;
+  GlobalShortcutsManager *manager_;
   Appearance *appearance_;
 
   Ui_SettingsDialog *ui_;