From 7ef917008af169b628244dda147eeb163776f15c Mon Sep 17 00:00:00 2001 From: Luis Caceres Date: Mon, 9 Dec 2019 17:02:42 +0000 Subject: [PATCH] Fix formatting again --- src/core/kglobalaccelglobalshortcutbackend.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/core/kglobalaccelglobalshortcutbackend.cpp b/src/core/kglobalaccelglobalshortcutbackend.cpp index 000f870ac..fcb40d665 100644 --- a/src/core/kglobalaccelglobalshortcutbackend.cpp +++ b/src/core/kglobalaccelglobalshortcutbackend.cpp @@ -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 reply = iface_->getComponent(ComponentUniqueName()); + QDBusReply reply = + iface_->getComponent(ComponentUniqueName()); if (!reply.isValid()) { if (reply.error().name() == QLatin1String("org.kde.kglobalaccel.NoSuchComponent"))