Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdeui: remove KGlobalShortcutInfo friend declaration for non-existing class

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-09-27 10:46:46 +03:00
parent fe76fe95a7
commit c689f83d30
4 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kdeui/shortcuts/kglobalaccel.cpp
View file

@ -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.

4
kdeui/shortcuts/kglobalaccel_p.h
View file

@ -32,11 +32,11 @@ class KAction;
class KShortcut;
enum SetShortcutFlag
{
{
SetPresent =2,
NoAutoloading = 4,
IsDefault = 8
};
};
class KGlobalAccelPrivate

1
kdeui/shortcuts/kglobalshortcutinfo.cpp
View file

@ -38,7 +38,6 @@ KGlobalShortcutInfo::KGlobalShortcutInfo(const KGlobalShortcutInfo &rhs)
d->defaultKeys = rhs.d->defaultKeys;
}
KGlobalShortcutInfo::~KGlobalShortcutInfo()
{
delete d;

17
kdeui/shortcuts/kglobalshortcutinfo.h
View file

@ -23,15 +23,13 @@
#include <QtGui/QKeySequence>
#include <QtDBus/QDBusArgument>
class KGlobalShortcutInfoPrivate;
/**
* @author Michael Jansen <kde@michael-jansen.biz>
*/
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<QKeySequence> 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<QKeySequence> defaultKeys() const;
QString friendlyName() const;
QList<QKeySequence> keys() const;
QString uniqueName() const;
private:
friend class GlobalShortcut;
friend KDEUI_EXPORT const QDBusArgument &operator>> (
const QDBusArgument &argument,
KGlobalShortcutInfo &shortcut);