Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix formatting again

This commit is contained in:
Luis Caceres 2019-12-09 17:02:42 +00:00
parent 344989785b
commit 7ef917008a
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/kglobalaccelglobalshortcutbackend.cpp
View File

@ -18,8 +18,8 @@ namespace {
#ifdef HAVE_DBUS
QString ComponentDisplayName() {
return QGuiApplication::applicationDisplayName().isEmpty()
? QCoreApplication::applicationName()
: QGuiApplication::applicationDisplayName();
? QCoreApplication::applicationName()
: QGuiApplication::applicationDisplayName();
}
QString ComponentUniqueName() { return QCoreApplication::applicationName(); }
@ -46,9 +46,7 @@ bool IsCorrectMediaKeyShortcut(const GlobalShortcuts::Shortcut& shortcut) {
KGlobalAccelShortcutBackend::KGlobalAccelShortcutBackend(
GlobalShortcuts* parent)
: GlobalShortcutBackend(parent),
iface_(nullptr),
component_(nullptr) {}
: GlobalShortcutBackend(parent), iface_(nullptr), component_(nullptr) {}
#else // HAVE_DBUS
KGlobalAccelShortcutBackend::KGlobalAccelShortcutBackend(
@ -102,9 +100,9 @@ void KGlobalAccelShortcutBackend::DoUnregister() {
for (const GlobalShortcuts::Shortcut& shortcut : manager_->shortcuts())
UnregisterAction(shortcut.id, shortcut.action);
QObject::disconnect(component_,
&OrgKdeKglobalaccelComponentInterface::globalShortcutPressed,
this, &KGlobalAccelShortcutBackend::OnShortcutPressed);
QObject::disconnect(
component_, &OrgKdeKglobalaccelComponentInterface::globalShortcutPressed,
this, &KGlobalAccelShortcutBackend::OnShortcutPressed);
#endif // HAVE_DBUS
}
@ -118,7 +116,8 @@ bool KGlobalAccelShortcutBackend::AcquireComponent() {
if (component_) return true;
QDBusReply<QDBusObjectPath> reply = iface_->getComponent(ComponentUniqueName());
QDBusReply<QDBusObjectPath> reply =
iface_->getComponent(ComponentUniqueName());
if (!reply.isValid()) {
if (reply.error().name() ==
QLatin1String("org.kde.kglobalaccel.NoSuchComponent"))