Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plasma5-integration for
openSUSE:Factory checked in at 2022-02-07 23:37:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma5-integration (Old)
and /work/SRC/openSUSE:Factory/.plasma5-integration.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-integration"
Mon Feb 7 23:37:09 2022 rev:109 rq:951898 version:5.24.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma5-integration/plasma5-integration.changes
2022-01-11 21:14:39.940764531 +0100
+++
/work/SRC/openSUSE:Factory/.plasma5-integration.new.1898/plasma5-integration.changes
2022-02-07 23:37:35.862644625 +0100
@@ -1,0 +2,25 @@
+Sat Feb 5 19:51:01 UTC 2022 - Fabian Vogt <[email protected]>
+
+- Update to 5.24.0
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/plasma/5/5.24.0
+- No code changes since 5.23.90
+
+-------------------------------------------------------------------
+Thu Jan 13 20:30:30 UTC 2022 - Fabian Vogt <[email protected]>
+
+- Update to 5.23.90
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/plasma/5/5.23.90
+- Changes since 5.23.5:
+ * Port Q_FOREACH
+ * Fix some clazy warning
+ * Add GitLab CI
+ * Remove manual lnf default handling
+ * Only read values that will be used
+ * Replace Q_DECL_OVERRIDE by override
+ * Add .kde-ci.yml
+
+-------------------------------------------------------------------
Old:
----
plasma-integration-5.23.5.tar.xz
plasma-integration-5.23.5.tar.xz.sig
New:
----
plasma-integration-5.24.0.tar.xz
plasma-integration-5.24.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma5-integration.spec ++++++
--- /var/tmp/diff_new_pack.LHOhkz/_old 2022-02-07 23:37:37.178635768 +0100
+++ /var/tmp/diff_new_pack.LHOhkz/_new 2022-02-07 23:37:37.186635714 +0100
@@ -16,9 +16,9 @@
#
-%bcond_without lang
+%bcond_without released
Name: plasma5-integration
-Version: 5.23.5
+Version: 5.24.0
Release: 0
# Full Plasma 5 version (e.g. 5.8.95)
%{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}}
@@ -28,9 +28,9 @@
License: GPL-2.0+
Group: System/GUI/KDE
Url: http://www.kde.org
-Source:
https://download.kde.org/stable/plasma/%{version}/plasma-integration-%{version}.tar.xz
-%if %{with lang}
-Source1:
https://download.kde.org/stable/plasma/%{version}/plasma-integration-%{version}.tar.xz.sig
+Source: plasma-integration-%{version}.tar.xz
+%if %{with released}
+Source1: plasma-integration-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
BuildRequires: extra-cmake-modules >= 5.17.0
@@ -98,7 +98,7 @@
%install
%kf5_makeinstall -C build
-%if %{with lang}
+%if %{with released}
%find_lang plasmaintegration5
%endif
@@ -113,7 +113,7 @@
%{_includedir}/PlasmaKeyData/plasmakeydata.h
%{_kf5_libdir}/pkgconfig/plasma-key-data.pc
-%if %{with lang}
+%if %{with released}
%files -n plasma5-integration-plugin-lang -f plasmaintegration5.lang
%endif
++++++ plasma-integration-5.23.5.tar.xz -> plasma-integration-5.24.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plasma-integration-5.23.5/.gitlab-ci.yml
new/plasma-integration-5.24.0/.gitlab-ci.yml
--- old/plasma-integration-5.23.5/.gitlab-ci.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/plasma-integration-5.24.0/.gitlab-ci.yml 2022-02-03
15:40:09.000000000 +0100
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
+
+include:
+ -
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
+ -
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plasma-integration-5.23.5/.kde-ci.yml
new/plasma-integration-5.24.0/.kde-ci.yml
--- old/plasma-integration-5.23.5/.kde-ci.yml 1970-01-01 01:00:00.000000000
+0100
+++ new/plasma-integration-5.24.0/.kde-ci.yml 2022-02-03 15:40:09.000000000
+0100
@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
+
+Dependencies:
+- 'on': ['@all']
+ 'require':
+ 'frameworks/extra-cmake-modules': '@latest'
+ 'frameworks/kauth': '@latest'
+ 'frameworks/kbookmarks': '@latest'
+ 'frameworks/kcodecs': '@latest'
+ 'frameworks/kcompletion': '@latest'
+ 'frameworks/kconfig': '@latest'
+ 'frameworks/kconfigwidgets': '@latest'
+ 'frameworks/kcoreaddons': '@latest'
+ 'frameworks/ki18n': '@latest'
+ 'frameworks/kiconthemes': '@latest'
+ 'frameworks/kio': '@latest'
+ 'frameworks/kitemviews': '@latest'
+ 'frameworks/kjobwidgets': '@latest'
+ 'frameworks/knotifications': '@latest'
+ 'frameworks/kservice': '@latest'
+ 'frameworks/kwayland': '@latest'
+ 'frameworks/kwidgetsaddons': '@latest'
+ 'frameworks/kwindowsystem': '@latest'
+ 'frameworks/kxmlgui': '@latest'
+ 'frameworks/solid': '@latest'
+ 'plasma/breeze': '@same'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plasma-integration-5.23.5/CMakeLists.txt
new/plasma-integration-5.24.0/CMakeLists.txt
--- old/plasma-integration-5.23.5/CMakeLists.txt 2022-01-04
10:04:54.000000000 +0100
+++ new/plasma-integration-5.24.0/CMakeLists.txt 2022-02-03
15:40:09.000000000 +0100
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.16)
project(PlasmaIntegration)
-set(PROJECT_VERSION "5.23.5")
+set(PROJECT_VERSION "5.24.0")
set(PROJECT_VERSION_MAJOR 5)
set(QT_MIN_VERSION "5.15.0")
@@ -43,7 +43,8 @@
# dependencies for QPA plugin
find_package(Qt5ThemeSupport REQUIRED)
set(QT5PLATFORMSUPPORT_LIBS Qt5ThemeSupport::Qt5ThemeSupport)
-
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
+add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900)
add_definitions(-DTRANSLATION_DOMAIN=\"plasmaintegration5\")
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
ki18n_install(po)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma-integration-5.23.5/autotests/kdeplatformsystemtrayicon_unittest.cpp
new/plasma-integration-5.24.0/autotests/kdeplatformsystemtrayicon_unittest.cpp
---
old/plasma-integration-5.23.5/autotests/kdeplatformsystemtrayicon_unittest.cpp
2022-01-04 10:04:54.000000000 +0100
+++
new/plasma-integration-5.24.0/autotests/kdeplatformsystemtrayicon_unittest.cpp
2022-02-03 15:40:09.000000000 +0100
@@ -22,7 +22,7 @@
void KDEPlatformSystemTrayIcon_UnitTest::testMenuRecreate()
{
QMenu *trayIconMenu = new QMenu();
- trayIconMenu->addAction("testAction");
+ trayIconMenu->addAction(QStringLiteral("testAction"));
KDEPlatformSystemTrayIcon *kpsti = new KDEPlatformSystemTrayIcon();
@@ -54,7 +54,7 @@
void KDEPlatformSystemTrayIcon_UnitTest::testAddActionAfterMenuRecreate()
{
QMenu *trayIconMenu = new QMenu();
- trayIconMenu->addAction("testAction1");
+ trayIconMenu->addAction(QStringLiteral("testAction1"));
KDEPlatformSystemTrayIcon *kpsti = new KDEPlatformSystemTrayIcon();
@@ -73,7 +73,7 @@
kpsti->cleanup();
// add action, internal menu is destroyed
- trayIconMenu->addAction("testAction2");
+ trayIconMenu->addAction(QStringLiteral("testAction2"));
// simulates second QSystemTrayIcon::show()
kpsti->init();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma-integration-5.23.5/po/sk/plasmaintegration5.po
new/plasma-integration-5.24.0/po/sk/plasmaintegration5.po
--- old/plasma-integration-5.23.5/po/sk/plasmaintegration5.po 2022-01-04
10:05:09.000000000 +0100
+++ new/plasma-integration-5.24.0/po/sk/plasmaintegration5.po 2022-02-03
15:40:24.000000000 +0100
@@ -5,7 +5,7 @@
"Project-Id-Version: frameworkintegration5\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2021-09-03 00:18+0000\n"
-"PO-Revision-Date: 2021-12-01 15:32+0100\n"
+"PO-Revision-Date: 2021-12-01 15:33+0100\n"
"Last-Translator: Du??an Kazik <[email protected]>\n"
"Language-Team: Slovak <[email protected]>\n"
"Language: sk\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma-integration-5.23.5/po/vi/plasmaintegration5.po
new/plasma-integration-5.24.0/po/vi/plasmaintegration5.po
--- old/plasma-integration-5.23.5/po/vi/plasmaintegration5.po 1970-01-01
01:00:00.000000000 +0100
+++ new/plasma-integration-5.24.0/po/vi/plasmaintegration5.po 2022-02-03
15:40:27.000000000 +0100
@@ -0,0 +1,145 @@
+# Copyright (C) YEAR This file is copyright:
+# This file is distributed under the same license as the plasma-integration
package.
+#
+# Phu Hung Nguyen <[email protected]>, 2021.
+msgid ""
+msgstr ""
+"Project-Id-Version: plasma-integration\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
+"POT-Creation-Date: 2021-09-03 00:18+0000\n"
+"PO-Revision-Date: 2021-12-23 11:48+0100\n"
+"Last-Translator: Phu Hung Nguyen <[email protected]>\n"
+"Language-Team: Vietnamese <[email protected]>\n"
+"Language: vi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 20.12.2\n"
+
+#: platformtheme/kdeplatformfiledialoghelper.cpp:279
+#, kde-format
+msgctxt "@title:window"
+msgid "Open File"
+msgstr "M??? t???p"
+
+#: platformtheme/kdeplatformfiledialoghelper.cpp:280
+#, kde-format
+msgctxt "@title:window"
+msgid "Save File"
+msgstr "L??u t???p"
+
+#: platformtheme/kdeplatformtheme.cpp:286
+#, kde-format
+msgctxt "@action:button"
+msgid "Save All"
+msgstr "L??u t???t c???"
+
+#: platformtheme/kdeplatformtheme.cpp:292
+#, kde-format
+msgctxt "@action:button"
+msgid "Yes to All"
+msgstr "C?? cho t???t c???"
+
+#: platformtheme/kdeplatformtheme.cpp:296
+#, kde-format
+msgctxt "@action:button"
+msgid "No to All"
+msgstr "Kh??ng cho t???t c???"
+
+#: platformtheme/kdeplatformtheme.cpp:299
+#, kde-format
+msgctxt "@action:button"
+msgid "Abort"
+msgstr "Hu??? b???"
+
+#: platformtheme/kdeplatformtheme.cpp:301
+#, kde-format
+msgctxt "@action:button"
+msgid "Retry"
+msgstr "Th??? l???i"
+
+#: platformtheme/kdeplatformtheme.cpp:303
+#, kde-format
+msgctxt "@action:button"
+msgid "Ignore"
+msgstr "B??? qua"
+
+#: platformtheme/kdirselectdialog.cpp:120
+#, kde-format
+msgctxt "folder name"
+msgid "New Folder"
+msgstr "Th?? m???c m???i"
+
+#: platformtheme/kdirselectdialog.cpp:126
+#, kde-format
+msgctxt "@title:window"
+msgid "New Folder"
+msgstr "Th?? m???c m???i"
+
+#: platformtheme/kdirselectdialog.cpp:127
+#, kde-format
+msgctxt "@label:textbox"
+msgid ""
+"Create new folder in:\n"
+"%1"
+msgstr ""
+"T???o th?? m???c m???i trong:\n"
+"%1"
+
+#: platformtheme/kdirselectdialog.cpp:158
+#, kde-format
+msgid "A file or folder named %1 already exists."
+msgstr "M???t t???p hay th?? m???c t??n l?? %1 ???? t???n t???i."
+
+#: platformtheme/kdirselectdialog.cpp:167
+#, kde-format
+msgid "You do not have permission to create that folder."
+msgstr "B???n kh??ng c?? quy???n truy c???p ????? t???o th?? m???c ????."
+
+#: platformtheme/kdirselectdialog.cpp:275
+#, kde-format
+msgctxt "@title:window"
+msgid "Select Folder"
+msgstr "Ch???n th?? m???c"
+
+#: platformtheme/kdirselectdialog.cpp:284
+#, kde-format
+msgctxt "@action:button"
+msgid "New Folder..."
+msgstr "Th?? m???c m???i..."
+
+#: platformtheme/kdirselectdialog.cpp:333
+#, kde-format
+msgctxt "@action:inmenu"
+msgid "New Folder..."
+msgstr "Th?? m???c m???i..."
+
+#: platformtheme/kdirselectdialog.cpp:342
+#, kde-format
+msgctxt "@action:inmenu"
+msgid "Move to Trash"
+msgstr "Chuy???n v??o th??ng r??c"
+
+#: platformtheme/kdirselectdialog.cpp:351
+#, kde-format
+msgctxt "@action:inmenu"
+msgid "Delete"
+msgstr "Xo??"
+
+#: platformtheme/kdirselectdialog.cpp:362
+#, kde-format
+msgctxt "@option:check"
+msgid "Show Hidden Folders"
+msgstr "Hi???n th?? m???c ???n"
+
+#: platformtheme/kdirselectdialog.cpp:369
+#, kde-format
+msgctxt "@action:inmenu"
+msgid "Properties"
+msgstr "Thu???c t??nh"
+
+#: platformtheme/kfiletreeview.cpp:185
+#, kde-format
+msgid "Show Hidden Folders"
+msgstr "Hi???n th?? m???c ???n"
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma-integration-5.23.5/po/zh_CN/plasmaintegration5.po
new/plasma-integration-5.24.0/po/zh_CN/plasmaintegration5.po
--- old/plasma-integration-5.23.5/po/zh_CN/plasmaintegration5.po
2022-01-04 10:05:13.000000000 +0100
+++ new/plasma-integration-5.24.0/po/zh_CN/plasmaintegration5.po
2022-02-03 15:40:27.000000000 +0100
@@ -7,7 +7,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2021-09-03 00:18+0000\n"
-"PO-Revision-Date: 2021-12-22 14:10\n"
+"PO-Revision-Date: 2022-01-08 15:23\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
@@ -18,9 +18,9 @@
"X-Crowdin-Project: kdeorg\n"
"X-Crowdin-Project-ID: 269464\n"
"X-Crowdin-Language: zh-CN\n"
-"X-Crowdin-File: /kf5-stable/messages/plasma-integration/plasmaintegration5."
+"X-Crowdin-File: /kf5-trunk/messages/plasma-integration/plasmaintegration5."
"pot\n"
-"X-Crowdin-File-ID: 2364\n"
+"X-Crowdin-File-ID: 4168\n"
#: platformtheme/kdeplatformfiledialoghelper.cpp:279
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma-integration-5.23.5/src/platforminputcontextplugin/CMakeLists.txt
new/plasma-integration-5.24.0/src/platforminputcontextplugin/CMakeLists.txt
--- old/plasma-integration-5.23.5/src/platforminputcontextplugin/CMakeLists.txt
2022-01-04 10:04:54.000000000 +0100
+++ new/plasma-integration-5.24.0/src/platforminputcontextplugin/CMakeLists.txt
2022-02-03 15:40:09.000000000 +0100
@@ -6,6 +6,7 @@
add_library(input_plugin MODULE
main.cpp
plasmaimcontext.cpp
+ plasmaimcontext.h
)
target_link_libraries(input_plugin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma-integration-5.23.5/src/platforminputcontextplugin/main.cpp
new/plasma-integration-5.24.0/src/platforminputcontextplugin/main.cpp
--- old/plasma-integration-5.23.5/src/platforminputcontextplugin/main.cpp
2022-01-04 10:04:54.000000000 +0100
+++ new/plasma-integration-5.24.0/src/platforminputcontextplugin/main.cpp
2022-02-03 15:40:09.000000000 +0100
@@ -18,12 +18,12 @@
Q_PLUGIN_METADATA(IID QPlatformInputContextFactoryInterface_iid FILE
"plasmaim.json")
public:
- QPlatformInputContext *create(const QString &, const QStringList &)
Q_DECL_OVERRIDE;
+ QPlatformInputContext *create(const QString &, const QStringList &)
override;
};
QPlatformInputContext *PlasmaIM::create(const QString &system, const
QStringList &)
{
- if (system == "plasmaim") {
+ if (system == QLatin1String("plasmaim")) {
return new PlasmaIMContext;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma-integration-5.23.5/src/platforminputcontextplugin/plasmaimcontext.cpp
new/plasma-integration-5.24.0/src/platforminputcontextplugin/plasmaimcontext.cpp
---
old/plasma-integration-5.23.5/src/platforminputcontextplugin/plasmaimcontext.cpp
2022-01-04 10:04:54.000000000 +0100
+++
new/plasma-integration-5.24.0/src/platforminputcontextplugin/plasmaimcontext.cpp
2022-02-03 15:40:09.000000000 +0100
@@ -26,7 +26,7 @@
{
QList<TooltipData> ret;
int i = 0;
- for (auto item : KeyData::KeyMappings[ch]) {
+ for (const auto &item : KeyData::KeyMappings[ch]) {
ret << TooltipData{upperCase ? item.toUpper() : item,
QString::number((i + 1) < 10 ? (i + 1) : 0, 10), i};
i++;
}
@@ -90,7 +90,7 @@
popup->setLayoutDirection(isRtl ? Qt::RightToLeft : Qt::LeftToRight);
popup->setLayout(grid);
int col = 0;
- for (auto item : text) {
+ for (const auto &item : text) {
auto label = new QLabel(item.character, popup.data());
auto button = new QPushButton(item.number, popup.data());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma-integration-5.23.5/src/platforminputcontextplugin/plasmaimcontext.h
new/plasma-integration-5.24.0/src/platforminputcontextplugin/plasmaimcontext.h
---
old/plasma-integration-5.23.5/src/platforminputcontextplugin/plasmaimcontext.h
2022-01-04 10:04:54.000000000 +0100
+++
new/plasma-integration-5.24.0/src/platforminputcontextplugin/plasmaimcontext.h
2022-02-03 15:40:09.000000000 +0100
@@ -32,9 +32,9 @@
PlasmaIMContext();
~PlasmaIMContext();
- bool isValid() const Q_DECL_OVERRIDE;
- void setFocusObject(QObject *object) Q_DECL_OVERRIDE;
- bool filterEvent(const QEvent *event) Q_DECL_OVERRIDE;
+ bool isValid() const override;
+ void setFocusObject(QObject *object) override;
+ bool filterEvent(const QEvent *event) override;
private:
void cleanUpState();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma-integration-5.23.5/src/platformtheme/kdeplatformsystemtrayicon.cpp
new/plasma-integration-5.24.0/src/platformtheme/kdeplatformsystemtrayicon.cpp
---
old/plasma-integration-5.23.5/src/platformtheme/kdeplatformsystemtrayicon.cpp
2022-01-04 10:04:54.000000000 +0100
+++
new/plasma-integration-5.24.0/src/platformtheme/kdeplatformsystemtrayicon.cpp
2022-02-03 15:40:09.000000000 +0100
@@ -178,7 +178,7 @@
if (!m_separatorsCollapsible.isNull()) {
m_menu->setSeparatorsCollapsible(m_separatorsCollapsible.toBool());
}
- for (auto item : m_items) {
+ for (auto item : qAsConst(m_items)) {
m_menu->addAction(item->action());
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma-integration-5.23.5/src/platformtheme/khintssettings.cpp
new/plasma-integration-5.24.0/src/platformtheme/khintssettings.cpp
--- old/plasma-integration-5.23.5/src/platformtheme/khintssettings.cpp
2022-01-04 10:04:54.000000000 +0100
+++ new/plasma-integration-5.24.0/src/platformtheme/khintssettings.cpp
2022-02-03 15:40:09.000000000 +0100
@@ -81,17 +81,6 @@
updatePortalSetting();
}
- // try to extract the proper defaults file from a lookandfeel package
- const QString looknfeel = readConfigValue(cg,
QStringLiteral("LookAndFeelPackage"), defaultLookAndFeelPackage).toString();
- mDefaultLnfConfig = KSharedConfig::openConfig(
- QStandardPaths::locate(QStandardPaths::GenericDataLocation,
- QStringLiteral("plasma/look-and-feel/") +
defaultLookAndFeelPackage + QStringLiteral("/contents/defaults")));
- if (looknfeel != defaultLookAndFeelPackage) {
- mLnfConfig =
-
KSharedConfig::openConfig(QStandardPaths::locate(QStandardPaths::GenericDataLocation,
-
QStringLiteral("plasma/look-and-feel/") + looknfeel +
QStringLiteral("/contents/defaults")));
- }
-
const auto cursorBlinkRate = readConfigValue(cg,
QStringLiteral("CursorBlinkRate"), 1000).toInt();
m_hints[QPlatformTheme::CursorFlashTime] = cursorBlinkRate > 0 ?
qBound(200, cursorBlinkRate, 2000) : 0; // 0 => no blinking
m_hints[QPlatformTheme::MouseDoubleClickInterval] = readConfigValue(cg,
QStringLiteral("DoubleClickInterval"), 400);
@@ -163,31 +152,7 @@
QVariant KHintsSettings::readConfigValue(const QString &group, const QString
&key, const QVariant &defaultValue)
{
KConfigGroup userCg(mKdeGlobals, group);
- QVariant value = readConfigValue(userCg, key, QString());
-
- if (!value.isNull()) {
- return value;
- }
-
- if (mLnfConfig) {
- KConfigGroup lnfCg(mLnfConfig, "kdeglobals");
- lnfCg = KConfigGroup(&lnfCg, group);
- if (lnfCg.isValid()) {
- value = lnfCg.readEntry(key, defaultValue);
-
- if (!value.isNull()) {
- return value;
- }
- }
- }
-
- KConfigGroup lnfCg(mDefaultLnfConfig, "kdeglobals");
- lnfCg = KConfigGroup(&lnfCg, group);
- if (lnfCg.isValid()) {
- return lnfCg.readEntry(key, defaultValue);
- }
-
- return defaultValue;
+ return readConfigValue(userCg, key, defaultValue);
}
QVariant KHintsSettings::readConfigValue(const KConfigGroup &cg, const QString
&key, const QVariant &defaultValue) const
@@ -382,8 +347,8 @@
return;
}
- QWidgetList widgets = QApplication::allWidgets();
- Q_FOREACH (QWidget *widget, widgets) {
+ const QWidgetList widgets = QApplication::allWidgets();
+ for (QWidget *widget : widgets) {
if (qobject_cast<QToolBar *>(widget) || qobject_cast<QMainWindow
*>(widget)) {
QEvent event(QEvent::StyleChange);
QApplication::sendEvent(widget, &event);
@@ -477,13 +442,12 @@
void KHintsSettings::updateCursorTheme()
{
- KConfig config(QStringLiteral("kcminputrc"));
- KConfigGroup g(&config, "Mouse");
-
- int size = g.readEntry("cursorSize", 24);
-
#if HAVE_X11
if (QX11Info::isPlatformX11()) {
+ KConfig config(QStringLiteral("kcminputrc"));
+ KConfigGroup g(&config, "Mouse");
+
+ int size = g.readEntry("cursorSize", 24);
const QString theme = g.readEntry("cursorTheme", QString());
// Note that in X11R7.1 and earlier, calling XcursorSetTheme()
// with a NULL theme would cause Xcursor to use "default", but
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma-integration-5.23.5/src/platformtheme/khintssettings.h
new/plasma-integration-5.24.0/src/platformtheme/khintssettings.h
--- old/plasma-integration-5.23.5/src/platformtheme/khintssettings.h
2022-01-04 10:04:54.000000000 +0100
+++ new/plasma-integration-5.24.0/src/platformtheme/khintssettings.h
2022-02-03 15:40:09.000000000 +0100
@@ -86,8 +86,6 @@
QHash<QPlatformTheme::Palette, QPalette *> m_palettes;
QHash<QPlatformTheme::ThemeHint, QVariant> m_hints;
KSharedConfigPtr mKdeGlobals;
- KSharedConfigPtr mDefaultLnfConfig;
- KSharedConfigPtr mLnfConfig;
QMap<QString, QVariantMap> mKdeGlobalsPortal;
bool mUsePortal;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma-integration-5.23.5/src/platformtheme/qxdgdesktopportalfiledialog.cpp
new/plasma-integration-5.24.0/src/platformtheme/qxdgdesktopportalfiledialog.cpp
---
old/plasma-integration-5.23.5/src/platformtheme/qxdgdesktopportalfiledialog.cpp
2022-01-04 10:04:54.000000000 +0100
+++
new/plasma-integration-5.24.0/src/platformtheme/qxdgdesktopportalfiledialog.cpp
2022-02-03 15:40:09.000000000 +0100
@@ -145,26 +145,26 @@
{
Q_D(const QXdgDesktopPortalFileDialog);
- QDBusMessage message =
QDBusMessage::createMethodCall(QLatin1String("org.freedesktop.portal.Desktop"),
-
QLatin1String("/org/freedesktop/portal/desktop"),
-
QLatin1String("org.freedesktop.portal.FileChooser"),
- d->saveFile ?
QLatin1String("SaveFile") : QLatin1String("OpenFile"));
- QString parentWindowId = QLatin1String("x11:") + QString::number(d->winId,
16);
+ QDBusMessage message =
QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.portal.Desktop"),
+
QStringLiteral("/org/freedesktop/portal/desktop"),
+
QStringLiteral("org.freedesktop.portal.FileChooser"),
+ d->saveFile ?
QStringLiteral("SaveFile") : QStringLiteral("OpenFile"));
+ QString parentWindowId = QStringLiteral("x11:") +
QString::number(d->winId, 16);
QVariantMap options;
if (!d->acceptLabel.isEmpty())
- options.insert(QLatin1String("accept_label"), d->acceptLabel);
+ options.insert(QStringLiteral("accept_label"), d->acceptLabel);
- options.insert(QLatin1String("modal"), d->modal);
- options.insert(QLatin1String("multiple"), d->multipleFiles);
- options.insert(QLatin1String("directory"), d->selectDirectory);
+ options.insert(QStringLiteral("modal"), d->modal);
+ options.insert(QStringLiteral("multiple"), d->multipleFiles);
+ options.insert(QStringLiteral("directory"), d->selectDirectory);
if (d->saveFile) {
if (!d->directory.isEmpty())
- options.insert(QLatin1String("current_folder"),
QFile::encodeName(d->directory.toLocalFile()).append('\0'));
+ options.insert(QStringLiteral("current_folder"),
QFile::encodeName(d->directory.toLocalFile()).append('\0'));
if (!d->selectedFiles.isEmpty())
- options.insert(QLatin1String("current_file"),
QFile::encodeName(d->selectedFiles.first().toLocalFile()).append('\0'));
+ options.insert(QStringLiteral("current_file"),
QFile::encodeName(d->selectedFiles.first().toLocalFile()).append('\0'));
}
// Insert filters
@@ -207,7 +207,7 @@
QStringList filterStrings =
match.captured(2).split(QLatin1Char(' '), Qt::SkipEmptyParts);
FilterConditionList filterConditions;
- for (const QString &filterString : filterStrings) {
+ for (const QString &filterString : qAsConst(filterStrings)) {
FilterCondition filterCondition;
filterCondition.type = GlobalPattern;
filterCondition.pattern = filterString;
@@ -224,9 +224,9 @@
}
if (!filterList.isEmpty())
- options.insert(QLatin1String("filters"),
QVariant::fromValue(filterList));
+ options.insert(QStringLiteral("filters"),
QVariant::fromValue(filterList));
- options.insert(QLatin1String("handle_token"),
QStringLiteral("qt%1").arg(QRandomGenerator::global()->generate()));
+ options.insert(QStringLiteral("handle_token"),
QStringLiteral("qt%1").arg(QRandomGenerator::global()->generate()));
// TODO choices a(ssa(ss)s)
// List of serialized combo boxes to add to the file chooser.
@@ -242,8 +242,8 @@
} else {
QDBusConnection::sessionBus().connect({},
reply.value().path(),
-
QLatin1String("org.freedesktop.portal.Request"),
- QLatin1String("Response"),
+
QStringLiteral("org.freedesktop.portal.Request"),
+ QStringLiteral("Response"),
this,
SLOT(gotResponse(uint,
QVariantMap)));
}
@@ -371,8 +371,8 @@
Q_D(QXdgDesktopPortalFileDialog);
if (!response) {
- if (results.contains(QLatin1String("uris"))) {
- const QStringList uris =
results.value(QLatin1String("uris")).toStringList();
+ if (results.contains(QStringLiteral("uris"))) {
+ const QStringList uris =
results.value(QStringLiteral("uris")).toStringList();
d->selectedFiles.clear();
d->selectedFiles.reserve(uris.size());
for (const QString &uri : uris) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plasma-integration-5.23.5/tests/qfiledialogtest.cpp
new/plasma-integration-5.24.0/tests/qfiledialogtest.cpp
--- old/plasma-integration-5.23.5/tests/qfiledialogtest.cpp 2022-01-04
10:04:54.000000000 +0100
+++ new/plasma-integration-5.24.0/tests/qfiledialogtest.cpp 2022-02-03
15:40:09.000000000 +0100
@@ -89,12 +89,12 @@
dialog.setNameFilters(nameFilterList);
}
- if (parser.isSet(QLatin1String("options"))) {
- auto optStrings = parser.values(QLatin1String("options"));
+ if (parser.isSet(QStringLiteral("options"))) {
+ auto optStrings = parser.values(QStringLiteral("options"));
QFileDialog::Options options = {};
const auto mo = QFileDialog::staticMetaObject;
const auto enumerator = mo.indexOfEnumerator("Options");
- for (const auto &optString : optStrings) {
+ for (const auto &optString : qAsConst(optStrings)) {
options |=
QFileDialog::Option(mo.enumerator(enumerator).keyToValue(optString.toLatin1().constData()));
}
dialog.setOptions(options);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plasma-integration-5.23.5/tests/windowdecotest.cpp
new/plasma-integration-5.24.0/tests/windowdecotest.cpp
--- old/plasma-integration-5.23.5/tests/windowdecotest.cpp 2022-01-04
10:04:54.000000000 +0100
+++ new/plasma-integration-5.24.0/tests/windowdecotest.cpp 2022-02-03
15:40:09.000000000 +0100
@@ -25,8 +25,8 @@
ATestWindow();
private:
- QPushButton *mBtn;
- QWidget *m_area;
+ QPushButton *mBtn = nullptr;
+ QWidget *m_area = nullptr;
};
ATestWindow::ATestWindow()
