Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package frameworkintegration for
openSUSE:Factory checked in at 2021-03-16 15:39:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old)
and /work/SRC/openSUSE:Factory/.frameworkintegration.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frameworkintegration"
Tue Mar 16 15:39:55 2021 rev:93 rq:878778 version:5.80.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes
2021-02-17 18:11:24.665934276 +0100
+++
/work/SRC/openSUSE:Factory/.frameworkintegration.new.2401/frameworkintegration.changes
2021-03-16 15:41:02.440714188 +0100
@@ -1,0 +2,11 @@
+Sun Mar 7 09:26:30 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.80.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.80.0
+- Changes since 5.79.0:
+ * Add clang-format bits to CMakeLists.txt
+ * Port usages of deprecated KNewStuff methods
+
+-------------------------------------------------------------------
Old:
----
frameworkintegration-5.79.0.tar.xz
frameworkintegration-5.79.0.tar.xz.sig
New:
----
frameworkintegration-5.80.0.tar.xz
frameworkintegration-5.80.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ frameworkintegration.spec ++++++
--- /var/tmp/diff_new_pack.Xjn6VK/_old 2021-03-16 15:41:03.088715225 +0100
+++ /var/tmp/diff_new_pack.Xjn6VK/_new 2021-03-16 15:41:03.092715231 +0100
@@ -17,7 +17,7 @@
%define lname libKF5Style5
-%define _tar_path 5.79
+%define _tar_path 5.80
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -25,7 +25,7 @@
# Only needed for the package signature condition
%bcond_without lang
Name: frameworkintegration
-Version: 5.79.0
+Version: 5.80.0
Release: 0
Summary: Plugins responsible for better integration of Qt applications
in KDE Workspace
License: LGPL-2.1-or-later
++++++ frameworkintegration-5.79.0.tar.xz -> frameworkintegration-5.80.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.79.0/.git-blame-ignore-revs
new/frameworkintegration-5.80.0/.git-blame-ignore-revs
--- old/frameworkintegration-5.79.0/.git-blame-ignore-revs 1970-01-01
01:00:00.000000000 +0100
+++ new/frameworkintegration-5.80.0/.git-blame-ignore-revs 2021-03-01
13:23:02.000000000 +0100
@@ -0,0 +1,2 @@
+#clang-format
+31ba7764665ccacb0a2da9c40fdc49083b5decd0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.79.0/.gitignore
new/frameworkintegration-5.80.0/.gitignore
--- old/frameworkintegration-5.79.0/.gitignore 2021-01-30 18:35:27.000000000
+0100
+++ new/frameworkintegration-5.80.0/.gitignore 2021-03-01 13:23:02.000000000
+0100
@@ -21,3 +21,4 @@
*.unc-backup*
.cmake/
/.clang-format
+/compile_commands.json
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.79.0/CMakeLists.txt
new/frameworkintegration-5.80.0/CMakeLists.txt
--- old/frameworkintegration-5.79.0/CMakeLists.txt 2021-01-30
18:35:27.000000000 +0100
+++ new/frameworkintegration-5.80.0/CMakeLists.txt 2021-03-01
13:23:02.000000000 +0100
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.5)
-set(KF_VERSION "5.79.0") # handled by release scripts
-set(KF_DEP_VERSION "5.79.0") # handled by release scripts
+set(KF_VERSION "5.80.0") # handled by release scripts
+set(KF_DEP_VERSION "5.80.0") # handled by release scripts
project(FrameworkIntegration VERSION ${KF_VERSION})
include(FeatureSummary)
-find_package(ECM 5.79.0 NO_MODULE)
+find_package(ECM 5.80.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)
@@ -21,6 +21,7 @@
include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
+include(KDEGitCommitHooks)
set(REQUIRED_QT_VERSION 5.14.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Widgets)
@@ -78,3 +79,5 @@
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+
+kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.79.0/autotests/kstyle_unittest.cpp
new/frameworkintegration-5.80.0/autotests/kstyle_unittest.cpp
--- old/frameworkintegration-5.79.0/autotests/kstyle_unittest.cpp
2021-01-30 18:35:27.000000000 +0100
+++ new/frameworkintegration-5.80.0/autotests/kstyle_unittest.cpp
2021-03-01 13:23:02.000000000 +0100
@@ -8,13 +8,13 @@
#include "kdeplatformtheme_config.h"
#include "kstyle.h"
-#include <QTest>
+#include <QApplication>
#include <QDir>
#include <QFile>
+#include <QStandardPaths>
+#include <QTest>
#include <QToolBar>
#include <QToolButton>
-#include <QApplication>
-#include <QStandardPaths>
#include <QDebug>
@@ -24,14 +24,14 @@
QString configPath =
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
- if(!QDir(configPath).mkpath(QStringLiteral("."))) {
+ if (!QDir(configPath).mkpath(QStringLiteral("."))) {
qFatal("Failed to create test configuration directory.");
}
configPath.append("/kdeglobals");
QFile::remove(configPath);
- if(!QFile::copy(CONFIGFILE, configPath)) {
+ if (!QFile::copy(CONFIGFILE, configPath)) {
qFatal("Failed to copy kdeglobals required for tests.");
}
}
@@ -58,14 +58,13 @@
QToolBar *toolbar = new QToolBar();
QToolButton *btn = new QToolButton(toolbar);
- QCOMPARE(qApp->style()->styleHint(QStyle::SH_ToolButtonStyle, nullptr,
btn), (int) Qt::ToolButtonTextOnly);
+ QCOMPARE(qApp->style()->styleHint(QStyle::SH_ToolButtonStyle, nullptr,
btn), (int)Qt::ToolButtonTextOnly);
toolbar->setProperty("otherToolbar", true);
- QCOMPARE(qApp->style()->styleHint(QStyle::SH_ToolButtonStyle, nullptr,
btn), (int) Qt::ToolButtonTextUnderIcon);
+ QCOMPARE(qApp->style()->styleHint(QStyle::SH_ToolButtonStyle, nullptr,
btn), (int)Qt::ToolButtonTextUnderIcon);
}
};
QTEST_MAIN(KStyle_UnitTest)
#include "kstyle_unittest.moc"
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.79.0/src/integrationplugin/frameworkintegrationplugin.cpp
new/frameworkintegration-5.80.0/src/integrationplugin/frameworkintegrationplugin.cpp
---
old/frameworkintegration-5.79.0/src/integrationplugin/frameworkintegrationplugin.cpp
2021-01-30 18:35:27.000000000 +0100
+++
new/frameworkintegration-5.80.0/src/integrationplugin/frameworkintegrationplugin.cpp
2021-03-01 13:23:02.000000000 +0100
@@ -7,14 +7,13 @@
#include "frameworkintegrationplugin.h"
#include <KConfigGroup>
-#include <KSharedConfig>
#include <KNotification>
+#include <KSharedConfig>
-#include <qplugin.h>
#include <QDebug>
+#include <qplugin.h>
-bool KMessageBoxDontAskAgainConfigStorage::shouldBeShownYesNo(const QString
&dontShowAgainName,
- KMessageBox::ButtonCode &result)
+bool KMessageBoxDontAskAgainConfigStorage::shouldBeShownYesNo(const QString
&dontShowAgainName, KMessageBox::ButtonCode &result)
{
KConfigGroup cg(KMessageBox_againConfig ? KMessageBox_againConfig :
KSharedConfig::openConfig().data(), "Notification Messages");
const QString dontAsk = cg.readEntry(dontShowAgainName,
QString()).toLower();
@@ -35,8 +34,7 @@
return cg.readEntry(dontShowAgainName, true);
}
-void KMessageBoxDontAskAgainConfigStorage::saveDontShowAgainYesNo(const
QString &dontShowAgainName,
- KMessageBox::ButtonCode result)
+void KMessageBoxDontAskAgainConfigStorage::saveDontShowAgainYesNo(const
QString &dontShowAgainName, KMessageBox::ButtonCode result)
{
KConfigGroup::WriteConfigFlags flags = KConfig::Persistent;
if (dontShowAgainName[0] == QLatin1Char(':')) {
@@ -108,8 +106,7 @@
break;
}
- KNotification::event(messageType, message, QPixmap(), parent,
- KNotification::DefaultEvent |
KNotification::CloseOnTimeout);
+ KNotification::event(messageType, message, QPixmap(), parent,
KNotification::DefaultEvent | KNotification::CloseOnTimeout);
}
KFrameworkIntegrationPlugin::KFrameworkIntegrationPlugin()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.79.0/src/integrationplugin/frameworkintegrationplugin.h
new/frameworkintegration-5.80.0/src/integrationplugin/frameworkintegrationplugin.h
---
old/frameworkintegration-5.79.0/src/integrationplugin/frameworkintegrationplugin.h
2021-01-30 18:35:27.000000000 +0100
+++
new/frameworkintegration-5.80.0/src/integrationplugin/frameworkintegrationplugin.h
2021-03-01 13:23:02.000000000 +0100
@@ -8,17 +8,22 @@
#ifndef FRAMEWORKINTEGRATIONPLUGIN_H
#define FRAMEWORKINTEGRATIONPLUGIN_H
-#include <QObject>
#include <KMessageBoxDontAskAgainInterface>
#include <KMessageBoxNotifyInterface>
+#include <QObject>
class KConfig;
class KMessageBoxDontAskAgainConfigStorage : public
KMessageBoxDontAskAgainInterface
{
public:
- KMessageBoxDontAskAgainConfigStorage() : KMessageBox_againConfig(nullptr)
{}
- ~KMessageBoxDontAskAgainConfigStorage() override {}
+ KMessageBoxDontAskAgainConfigStorage()
+ : KMessageBox_againConfig(nullptr)
+ {
+ }
+ ~KMessageBoxDontAskAgainConfigStorage() override
+ {
+ }
bool shouldBeShownYesNo(const QString &dontShowAgainName,
KMessageBox::ButtonCode &result) override;
bool shouldBeShownContinue(const QString &dontShowAgainName) override;
@@ -46,7 +51,6 @@
Q_PLUGIN_METADATA(IID "org.kde.FrameworkIntegrationPlugin")
Q_OBJECT
public:
-
KFrameworkIntegrationPlugin();
public Q_SLOTS:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.79.0/src/kpackage-install-handlers/appstream/main.cpp
new/frameworkintegration-5.80.0/src/kpackage-install-handlers/appstream/main.cpp
---
old/frameworkintegration-5.79.0/src/kpackage-install-handlers/appstream/main.cpp
2021-01-30 18:35:27.000000000 +0100
+++
new/frameworkintegration-5.80.0/src/kpackage-install-handlers/appstream/main.cpp
2021-03-01 13:23:02.000000000 +0100
@@ -5,14 +5,14 @@
SPDX-License-Identifier: LGPL-2.0-only OR LGPL-3.0-only OR
LicenseRef-KDE-Accepted-LGPL
*/
-#include <QCoreApplication>
-#include <QDebug>
#include <AppStreamQt/pool.h>
#include <PackageKit/Daemon>
+#include <QCoreApplication>
+#include <QDebug>
using namespace AppStream;
-int main(int argc, char** argv)
+int main(int argc, char **argv)
{
QCoreApplication app(argc, argv);
Q_ASSERT(app.arguments().count() == 2);
@@ -37,7 +37,7 @@
}
QStringList packages;
- for(const auto &component : components) {
+ for (const auto &component : components) {
packages += component.packageNames();
}
packages.removeDuplicates();
@@ -52,11 +52,14 @@
QHash<QString, QString> pkgs;
- QObject::connect(resolveTransaction, &PackageKit::Transaction::package,
resolveTransaction, [&pkgs](PackageKit::Transaction::Info info, const QString
&packageID, const QString &/*summary*/) {
- if (info == PackageKit::Transaction::InfoAvailable)
- pkgs[PackageKit::Daemon::packageName(packageID)] = packageID;
- qDebug() << "resolved package" << info << packageID;
- });
+ QObject::connect(resolveTransaction,
+ &PackageKit::Transaction::package,
+ resolveTransaction,
+ [&pkgs](PackageKit::Transaction::Info info, const QString
&packageID, const QString & /*summary*/) {
+ if (info == PackageKit::Transaction::InfoAvailable)
+ pkgs[PackageKit::Daemon::packageName(packageID)]
= packageID;
+ qDebug() << "resolved package" << info << packageID;
+ });
QObject::connect(resolveTransaction, &PackageKit::Transaction::finished,
resolveTransaction, [&app, &pkgs](PackageKit::Transaction::Exit status) {
if (status != PackageKit::Transaction::ExitSuccess) {
qWarning() << "resolve failed" << status;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.79.0/src/kpackage-install-handlers/kns/main.cpp
new/frameworkintegration-5.80.0/src/kpackage-install-handlers/kns/main.cpp
--- old/frameworkintegration-5.79.0/src/kpackage-install-handlers/kns/main.cpp
2021-01-30 18:35:27.000000000 +0100
+++ new/frameworkintegration-5.80.0/src/kpackage-install-handlers/kns/main.cpp
2021-03-01 13:23:02.000000000 +0100
@@ -7,13 +7,13 @@
*/
#include <QCoreApplication>
-#include <QUrl>
-#include <QUrlQuery>
-#include <QTimer>
#include <QDebug>
-#include <QStandardPaths>
#include <QFile>
#include <QFileInfo>
+#include <QStandardPaths>
+#include <QTimer>
+#include <QUrl>
+#include <QUrlQuery>
#include <KLocalizedString>
@@ -52,7 +52,7 @@
file.link(info.absoluteFilePath());
}
-int main(int argc, char** argv)
+int main(int argc, char **argv)
{
createSymlinkForWindowDecorations();
QCoreApplication app(argc, argv);
@@ -103,64 +103,80 @@
}
}
-
KNSCore::Engine engine;
int installedCount = 0;
- QObject::connect(KNSCore::QuestionManager::instance(),
&KNSCore::QuestionManager::askQuestion, &engine, [](KNSCore::Question*
question){
- auto discardQuestion = [question]() {
question->setResponse(KNSCore::Question::InvalidResponse); };
- switch(question->questionType()) {
- case KNSCore::Question::YesNoQuestion: {
- auto f =
KNotification::event(KNotification::StandardEvent::Notification,
question->title(), question->question());
- f->setActions({i18n("Yes"), i18n("No")});
- QObject::connect(f, &KNotification::action1Activated,
question, [question](){ question->setResponse(KNSCore::Question::YesResponse);
});
- QObject::connect(f, &KNotification::action2Activated,
question, [question](){ question->setResponse(KNSCore::Question::NoResponse);
});
- QObject::connect(f, &KNotification::closed, question,
discardQuestion);
- } break;
- case KNSCore::Question::ContinueCancelQuestion: {
- auto f =
KNotification::event(KNotification::StandardEvent::Notification,
question->title(), question->question());
- f->setActions({i18n("Continue"), i18n("Cancel")});
- QObject::connect(f, &KNotification::action1Activated,
question, [question](){
question->setResponse(KNSCore::Question::ContinueResponse); });
- QObject::connect(f, &KNotification::action2Activated,
question, [question](){
question->setResponse(KNSCore::Question::CancelResponse); });
- QObject::connect(f, &KNotification::closed, question,
discardQuestion);
- } break;
- case KNSCore::Question::InputTextQuestion:
- case KNSCore::Question::SelectFromListQuestion:
- case KNSCore::Question::PasswordQuestion:
- discardQuestion();
- break;
+ QObject::connect(KNSCore::QuestionManager::instance(),
&KNSCore::QuestionManager::askQuestion, &engine, [](KNSCore::Question
*question) {
+ auto discardQuestion = [question]() {
+ question->setResponse(KNSCore::Question::InvalidResponse);
+ };
+ switch (question->questionType()) {
+ case KNSCore::Question::YesNoQuestion: {
+ auto f =
KNotification::event(KNotification::StandardEvent::Notification,
question->title(), question->question());
+ f->setActions({i18n("Yes"), i18n("No")});
+ QObject::connect(f, &KNotification::action1Activated, question,
[question]() {
+ question->setResponse(KNSCore::Question::YesResponse);
+ });
+ QObject::connect(f, &KNotification::action2Activated, question,
[question]() {
+ question->setResponse(KNSCore::Question::NoResponse);
+ });
+ QObject::connect(f, &KNotification::closed, question,
discardQuestion);
+ } break;
+ case KNSCore::Question::ContinueCancelQuestion: {
+ auto f =
KNotification::event(KNotification::StandardEvent::Notification,
question->title(), question->question());
+ f->setActions({i18n("Continue"), i18n("Cancel")});
+ QObject::connect(f, &KNotification::action1Activated, question,
[question]() {
+ question->setResponse(KNSCore::Question::ContinueResponse);
+ });
+ QObject::connect(f, &KNotification::action2Activated, question,
[question]() {
+ question->setResponse(KNSCore::Question::CancelResponse);
+ });
+ QObject::connect(f, &KNotification::closed, question,
discardQuestion);
+ } break;
+ case KNSCore::Question::InputTextQuestion:
+ case KNSCore::Question::SelectFromListQuestion:
+ case KNSCore::Question::PasswordQuestion:
+ discardQuestion();
+ break;
}
});
- QObject::connect(&engine, &KNSCore::Engine::signalProvidersLoaded,
&engine, [&engine, entryid](){
+ QObject::connect(&engine, &KNSCore::Engine::signalProvidersLoaded,
&engine, [&engine, entryid]() {
engine.fetchEntryById(entryid);
});
- QObject::connect(&engine, &KNSCore::Engine::signalErrorCode, &engine,
[](const KNSCore::ErrorCode &errorCode, const QString &message, const QVariant
&metadata) {
- qWarning() << "kns error:" << errorCode << message << metadata;
- QCoreApplication::exit(1);
- });
- QObject::connect(&engine, &KNSCore::Engine::signalEntryDetailsLoaded,
&engine, [providerid, linkid, &engine, &installedCount](const
KNSCore::EntryInternal &entry) {
-// qDebug() << "checking..." << entry.status() << entry.providerId();
- if (providerid != QUrl(entry.providerId()).host()) {
- qWarning() << "Wrong provider" << providerid << "instead of" <<
QUrl(entry.providerId()).host();
- QCoreApplication::exit(1);
- } else if (entry.status() == KNS3::Entry::Downloadable) {
- qDebug() << "installing...";
- installedCount++;
- engine.install(entry, linkid);
- } else if (installedCount == 0) {
- qDebug() << "already installed.";
- QCoreApplication::exit(0);
- }
- });
- QObject::connect(&engine, &KNSCore::Engine::signalEntryChanged, &engine,
[&engine, &installedCount](const KNSCore::EntryInternal &entry) {
- if (entry.status() == KNS3::Entry::Installed) {
- installedCount--;
- }
- if (installedCount == 0)
- QCoreApplication::exit(0);
- });
-
+ QObject::connect(&engine,
+ &KNSCore::Engine::signalErrorCode,
+ &engine,
+ [](const KNSCore::ErrorCode &errorCode, const QString
&message, const QVariant &metadata) {
+ qWarning() << "kns error:" << errorCode << message <<
metadata;
+ QCoreApplication::exit(1);
+ });
+ QObject::connect(&engine,
+ &KNSCore::Engine::signalEntryEvent,
+ &engine,
+ [providerid, linkid, &engine, &installedCount](const
KNSCore::EntryInternal &entry, KNSCore::EntryInternal::EntryEvent event) {
+ if (event ==
KNSCore::EntryInternal::DetailsLoadedEvent) {
+ // qDebug() << "checking..." << entry.status() <<
entry.providerId();
+ if (providerid !=
QUrl(entry.providerId()).host()) {
+ qWarning() << "Wrong provider" << providerid
<< "instead of" << QUrl(entry.providerId()).host();
+ QCoreApplication::exit(1);
+ } else if (entry.status() ==
KNS3::Entry::Downloadable) {
+ qDebug() << "installing...";
+ installedCount++;
+ engine.install(entry, linkid);
+ } else if (installedCount == 0) {
+ qDebug() << "already installed.";
+ QCoreApplication::exit(0);
+ }
+ } else if (event ==
KNSCore::EntryInternal::StatusChangedEvent) {
+ if (entry.status() == KNS3::Entry::Installed) {
+ installedCount--;
+ }
+ if (installedCount == 0) {
+ QCoreApplication::exit(0);
+ }
+ }
+ });
if (!engine.init(knsname)) {
qWarning() << "couldn't initialize" << knsname;
return 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.79.0/src/kstyle/kstyle.cpp
new/frameworkintegration-5.80.0/src/kstyle/kstyle.cpp
--- old/frameworkintegration-5.79.0/src/kstyle/kstyle.cpp 2021-01-30
18:35:27.000000000 +0100
+++ new/frameworkintegration-5.80.0/src/kstyle/kstyle.cpp 2021-03-01
13:23:02.000000000 +0100
@@ -33,15 +33,15 @@
#include <QDialogButtonBox>
#include <QEvent>
#include <QIcon>
-#include <QStyleOption>
#include <QPushButton>
-#include <QToolBar>
#include <QShortcut>
+#include <QStyleOption>
+#include <QToolBar>
+#include <KColorScheme>
#include <KConfigGroup>
#include <KIconLoader>
#include <KMessageWidget>
-#include <KColorScheme>
// ----------------------------------------------------------------------------
@@ -60,7 +60,7 @@
KStylePrivate::KStylePrivate()
{
controlCounter = subElementCounter = X_KdeBase;
- hintCounter = X_KdeBase + 1; //sic! X_KdeBase is covered by
SH_KCustomStyleElement
+ hintCounter = X_KdeBase + 1; // sic! X_KdeBase is covered by
SH_KCustomStyleElement
}
/*
@@ -83,20 +83,21 @@
QStyle::StyleHint KStyle::customStyleHint(const QString &element, const
QWidget *widget)
{
- return (StyleHint) customStyleElement(SH_KCustomStyleElement, element,
const_cast<QWidget *>(widget));
+ return (StyleHint)customStyleElement(SH_KCustomStyleElement, element,
const_cast<QWidget *>(widget));
}
QStyle::ControlElement KStyle::customControlElement(const QString &element,
const QWidget *widget)
{
- return (ControlElement) customStyleElement(SH_KCustomStyleElement,
element, const_cast<QWidget *>(widget));
+ return (ControlElement)customStyleElement(SH_KCustomStyleElement, element,
const_cast<QWidget *>(widget));
}
QStyle::SubElement KStyle::customSubElement(const QString &element, const
QWidget *widget)
{
- return (SubElement) customStyleElement(SH_KCustomStyleElement, element,
const_cast<QWidget *>(widget));
+ return (SubElement)customStyleElement(SH_KCustomStyleElement, element,
const_cast<QWidget *>(widget));
}
-KStyle::KStyle() : d(new KStylePrivate)
+KStyle::KStyle()
+ : d(new KStylePrivate)
{
}
@@ -192,7 +193,7 @@
QObject::connect(shortcut, &QShortcut::activated, button,
&QPushButton::click);
}
}
- if (auto messageWidget = qobject_cast<KMessageWidget*>(w)) {
+ if (auto messageWidget = qobject_cast<KMessageWidget *>(w)) {
KColorScheme scheme;
QColor color;
QPalette palette = messageWidget->palette();
@@ -221,8 +222,7 @@
return KColorScheme::createApplicationPalette(KSharedConfig::openConfig());
}
-QIcon KStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption
*option,
- const QWidget *widget) const
+QIcon KStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption
*option, const QWidget *widget) const
{
switch (standardIcon) {
case QStyle::SP_DesktopIcon:
@@ -249,15 +249,15 @@
case QStyle::SP_DirIcon:
return QIcon::fromTheme(QStringLiteral("folder"));
case QStyle::SP_DirLinkIcon:
- return QIcon::fromTheme(QStringLiteral("folder")); //TODO: generate
(!?) folder with link emblem
+ return QIcon::fromTheme(QStringLiteral("folder")); // TODO: generate
(!?) folder with link emblem
case QStyle::SP_FileIcon:
- return QIcon::fromTheme(QStringLiteral("text-plain")); //TODO: look
for a better icon
+ return QIcon::fromTheme(QStringLiteral("text-plain")); // TODO: look
for a better icon
case QStyle::SP_FileLinkIcon:
- return QIcon::fromTheme(QStringLiteral("text-plain")); //TODO:
generate (!?) file with link emblem
+ return QIcon::fromTheme(QStringLiteral("text-plain")); // TODO:
generate (!?) file with link emblem
case QStyle::SP_FileDialogStart:
- return QIcon::fromTheme(QStringLiteral("media-playback-start"));
//TODO: find correct icon
+ return QIcon::fromTheme(QStringLiteral("media-playback-start")); //
TODO: find correct icon
case QStyle::SP_FileDialogEnd:
- return QIcon::fromTheme(QStringLiteral("media-playback-stop"));
//TODO: find correct icon
+ return QIcon::fromTheme(QStringLiteral("media-playback-stop")); //
TODO: find correct icon
case QStyle::SP_FileDialogToParent:
return QIcon::fromTheme(QStringLiteral("go-up"));
case QStyle::SP_FileDialogNewFolder:
@@ -340,8 +340,7 @@
case SP_LineEditClearButton: {
const bool rtl = (option && option->direction == Qt::RightToLeft) ||
(!option && QApplication::isRightToLeft());
- const QString directionalThemeName = rtl
- ? QStringLiteral("edit-clear-locationbar-ltr") :
QStringLiteral("edit-clear-locationbar-rtl");
+ const QString directionalThemeName = rtl ?
QStringLiteral("edit-clear-locationbar-ltr") :
QStringLiteral("edit-clear-locationbar-rtl");
return QIcon::fromTheme(directionalThemeName,
QIcon::fromTheme(QStringLiteral("edit-clear")));
}
@@ -393,8 +392,8 @@
bool useOthertoolbars = false;
const QWidget *parent = widget ? widget->parentWidget() : nullptr;
- //If the widget parent is a QToolBar and the magic property is set
- if (parent && qobject_cast< const QToolBar * >(parent)) {
+ // If the widget parent is a QToolBar and the magic property is set
+ if (parent && qobject_cast<const QToolBar *>(parent)) {
if (parent->property("otherToolbar").isValid()) {
useOthertoolbars = true;
}
@@ -408,11 +407,11 @@
}
return buttonStyle == QLatin1String("textbesideicon") ?
Qt::ToolButtonTextBesideIcon
- : buttonStyle == QLatin1String("icontextright") ?
Qt::ToolButtonTextBesideIcon
- : buttonStyle == QLatin1String("textundericon") ?
Qt::ToolButtonTextUnderIcon
- : buttonStyle == QLatin1String("icontextbottom") ?
Qt::ToolButtonTextUnderIcon
- : buttonStyle == QLatin1String("textonly") ?
Qt::ToolButtonTextOnly
- : Qt::ToolButtonIconOnly;
+ : buttonStyle == QLatin1String("icontextright") ?
Qt::ToolButtonTextBesideIcon
+ : buttonStyle == QLatin1String("textundericon") ?
Qt::ToolButtonTextUnderIcon
+ : buttonStyle == QLatin1String("icontextbottom") ?
Qt::ToolButtonTextUnderIcon
+ : buttonStyle == QLatin1String("textonly") ?
Qt::ToolButtonTextOnly
+ :
Qt::ToolButtonIconOnly;
}
case SH_KCustomStyleElement:
@@ -456,4 +455,3 @@
return QCommonStyle::pixelMetric(metric, option, widget);
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.79.0/src/kstyle/kstyle.h
new/frameworkintegration-5.80.0/src/kstyle/kstyle.h
--- old/frameworkintegration-5.79.0/src/kstyle/kstyle.h 2021-01-30
18:35:27.000000000 +0100
+++ new/frameworkintegration-5.80.0/src/kstyle/kstyle.h 2021-03-01
13:23:02.000000000 +0100
@@ -31,6 +31,7 @@
#define KDE_KSTYLE_H
#include <kstyle_export.h>
+
#include <QCommonStyle>
#include <QPalette>
@@ -49,7 +50,7 @@
* @author ??lex Fiestas (afiestas\@kde.org)
*/
-class KSTYLE_EXPORT KStyle: public QCommonStyle
+class KSTYLE_EXPORT KStyle : public QCommonStyle
{
Q_OBJECT
@@ -88,55 +89,52 @@
static SubElement customSubElement(const QString &element, const QWidget
*widget);
protected:
-
/**
- * Runtime element extension, allows inheriting styles to add support
custom elements
- * merges supporting inherit chains
- * Supposed to be called e.g. in your constructor.
- *
- * NOTICE: in order to have this work, your style must provide
- * an "X-KDE-CustomElements" classinfo, i.e.
- * class MyStyle : public KStyle
- * {
- * Q_OBJECT
- * Q_CLASSINFO ("X-KDE-CustomElements", "true")
- *
- * public:
- * .....
- * }
- *
- * @param element The style element, represented as string.
- * Suggested naming convention: appname.(2-char-element-type)_element
- * where the 2-char-element-type is of {SH, CE, SE}
- * widgets in kdelibs don't have to pass the appname
- * examples: "CE_CapacityBar", "amarok.CE_Analyzer"
- *
- * Important notes:
- * 1) If your string lacks the matching "SH_", "CE_" or "SE_" token the
element
- * request will be ignored (return is 0)
- * 2) To keep UI coherency, don't support any nonsense in your style, but
convince app developers
- * to use standard elements - if available
- */
+ * Runtime element extension, allows inheriting styles to add support
custom elements
+ * merges supporting inherit chains
+ * Supposed to be called e.g. in your constructor.
+ *
+ * NOTICE: in order to have this work, your style must provide
+ * an "X-KDE-CustomElements" classinfo, i.e.
+ * class MyStyle : public KStyle
+ * {
+ * Q_OBJECT
+ * Q_CLASSINFO ("X-KDE-CustomElements", "true")
+ *
+ * public:
+ * .....
+ * }
+ *
+ * @param element The style element, represented as string.
+ * Suggested naming convention: appname.(2-char-element-type)_element
+ * where the 2-char-element-type is of {SH, CE, SE}
+ * widgets in kdelibs don't have to pass the appname
+ * examples: "CE_CapacityBar", "amarok.CE_Analyzer"
+ *
+ * Important notes:
+ * 1) If your string lacks the matching "SH_", "CE_" or "SE_" token the
element
+ * request will be ignored (return is 0)
+ * 2) To keep UI coherency, don't support any nonsense in your style, but
convince app developers
+ * to use standard elements - if available
+ */
StyleHint newStyleHint(const QString &element);
ControlElement newControlElement(const QString &element);
SubElement newSubElement(const QString &element);
public:
-//@{
+ //@{
int pixelMetric(PixelMetric m, const QStyleOption *opt = nullptr, const
QWidget *widget = nullptr) const override;
- virtual int styleHint(StyleHint hint, const QStyleOption *opt,
- const QWidget *w, QStyleHintReturn *returnData)
const override;
+ virtual int styleHint(StyleHint hint, const QStyleOption *opt, const
QWidget *w, QStyleHintReturn *returnData) const override;
void polish(QWidget *) override;
- using QCommonStyle::polish; //! needed to avoid warnings at compilation
time
+ using QCommonStyle::polish; //! needed to avoid warnings at compilation
time
QPalette standardPalette() const override;
- virtual QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption
*option = nullptr,
- const QWidget *widget = nullptr) const override;
-//@}
+ virtual QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption
*option = nullptr, const QWidget *widget = nullptr) const override;
+ //@}
private:
KStylePrivate *const d;
};
-#endif //KDE_KSTYLE_H
+#endif // KDE_KSTYLE_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.79.0/tests/kstyletest.cpp
new/frameworkintegration-5.80.0/tests/kstyletest.cpp
--- old/frameworkintegration-5.79.0/tests/kstyletest.cpp 2021-01-30
18:35:27.000000000 +0100
+++ new/frameworkintegration-5.80.0/tests/kstyletest.cpp 2021-03-01
13:23:02.000000000 +0100
@@ -5,15 +5,16 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
+#include "kstyle.h"
+
#include <QApplication>
-#include <QWidget>
-#include <QVBoxLayout>
-#include <QPushButton>
#include <QDialog>
-#include <QTextEdit>
#include <QDialogButtonBox>
#include <QLayout>
-#include "kstyle.h"
+#include <QPushButton>
+#include <QTextEdit>
+#include <QVBoxLayout>
+#include <QWidget>
void showDialog()
{
@@ -23,7 +24,7 @@
QDialogButtonBox *box = new QDialogButtonBox(QDialogButtonBox::Cancel |
QDialogButtonBox::Ok, dialog.data());
- //Useful to change the text because setting the text triggers setShortcut
+ // Useful to change the text because setting the text triggers setShortcut
box->button(QDialogButtonBox::Ok)->setText(QLatin1String("Send"));
QObject::connect(box, &QDialogButtonBox::accepted, dialog.data(),
&QDialog::accept);
QObject::connect(box, &QDialogButtonBox::rejected, dialog.data(),
&QDialog::reject);
@@ -32,7 +33,7 @@
layout->addWidget(usefulWidget);
layout->addWidget(box);
- //Make sure we test ctrl+return acceptance with the focus on the button
+ // Make sure we test ctrl+return acceptance with the focus on the button
usefulWidget->setFocus();
dialog->resize(200, 200);
