Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kglobalaccel for openSUSE:Factory checked in at 2021-09-16 23:14:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kglobalaccel (Old) and /work/SRC/openSUSE:Factory/.kglobalaccel.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kglobalaccel" Thu Sep 16 23:14:00 2021 rev:98 rq:919191 version:5.86.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kglobalaccel/kglobalaccel.changes 2021-08-16 10:11:56.643073298 +0200 +++ /work/SRC/openSUSE:Factory/.kglobalaccel.new.1899/kglobalaccel.changes 2021-09-16 23:15:48.959869392 +0200 @@ -1,0 +2,15 @@ +Wed Sep 15 08:24:06 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Drop the unneeded baselibs.conf. + +------------------------------------------------------------------- +Mon Sep 6 06:22:05 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.86.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.86.0 +- Changes since 5.85.0: + * Fix launching commands with args using kstart5 (kde#433362) + +------------------------------------------------------------------- Old: ---- baselibs.conf kglobalaccel-5.85.0.tar.xz kglobalaccel-5.85.0.tar.xz.sig New: ---- kglobalaccel-5.86.0.tar.xz kglobalaccel-5.86.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kglobalaccel.spec ++++++ --- /var/tmp/diff_new_pack.bl5GXX/_old 2021-09-16 23:15:49.571870026 +0200 +++ /var/tmp/diff_new_pack.bl5GXX/_new 2021-09-16 23:15:49.575870030 +0200 @@ -17,14 +17,14 @@ %define lname libKF5GlobalAccel5 -%define _tar_path 5.85 +%define _tar_path 5.86 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kglobalaccel -Version: 5.85.0 +Version: 5.86.0 Release: 0 Summary: Global desktop keyboard shortcuts License: LGPL-2.1-or-later @@ -35,7 +35,6 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif -Source99: baselibs.conf BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem ++++++ kglobalaccel-5.85.0.tar.xz -> kglobalaccel-5.86.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.85.0/.git-blame-ignore-revs new/kglobalaccel-5.86.0/.git-blame-ignore-revs --- old/kglobalaccel-5.85.0/.git-blame-ignore-revs 1970-01-01 01:00:00.000000000 +0100 +++ new/kglobalaccel-5.86.0/.git-blame-ignore-revs 2021-09-04 19:00:29.000000000 +0200 @@ -0,0 +1,2 @@ +#clang-tidy +9be9b195a8cda0e9b55f76289a417310fd8da3d0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.85.0/CMakeLists.txt new/kglobalaccel-5.86.0/CMakeLists.txt --- old/kglobalaccel-5.85.0/CMakeLists.txt 2021-08-06 11:04:23.000000000 +0200 +++ new/kglobalaccel-5.86.0/CMakeLists.txt 2021-09-04 19:00:29.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.85.0") # handled by release scripts -set(KF_DEP_VERSION "5.85.0") # handled by release scripts +set(KF_VERSION "5.86.0") # handled by release scripts +set(KF_DEP_VERSION "5.86.0") # handled by release scripts project(KGlobalAccel VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.85.0 NO_MODULE) +find_package(ECM 5.86.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -37,7 +37,7 @@ SOVERSION 5) # Dependencies -set(REQUIRED_QT_VERSION 5.15.0) +set(REQUIRED_QT_VERSION 5.15.2) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus Widgets) # Dependencies of runtime component @@ -64,7 +64,7 @@ set(HAVE_X11 1) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) endif() -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) # Subdirectories ecm_install_po_files_as_qm(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.85.0/po/hi/kglobalaccel5_qt.po new/kglobalaccel-5.86.0/po/hi/kglobalaccel5_qt.po --- old/kglobalaccel-5.85.0/po/hi/kglobalaccel5_qt.po 2021-08-06 11:04:23.000000000 +0200 +++ new/kglobalaccel-5.86.0/po/hi/kglobalaccel5_qt.po 2021-09-04 19:00:29.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2021-06-27 12:40+0530\n" +"PO-Revision-Date: 2021-08-21 16:25+0530\n" "Last-Translator: Raghavendra Kamath <ra...@raghukamath.com>\n" "Language-Team: kde-hindi\n" "Language: hi\n" @@ -20,7 +20,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Lokalize 21.04.2\n" +"X-Generator: Lokalize 21.08.0\n" "X-Qt-Contexts: true\n" #: kglobalaccel.cpp:536 @@ -54,7 +54,7 @@ #, qt-format msgctxt "KGlobalAccel|" msgid "In context '%1' for action '%2'\n" -msgstr "?????????????????? '%2' ?????? ????????? ????????????????????? '%1'\n" +msgstr "?????????????????? '%2' ?????? ????????? ????????????????????? '%1'\n" #: kglobalaccel.cpp:570 #, qt-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.85.0/po/zh_CN/kglobalaccel5_qt.po new/kglobalaccel-5.86.0/po/zh_CN/kglobalaccel5_qt.po --- old/kglobalaccel-5.85.0/po/zh_CN/kglobalaccel5_qt.po 2021-08-06 11:04:23.000000000 +0200 +++ new/kglobalaccel-5.86.0/po/zh_CN/kglobalaccel5_qt.po 2021-09-04 19:00:29.000000000 +0200 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2021-07-26 13:47\n" +"PO-Revision-Date: 2021-08-30 11:43\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.85.0/src/kglobalaccel.cpp new/kglobalaccel-5.86.0/src/kglobalaccel.cpp --- old/kglobalaccel-5.85.0/src/kglobalaccel.cpp 2021-08-06 11:04:23.000000000 +0200 +++ new/kglobalaccel-5.86.0/src/kglobalaccel.cpp 2021-09-04 19:00:29.000000000 +0200 @@ -91,8 +91,8 @@ m_watcher = nullptr; } -KGlobalAccelPrivate::KGlobalAccelPrivate(KGlobalAccel *q) - : q(q) +KGlobalAccelPrivate::KGlobalAccelPrivate(KGlobalAccel *qq) + : q(qq) { m_watcher = new QDBusServiceWatcher(serviceName(), QDBusConnection::sessionBus(), QDBusServiceWatcher::WatchForOwnerChange, q); q->connect(m_watcher, &QDBusServiceWatcher::serviceOwnerChanged, q, [this](const QString &serviceName, const QString &oldOwner, const QString &newOwner) { @@ -591,10 +591,11 @@ } QList<int> sc = self()->d->iface()->shortcut(actionId); - for (int i = 0; i < sc.count(); i++) + for (int i = 0; i < sc.count(); i++) { if (sc[i] == seq[0]) { sc[i] = 0; } + } self()->d->iface()->setForeignShortcut(actionId, sc); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.85.0/src/kglobalshortcutinfo_dbus.cpp new/kglobalaccel-5.86.0/src/kglobalshortcutinfo_dbus.cpp --- old/kglobalaccel-5.85.0/src/kglobalshortcutinfo_dbus.cpp 2021-08-06 11:04:23.000000000 +0200 +++ new/kglobalaccel-5.86.0/src/kglobalshortcutinfo_dbus.cpp 2021-09-04 19:00:29.000000000 +0200 @@ -19,12 +19,16 @@ << shortcut.contextFriendlyName(); /* clang-format on */ argument.beginArray(qMetaTypeId<int>()); - for (const QKeySequence &key : shortcut.keys()) { + + const QList<QKeySequence> keys = shortcut.keys(); + for (const QKeySequence &key : keys) { argument << key[0]; } argument.endArray(); argument.beginArray(qMetaTypeId<int>()); - for (const QKeySequence &key : shortcut.defaultKeys()) { + + const QList<QKeySequence> defaultKeys = shortcut.defaultKeys(); + for (const QKeySequence &key : defaultKeys) { argument << key[0]; } argument.endArray(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.85.0/src/runtime/component.cpp new/kglobalaccel-5.86.0/src/runtime/component.cpp --- old/kglobalaccel-5.85.0/src/runtime/component.cpp 2021-08-06 11:04:23.000000000 +0200 +++ new/kglobalaccel-5.86.0/src/runtime/component.cpp 2021-09-04 19:00:29.000000000 +0200 @@ -98,7 +98,7 @@ void Component::activateShortcuts() { - for (GlobalShortcut *shortcut : qAsConst(_current->_actions)) { + for (GlobalShortcut *shortcut : std::as_const(_current->_actions)) { shortcut->setActive(); } } @@ -165,9 +165,10 @@ // Clean up for dbus usage: any non-alphanumeric char should be turned into '_' const int len = dbusPath.length(); for (int i = 0; i < len; ++i) { - if (!dbusPath[i].isLetterOrNumber() || dbusPath[i].unicode() >= 0x7F) + if (!dbusPath[i].isLetterOrNumber() || dbusPath[i].unicode() >= 0x7F) { // DBus path can only contain ASCII characters dbusPath[i] = QLatin1Char('_'); + } } // QDBusObjectPath could be a little bit easier to handle :-) return QDBusObjectPath(_registry->dbusPath().path() + "component/" + dbusPath); @@ -175,7 +176,7 @@ void Component::deactivateShortcuts(bool temporarily) { - for (GlobalShortcut *shortcut : qAsConst(_current->_actions)) { + for (GlobalShortcut *shortcut : std::as_const(_current->_actions)) { if (temporarily // && uniqueName() == QLatin1String("kwin") // && shortcut->uniqueName() == QLatin1String("Block Global Shortcuts")) { @@ -213,14 +214,16 @@ void Component::invokeShortcut(const QString &shortcutName, const QString &context) { GlobalShortcut *shortcut = getShortcutByName(shortcutName, context); - if (shortcut) + if (shortcut) { emitGlobalShortcutPressed(*shortcut); + } } QString Component::friendlyName() const { - if (_friendlyName.isEmpty()) + if (_friendlyName.isEmpty()) { return _uniqueName; + } return _friendlyName; } @@ -232,10 +235,11 @@ QList<GlobalShortcut *> Component::getShortcutsByKey(int key) const { QList<GlobalShortcut *> rc; - for (GlobalShortcutContext *context : qAsConst(_contexts)) { + for (GlobalShortcutContext *context : std::as_const(_contexts)) { GlobalShortcut *sc = context->getShortcutByKey(key); - if (sc) + if (sc) { rc.append(sc); + } } return rc; } @@ -258,9 +262,10 @@ { // The component is active if at least one of it's global shortcuts is // present. - for (GlobalShortcut *shortcut : qAsConst(_current->_actions)) { - if (shortcut->isPresent()) + for (GlobalShortcut *shortcut : std::as_const(_current->_actions)) { + if (shortcut->isPresent()) { return true; + } } return false; } @@ -274,14 +279,16 @@ if (component == uniqueName()) { const auto actions = shortcutContext(context)->_actions; for (GlobalShortcut *sc : actions) { - if (sc->keys().contains(key)) + if (sc->keys().contains(key)) { return false; + } } } else { - for (GlobalShortcutContext *ctx : qAsConst(_contexts)) { - for (GlobalShortcut *sc : qAsConst(ctx->_actions)) { - if (sc->keys().contains(key)) + for (GlobalShortcutContext *ctx : std::as_const(_contexts)) { + for (GlobalShortcut *sc : std::as_const(ctx->_actions)) { + if (sc->keys().contains(key)) { return false; + } } } } @@ -362,7 +369,7 @@ void Component::unregisterShortcut(const QString &uniqueName) { // Now wrote all contexts - for (GlobalShortcutContext *context : qAsConst(_contexts)) { + for (GlobalShortcutContext *context : std::as_const(_contexts)) { if (context->_actions.value(uniqueName)) { delete context->takeShortcut(context->_actions.value(uniqueName)); } @@ -376,7 +383,7 @@ configGroup.deleteGroup(); // Now write all contexts - for (GlobalShortcutContext *context : qAsConst(_contexts)) { + for (GlobalShortcutContext *context : std::as_const(_contexts)) { KConfigGroup contextGroup; if (context->uniqueName() == QLatin1String("default")) { @@ -391,7 +398,7 @@ // qCDebug(KGLOBALACCELD) << "writing group " << _uniqueName << ":" << context->uniqueName(); - for (const GlobalShortcut *shortcut : qAsConst(context->_actions)) { + for (const GlobalShortcut *shortcut : std::as_const(context->_actions)) { // qCDebug(KGLOBALACCELD) << "writing" << shortcut->uniqueName(); // We do not write fresh shortcuts. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.85.0/src/runtime/globalshortcut.cpp new/kglobalaccel-5.86.0/src/runtime/globalshortcut.cpp --- old/kglobalaccel-5.85.0/src/runtime/globalshortcut.cpp 2021-08-06 11:04:23.000000000 +0200 +++ new/kglobalaccel-5.86.0/src/runtime/globalshortcut.cpp 2021-09-04 19:00:29.000000000 +0200 @@ -57,10 +57,10 @@ info.d->contextFriendlyName = context()->friendlyName(); info.d->componentUniqueName = context()->component()->uniqueName(); info.d->componentFriendlyName = context()->component()->friendlyName(); - for (int key : qAsConst(_keys)) { + for (int key : std::as_const(_keys)) { info.d->keys.append(QKeySequence(key)); } - for (int key : qAsConst(_defaultKeys)) { + for (int key : std::as_const(_defaultKeys)) { info.d->defaultKeys.append(QKeySequence(key)); } return info; @@ -142,7 +142,7 @@ _keys = QList<int>(); - for (int key : qAsConst(newKeys)) { + for (int key : std::as_const(newKeys)) { if (key != 0 && !GlobalShortcutsRegistry::self()->getShortcutByKey(key)) { _keys.append(key); } else { @@ -174,7 +174,7 @@ return; } - for (int key : qAsConst(_keys)) { + for (int key : std::as_const(_keys)) { if (key != 0 && !GlobalShortcutsRegistry::self()->registerKey(key, this)) { qCDebug(KGLOBALACCELD) << uniqueName() << ": Failed to register " << QKeySequence(key).toString(); } @@ -190,7 +190,7 @@ return; } - for (int key : qAsConst(_keys)) { + for (int key : std::as_const(_keys)) { if (key != 0 && !GlobalShortcutsRegistry::self()->unregisterKey(key, this)) { qCDebug(KGLOBALACCELD) << uniqueName() << ": Failed to unregister " << QKeySequence(key).toString(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.85.0/src/runtime/globalshortcutcontext.cpp new/kglobalaccel-5.86.0/src/runtime/globalshortcutcontext.cpp --- old/kglobalaccel-5.85.0/src/runtime/globalshortcutcontext.cpp 2021-08-06 11:04:23.000000000 +0200 +++ new/kglobalaccel-5.86.0/src/runtime/globalshortcutcontext.cpp 2021-09-04 19:00:29.000000000 +0200 @@ -31,7 +31,7 @@ QList<KGlobalShortcutInfo> GlobalShortcutContext::allShortcutInfos() const { QList<KGlobalShortcutInfo> rc; - for (GlobalShortcut *shortcut : qAsConst(_actions)) { + for (GlobalShortcut *shortcut : std::as_const(_actions)) { rc.append(static_cast<KGlobalShortcutInfo>(*shortcut)); } return rc; @@ -59,14 +59,16 @@ int keySym = key & ~Qt::KeyboardModifierMask; int keyMod = key & Qt::KeyboardModifierMask; if ((keyMod & Qt::SHIFT) && (keySym == Qt::Key_Backtab || keySym == Qt::Key_Tab)) { - for (GlobalShortcut *sc : qAsConst(_actions)) { - if (sc->keys().contains(keyMod | Qt::Key_Tab) || sc->keys().contains(keyMod | Qt::Key_Backtab)) + for (GlobalShortcut *sc : std::as_const(_actions)) { + if (sc->keys().contains(keyMod | Qt::Key_Tab) || sc->keys().contains(keyMod | Qt::Key_Backtab)) { return sc; + } } } else { - for (GlobalShortcut *sc : qAsConst(_actions)) { - if (sc->keys().contains(key)) + for (GlobalShortcut *sc : std::as_const(_actions)) { + if (sc->keys().contains(key)) { return sc; + } } } return nullptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.85.0/src/runtime/globalshortcutsregistry.cpp new/kglobalaccel-5.86.0/src/runtime/globalshortcutsregistry.cpp --- old/kglobalaccel-5.85.0/src/runtime/globalshortcutsregistry.cpp 2021-08-06 11:04:23.000000000 +0200 +++ new/kglobalaccel-5.86.0/src/runtime/globalshortcutsregistry.cpp 2021-09-04 19:00:29.000000000 +0200 @@ -115,7 +115,7 @@ void GlobalShortcutsRegistry::activateShortcuts() { - for (KdeDGlobalAccel::Component *component : qAsConst(_components)) { + for (KdeDGlobalAccel::Component *component : std::as_const(_components)) { component->activateShortcuts(); } } @@ -127,7 +127,7 @@ void GlobalShortcutsRegistry::clear() { - for (KdeDGlobalAccel::Component *component : qAsConst(_components)) { + for (KdeDGlobalAccel::Component *component : std::as_const(_components)) { delete component; } _components.clear(); @@ -143,7 +143,7 @@ void GlobalShortcutsRegistry::deactivateShortcuts(bool temporarily) { - for (KdeDGlobalAccel::Component *component : qAsConst(_components)) { + for (KdeDGlobalAccel::Component *component : std::as_const(_components)) { component->deactivateShortcuts(temporarily); } } @@ -160,10 +160,11 @@ GlobalShortcut *GlobalShortcutsRegistry::getShortcutByKey(int key) const { - for (KdeDGlobalAccel::Component *component : qAsConst(_components)) { + for (KdeDGlobalAccel::Component *component : std::as_const(_components)) { GlobalShortcut *rc = component->getShortcutByKey(key); - if (rc) + if (rc) { return rc; + } } return nullptr; } @@ -172,19 +173,21 @@ { QList<GlobalShortcut *> rc; - for (KdeDGlobalAccel::Component *component : qAsConst(_components)) { + for (KdeDGlobalAccel::Component *component : std::as_const(_components)) { rc = component->getShortcutsByKey(key); - if (!rc.isEmpty()) + if (!rc.isEmpty()) { return rc; + } } return rc; } bool GlobalShortcutsRegistry::isShortcutAvailable(int shortcut, const QString &componentName, const QString &contextName) const { - for (KdeDGlobalAccel::Component *component : qAsConst(_components)) { - if (!component->isShortcutAvailable(shortcut, componentName, contextName)) + for (KdeDGlobalAccel::Component *component : std::as_const(_components)) { + if (!component->isShortcutAvailable(shortcut, componentName, contextName)) { return false; + } } return true; } @@ -271,8 +274,9 @@ const auto groupList = configGroup.groupList(); for (const QString &context : groupList) { // Skip the friendly name group - if (context == QLatin1String("Friendly Name")) + if (context == QLatin1String("Friendly Name")) { continue; + } KConfigGroup contextGroup(&configGroup, context); QString contextFriendlyName = contextGroup.readEntry("_k_friendly_name"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.85.0/src/runtime/kglobalacceld.cpp new/kglobalaccel-5.86.0/src/runtime/kglobalacceld.cpp --- old/kglobalaccel-5.85.0/src/runtime/kglobalacceld.cpp 2021-08-06 11:04:23.000000000 +0200 +++ new/kglobalaccel-5.86.0/src/runtime/kglobalacceld.cpp 2021-09-04 19:00:29.000000000 +0200 @@ -24,8 +24,8 @@ #include "kglobalaccel.h" struct KGlobalAccelDPrivate { - KGlobalAccelDPrivate(KGlobalAccelD *q) - : q(q) + KGlobalAccelDPrivate(KGlobalAccelD *qq) + : q(qq) { } @@ -78,8 +78,9 @@ QString contextUnique; if (componentUnique.indexOf('|') == -1) { component = GlobalShortcutsRegistry::self()->getComponent(componentUnique); - if (component) + if (component) { contextUnique = component->currentContext()->uniqueName(); + } } else { splitComponent(componentUnique, contextUnique); component = GlobalShortcutsRegistry::self()->getComponent(componentUnique); @@ -274,8 +275,9 @@ void KGlobalAccelD::activateGlobalShortcutContext(const QString &component, const QString &uniqueName) { KdeDGlobalAccel::Component *const comp = GlobalShortcutsRegistry::self()->getComponent(component); - if (comp) + if (comp) { comp->activateGlobalShortcutContext(uniqueName); + } } QList<QDBusObjectPath> KGlobalAccelD::allComponents() const @@ -301,16 +303,18 @@ QList<int> KGlobalAccelD::shortcut(const QStringList &action) const { GlobalShortcut *shortcut = d->findAction(action); - if (shortcut) + if (shortcut) { return shortcut->keys(); + } return QList<int>(); } QList<int> KGlobalAccelD::defaultShortcut(const QStringList &action) const { GlobalShortcut *shortcut = d->findAction(action); - if (shortcut) + if (shortcut) { return shortcut->defaultKeys(); + } return QList<int>(); } @@ -394,8 +398,9 @@ #endif GlobalShortcut *shortcut = d->findAction(actionId); - if (shortcut) + if (shortcut) { shortcut->setIsPresent(false); + } } bool KGlobalAccelD::unregister(const QString &componentUnique, const QString &shortcutUnique) @@ -486,8 +491,9 @@ #endif GlobalShortcut *shortcut = d->findAction(actionId); - if (!shortcut) + if (!shortcut) { return; + } QList<int> newKeys = setShortcut(actionId, keys, NoAutoloading); @@ -496,8 +502,9 @@ void KGlobalAccelD::scheduleWriteSettings() const { - if (!d->writeoutTimer.isActive()) + if (!d->writeoutTimer.isActive()) { d->writeoutTimer.start(500); + } } #include "moc_kglobalacceld.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.85.0/src/runtime/kserviceactioncomponent.cpp new/kglobalaccel-5.86.0/src/runtime/kserviceactioncomponent.cpp --- old/kglobalaccel-5.85.0/src/runtime/kserviceactioncomponent.cpp 2021-08-06 11:04:23.000000000 +0200 +++ new/kglobalaccel-5.86.0/src/runtime/kserviceactioncomponent.cpp 2021-09-04 19:00:29.000000000 +0200 @@ -48,7 +48,13 @@ } const QString command = parts.takeFirst(); - if (klauncherAvailable) { + + const auto kstart = QStandardPaths::findExecutable(QStringLiteral("kstart5")); + if (!kstart.isEmpty()) { + parts.prepend(command); + parts.prepend(QStringLiteral("--")); + QProcess::startDetached(kstart, parts); + } else if (klauncherAvailable) { QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.klauncher5"), QStringLiteral("/KLauncher"), QStringLiteral("org.kde.KLauncher"), @@ -57,18 +63,14 @@ QDBusConnection::sessionBus().asyncCall(msg); } else { - const auto kstart = QStandardPaths::findExecutable(QStringLiteral("kstart5")); - if (kstart.isEmpty()) { - QProcess::startDetached(command, parts); - } else { - parts.prepend(command); - QProcess::startDetached(kstart, parts); - } + QProcess::startDetached(command, parts); } } void KServiceActionComponent::emitGlobalShortcutPressed(const GlobalShortcut &shortcut) { + // TODO KF6 use ApplicationLauncherJob to start processes when it's available in a framework that we depend on + // DBusActivatatable spec as per https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#dbus if (m_desktopFile->desktopGroup().readEntry("DBusActivatable", false)) { QString method; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.85.0/src/runtime/plugins/osx/kglobalaccel_mac.cpp new/kglobalaccel-5.86.0/src/runtime/plugins/osx/kglobalaccel_mac.cpp --- old/kglobalaccel-5.85.0/src/runtime/plugins/osx/kglobalaccel_mac.cpp 2021-08-06 11:04:23.000000000 +0200 +++ new/kglobalaccel-5.86.0/src/runtime/plugins/osx/kglobalaccel_mac.cpp 2021-09-04 19:00:29.000000000 +0200 @@ -83,7 +83,7 @@ KKeyServer::keyQtToModMac(keyQt, mod); qCDebug(KGLOBALACCELD) << "keyQt: " << keyQt << " mod: " << mod; - for (uint keyCode : qAsConst(keyCodes)) { + for (uint keyCode : std::as_const(keyCodes)) { qCDebug(KGLOBALACCELD) << " keyCode: " << keyCode; } @@ -91,7 +91,7 @@ ehkid.signature = 'Kgai'; ehkid.id = keyQt; QList<EventHotKeyRef> hotkeys; - for (uint keyCode : qAsConst(keyCodes)) { + for (uint keyCode : std::as_const(keyCodes)) { EventHotKeyRef ref; if (RegisterEventHotKey(keyCode, mod, ehkid, m_eventTarget, 0, &ref) != noErr) { qCWarning(KGLOBALACCELD) << "RegisterEventHotKey failed!"; @@ -140,7 +140,7 @@ grabKey(key, false); } // Now re-grab all the keys - for (int key : qAsConst(keys)) { + for (int key : std::as_const(keys)) { grabKey(key, true); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.85.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp new/kglobalaccel-5.86.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp --- old/kglobalaccel-5.85.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp 2021-08-06 11:04:23.000000000 +0200 +++ new/kglobalaccel-5.86.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp 2021-09-04 19:00:29.000000000 +0200 @@ -178,8 +178,9 @@ if (failed) { qCDebug(KGLOBALACCELD) << "grab failed!\n"; for (uint m = 0; m <= 0xff; m++) { - if ((m & keyModMaskX) == 0) + if ((m & keyModMaskX) == 0) { xcb_ungrab_key(QX11Info::connection(), keyCodeX, QX11Info::appRootWindow(), keyModX | m); + } } } else { success = true; @@ -215,8 +216,9 @@ break; case XCB_XKB_NEW_KEYBOARD_NOTIFY: { const xcb_xkb_new_keyboard_notify_event_t *ev = reinterpret_cast<xcb_xkb_new_keyboard_notify_event_t *>(event); - if (ev->changed & XCB_XKB_NKN_DETAIL_KEYCODES) + if (ev->changed & XCB_XKB_NKN_DETAIL_KEYCODES) { x11MappingNotify(); + } break; } default:
