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

kdeui: do not log the action pointer when unsafe

Browse source 
generally because KGlobalAccel uses raw pointers it is unsafe to use the
KAction pointers for anything but comparison when removing/unregistering
from the KGlobalAccel destructor

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-07 02:30:48 +03:00
parent 4677b62c24
commit c181a8e25c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kdeui/shortcuts/kglobalaccel.cpp
View file

@ -212,7 +212,7 @@ bool KGlobalAccelPrivate::doRegister(KAction *action)
shortcut.keyModX = keyModX;
shortcut.keyCodeX = keyCodeX;
filter->shortcuts.append(shortcut);
kDebug(s_kglobalaccelarea) << "grabbed shortcut" << shortcut.keyModX << shortcut.keyCodeX << shortcut.action;
kDebug(s_kglobalaccelarea) << "grabbed shortcut" << shortcut.keyModX << shortcut.keyCodeX;
// grabbed one, that is success
result = true;
} else {
@ -232,11 +232,11 @@ bool KGlobalAccelPrivate::remove(KAction *action)
if (shortcut.action == action) {
found = true;
if (kUngrabKey(shortcut.keyModX, shortcut.keyCodeX)) {
kDebug(s_kglobalaccelarea) << "ungrabbed shortcut" << shortcut.keyModX << shortcut.keyCodeX << shortcut.action;
kDebug(s_kglobalaccelarea) << "ungrabbed shortcut" << shortcut.keyModX << shortcut.keyCodeX;
iter.remove();
result = true;
} else {
kWarning(s_kglobalaccelarea) << "could not ungrab shortcut" << shortcut.keyModX << shortcut.keyCodeX << shortcut.action;
kWarning(s_kglobalaccelarea) << "could not ungrab shortcut" << shortcut.keyModX << shortcut.keyCodeX;
}
}
}