From c689f83d30804fd47ab0786a6e0fe00cfdec2649 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 27 Sep 2022 10:46:46 +0300 Subject: [PATCH] kdeui: remove KGlobalShortcutInfo friend declaration for non-existing class Signed-off-by: Ivailo Monev --- kdeui/shortcuts/kglobalaccel.cpp | 3 ++- kdeui/shortcuts/kglobalaccel_p.h | 4 ++-- kdeui/shortcuts/kglobalshortcutinfo.cpp | 1 - kdeui/shortcuts/kglobalshortcutinfo.h | 17 +---------------- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/kdeui/shortcuts/kglobalaccel.cpp b/kdeui/shortcuts/kglobalaccel.cpp index a2e25ea7..5af5bec7 100644 --- a/kdeui/shortcuts/kglobalaccel.cpp +++ b/kdeui/shortcuts/kglobalaccel.cpp @@ -214,8 +214,9 @@ void KGlobalAccelPrivate::doRegister(KAction *action) } const bool isRegistered = actions.contains(action); - if (isRegistered) + if (isRegistered) { return; + } // Under configuration mode - deprecated - we ignore the component given // from the action and use our own. diff --git a/kdeui/shortcuts/kglobalaccel_p.h b/kdeui/shortcuts/kglobalaccel_p.h index 0a6565b3..00f1eee3 100644 --- a/kdeui/shortcuts/kglobalaccel_p.h +++ b/kdeui/shortcuts/kglobalaccel_p.h @@ -32,11 +32,11 @@ class KAction; class KShortcut; enum SetShortcutFlag - { +{ SetPresent =2, NoAutoloading = 4, IsDefault = 8 - }; +}; class KGlobalAccelPrivate diff --git a/kdeui/shortcuts/kglobalshortcutinfo.cpp b/kdeui/shortcuts/kglobalshortcutinfo.cpp index 31c5f4fe..04d0b86e 100644 --- a/kdeui/shortcuts/kglobalshortcutinfo.cpp +++ b/kdeui/shortcuts/kglobalshortcutinfo.cpp @@ -38,7 +38,6 @@ KGlobalShortcutInfo::KGlobalShortcutInfo(const KGlobalShortcutInfo &rhs) d->defaultKeys = rhs.d->defaultKeys; } - KGlobalShortcutInfo::~KGlobalShortcutInfo() { delete d; diff --git a/kdeui/shortcuts/kglobalshortcutinfo.h b/kdeui/shortcuts/kglobalshortcutinfo.h index 82c9d7a8..f2782253 100644 --- a/kdeui/shortcuts/kglobalshortcutinfo.h +++ b/kdeui/shortcuts/kglobalshortcutinfo.h @@ -23,15 +23,13 @@ #include #include - class KGlobalShortcutInfoPrivate; - /** * @author Michael Jansen */ class KDEUI_EXPORT KGlobalShortcutInfo : public QObject - { +{ Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.kglobalaccel.KShortcutInfo") @@ -49,35 +47,22 @@ class KDEUI_EXPORT KGlobalShortcutInfo : public QObject Q_SCRIPTABLE Q_PROPERTY(QList defaultKeys READ keys) public: - KGlobalShortcutInfo(); - KGlobalShortcutInfo(const KGlobalShortcutInfo &rhs); - ~KGlobalShortcutInfo(); KGlobalShortcutInfo& operator=(const KGlobalShortcutInfo& rhs); QString contextFriendlyName() const; - QString contextUniqueName() const; - QString componentFriendlyName() const; - QString componentUniqueName() const; - QList defaultKeys() const; - QString friendlyName() const; - QList keys() const; - QString uniqueName() const; private: - - friend class GlobalShortcut; - friend KDEUI_EXPORT const QDBusArgument &operator>> ( const QDBusArgument &argument, KGlobalShortcutInfo &shortcut);