Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kontactinterface for
openSUSE:Factory checked in at 2021-12-13 20:39:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kontactinterface (Old)
and /work/SRC/openSUSE:Factory/.kontactinterface.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kontactinterface"
Mon Dec 13 20:39:45 2021 rev:75 rq:937990 version:21.12.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kontactinterface/kontactinterface.changes
2021-11-06 18:16:00.184821582 +0100
+++
/work/SRC/openSUSE:Factory/.kontactinterface.new.2520/kontactinterface.changes
2021-12-13 20:41:04.788460702 +0100
@@ -1,0 +2,30 @@
+Fri Dec 3 19:22:24 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 21.12.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/gear/21.12.0/
+- Changes since 21.11.90:
+ * CI: Remove reuse job on 21.12 branch
+ * Enable new GitLab CI on stable branch.
+
+-------------------------------------------------------------------
+Sat Nov 27 10:11:18 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 21.11.90
+ * New feature release
+- No code change since 21.11.80
+
+-------------------------------------------------------------------
+Sat Nov 13 17:55:45 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 21.11.80
+ * New feature release
+- Changes since 21.08.3:
+ * Allow to show header in qtc6
+ * Use std::unique_ptr
+ * use unique_ptr
+ * Add KDE CI file
+ * Port away KPluginLoader
+
+-------------------------------------------------------------------
Old:
----
kontactinterface-21.08.3.tar.xz
kontactinterface-21.08.3.tar.xz.sig
New:
----
kontactinterface-21.12.0.tar.xz
kontactinterface-21.12.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kontactinterface.spec ++++++
--- /var/tmp/diff_new_pack.8v0DNI/_old 2021-12-13 20:41:05.360460772 +0100
+++ /var/tmp/diff_new_pack.8v0DNI/_new 2021-12-13 20:41:05.364460773 +0100
@@ -21,7 +21,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without lang
Name: kontactinterface
-Version: 21.08.3
+Version: 21.12.0
Release: 0
Summary: KDE PIM Libraries: Interface to Contacts
License: LGPL-2.1-or-later
++++++ kontactinterface-21.08.3.tar.xz -> kontactinterface-21.12.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-21.08.3/.gitlab-ci.yml
new/kontactinterface-21.12.0/.gitlab-ci.yml
--- old/kontactinterface-21.08.3/.gitlab-ci.yml 2021-10-07 21:29:35.000000000
+0200
+++ new/kontactinterface-21.12.0/.gitlab-ci.yml 2021-11-30 19:23:17.000000000
+0100
@@ -1,34 +1,6 @@
# SPDX-FileCopyrightText: 2020-2021 Laurent Montel <[email protected]>
-# SPDX-FileCopyrightText: 2021 Laurent Montel <[email protected]>
# SPDX-License-Identifier: CC0-1.0
include:
- - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml
- -
https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-applications-linux.yml
-
-build_clazy_clang_tidy:
- stage: build
- image: kdeorg/ci-suse-qt515
- extends: .linux
- #only:
- # - merge_requests
- before_script:
- - zypper install -y clazy
- - git clone --depth=1 https://invent.kde.org/sysadmin/ci-tooling.git
$CI_TOOLING
- - git clone --depth=1 https://invent.kde.org/sysadmin/repo-metadata.git
$CI_TOOLING/repo-metadata
- - git clone --depth=1
https://invent.kde.org/sysadmin/kde-build-metadata.git
$CI_TOOLING/kde-build-metadata
- - git clone --depth=1 https://invent.kde.org/sdk/kde-dev-scripts.git
$CI_TOOLING/kde-dev-scripts
-
- script:
- - export CXX=clazy
- - export CC=clang
- - export CXXFLAGS="-Wno-deprecated-declarations"
- - export CLAZY_HEADER_FILTER='^(?!ui_)\w+.h\$'
- - export
CLAZY_CHECKS="level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs"
- - python3 -u $CI_TOOLING/helpers/prepare-dependencies.py --product
$PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --environment
production --platform $PLATFORM --installTo $INSTALL_PREFIX
- - python3 -u $CI_TOOLING/helpers/configure-build.py --product $PRODUCT
--project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --installTo
$INSTALL_PREFIX
- - python3 -u $CI_TOOLING/helpers/compile-build.py --product $PRODUCT
--project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM
--usingInstall $INSTALL_PREFIX
- - cd build && run-clang-tidy
- variables:
- PLATFORM: SUSEQt5.15
- BRANCH_GROUP: stable-kf5-qt5
+ -
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/kontactinterface-21.08.3/.kde-ci.yml
new/kontactinterface-21.12.0/.kde-ci.yml
--- old/kontactinterface-21.08.3/.kde-ci.yml 1970-01-01 01:00:00.000000000
+0100
+++ new/kontactinterface-21.12.0/.kde-ci.yml 2021-11-30 19:23:17.000000000
+0100
@@ -0,0 +1,12 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
+
+Dependencies:
+- 'on': ['@all']
+ 'require':
+ 'frameworks/extra-cmake-modules': '@latest'
+ 'frameworks/kcoreaddons': '@latest'
+ 'frameworks/kparts': '@latest'
+ 'frameworks/kwindowsystem': '@latest'
+ 'frameworks/ki18n': '@latest'
+ 'frameworks/kxmlgui': '@latest'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-21.08.3/CMakeLists.txt
new/kontactinterface-21.12.0/CMakeLists.txt
--- old/kontactinterface-21.08.3/CMakeLists.txt 2021-10-07 21:29:35.000000000
+0200
+++ new/kontactinterface-21.12.0/CMakeLists.txt 2021-11-30 19:23:17.000000000
+0100
@@ -1,17 +1,17 @@
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
-set(PIM_VERSION "5.18.3")
+set(PIM_VERSION "5.19.0")
project(KontactInterface VERSION ${PIM_VERSION})
# ECM setup
-set(KF5_MIN_VERSION "5.83.0")
+set(KF5_MIN_VERSION "5.87.0")
find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(KDEInstallDirs)
include(KDECMakeSettings)
-include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+include(KDECompilerSettings NO_POLICY_SCOPE)
include(GenerateExportHeader)
include(ECMGenerateHeaders)
@@ -20,10 +20,15 @@
include(ECMSetupVersion)
include(FeatureSummary)
include(KDEGitCommitHooks)
+include(KDEClangFormat)
+file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.c)
+kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+
include(ECMQtDeclareLoggingCategory)
include(ECMSetupQtPluginMacroNames)
-
-
+include(ECMAddQch)
+option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt
Assistant, Qt Creator & KDevelop)" OFF)
+add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g.
Qt Assistant, Qt Creator & KDevelop)")
add_definitions(-DTRANSLATION_DOMAIN=\"kontactinterfaces5\")
@@ -57,8 +62,6 @@
if (NOT APPLE)
find_package(X11)
endif()
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(KONTACTINTERFACE_HAVE_X11 ${X11_FOUND})
configure_file(config-kontactinterface.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config-kontactinterface.h )
@@ -88,7 +91,7 @@
install(EXPORT KF5KontactInterfaceTargets DESTINATION
"${CMAKECONFIG_INSTALL_DIR}" FILE KF5KontactInterfaceTargets.cmake NAMESPACE
KF5::)
-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054C00)
@@ -103,5 +106,17 @@
kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
ki18n_install(po)
+
+
+if (BUILD_QCH)
+ ecm_install_qch_export(
+ TARGETS KF5KontactInterface_QCH
+ FILE KF5KontactInterfaceQchTargets.cmake
+ DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+ COMPONENT Devel
+ )
+ set(PACKAGE_INCLUDE_QCHTARGETS
"include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5KontactInterfaceQchTargets.cmake\")")
+endif()
+
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-21.08.3/CMakePresets.json
new/kontactinterface-21.12.0/CMakePresets.json
--- old/kontactinterface-21.08.3/CMakePresets.json 2021-10-07
21:29:35.000000000 +0200
+++ new/kontactinterface-21.12.0/CMakePresets.json 2021-11-30
19:23:17.000000000 +0100
@@ -1,5 +1,5 @@
{
- "version": 2,
+ "version": 3,
"configurePresets": [
{
"name": "dev",
@@ -8,8 +8,21 @@
"binaryDir": "${sourceDir}/build",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
- "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
- }
+ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+ },
+ "installDir": "$env{KF5}"
+ },
+ {
+ "name": "dev-disable-deprecated",
+ "displayName": "Build as without deprecated methods",
+ "generator": "Ninja",
+ "binaryDir": "${sourceDir}/build-disable-deprecated",
+ "cacheVariables": {
+ "CMAKE_BUILD_TYPE": "Debug",
+ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
+ "CMAKE_CXX_FLAGS_INIT":
"-DQT_DISABLE_DEPRECATED_BEFORE=0x060000
-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000"
+ },
+ "installDir": "$env{KF5}"
},
{
"name": "asan",
@@ -19,8 +32,21 @@
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"ECM_ENABLE_SANITIZERS" : "'address;undefined'",
- "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
- }
+ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+ },
+ "installDir": "$env{KF5}"
+ },
+ {
+ "name": "pch",
+ "displayName": "Build with PCH support.",
+ "generator": "Ninja",
+ "binaryDir": "${sourceDir}/build-pch",
+ "cacheVariables": {
+ "CMAKE_BUILD_TYPE": "Debug",
+ "COMPILE_WITH_CMAKE_PCH_SUPPORT": "ON",
+ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+ },
+ "installDir": "$env{KF5}"
},
{
"name": "dev-clang",
@@ -34,7 +60,8 @@
"environment": {
"CXX": "clang++",
"CCACHE_DISABLE": "ON"
- }
+ },
+ "installDir": "$env{KF5}"
},
{
"name": "unity",
@@ -43,9 +70,10 @@
"binaryDir": "${sourceDir}/build-unity",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
- "USE_UNITY_CMAKE_SUPPORT": "ON",
- "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
- }
+ "USE_UNITY_CMAKE_SUPPORT": "ON",
+ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+ },
+ "installDir": "$env{KF5}"
},
{
"name": "release",
@@ -54,7 +82,8 @@
"binaryDir": "${sourceDir}/build-release",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
- }
+ },
+ "installDir": "$env{KF5}"
},
{
"name": "profile",
@@ -63,8 +92,9 @@
"binaryDir": "${sourceDir}/build-profile",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
- "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
- }
+ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+ },
+ "installDir": "$env{KF5}"
},
{
"name": "clazy",
@@ -77,7 +107,8 @@
"environment": {
"CXX": "clazy",
"CCACHE_DISABLE": "ON"
- }
+ },
+ "installDir": "$env{KF5}"
}
],
@@ -87,6 +118,14 @@
"configurePreset": "dev"
},
{
+ "name": "dev-disable-deprecated",
+ "configurePreset": "dev-disable-deprecated"
+ },
+ {
+ "name": "pch",
+ "configurePreset": "pch"
+ },
+ {
"name": "release",
"configurePreset": "release"
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-21.08.3/po/ca/kontactinterfaces5.po
new/kontactinterface-21.12.0/po/ca/kontactinterfaces5.po
--- old/kontactinterface-21.08.3/po/ca/kontactinterfaces5.po 2021-11-02
01:17:20.000000000 +0100
+++ new/kontactinterface-21.12.0/po/ca/kontactinterfaces5.po 2021-12-03
01:16:02.000000000 +0100
@@ -10,7 +10,7 @@
"Project-Id-Version: kontactinterface\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-05-20 03:17+0200\n"
-"PO-Revision-Date: 2021-10-09 19:38+0200\n"
+"PO-Revision-Date: 2021-10-09 18:00+0200\n"
"Last-Translator: Josep M. Ferrer <[email protected]>\n"
"Language-Team: Catalan <[email protected]>\n"
"Language: ca\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kontactinterface-21.08.3/po/ca@valencia/kontactinterfaces5.po
new/kontactinterface-21.12.0/po/ca@valencia/kontactinterfaces5.po
--- old/kontactinterface-21.08.3/po/ca@valencia/kontactinterfaces5.po
2021-11-02 01:17:20.000000000 +0100
+++ new/kontactinterface-21.12.0/po/ca@valencia/kontactinterfaces5.po
2021-12-03 01:16:02.000000000 +0100
@@ -10,7 +10,7 @@
"Project-Id-Version: kontactinterface\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-05-20 03:17+0200\n"
-"PO-Revision-Date: 2021-10-09 19:38+0200\n"
+"PO-Revision-Date: 2021-10-09 18:00+0200\n"
"Last-Translator: Josep M. Ferrer <[email protected]>\n"
"Language-Team: Catalan <[email protected]>\n"
"Language: ca@valencia\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kontactinterface-21.08.3/po/zh_CN/kontactinterfaces5.po
new/kontactinterface-21.12.0/po/zh_CN/kontactinterfaces5.po
--- old/kontactinterface-21.08.3/po/zh_CN/kontactinterfaces5.po 2021-11-02
01:17:20.000000000 +0100
+++ new/kontactinterface-21.12.0/po/zh_CN/kontactinterfaces5.po 2021-12-03
01:16:02.000000000 +0100
@@ -7,7 +7,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-05-20 03:17+0200\n"
-"PO-Revision-Date: 2021-10-29 13:28\n"
+"PO-Revision-Date: 2021-11-30 15:24\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-21.08.3/src/CMakeLists.txt
new/kontactinterface-21.12.0/src/CMakeLists.txt
--- old/kontactinterface-21.08.3/src/CMakeLists.txt 2021-10-07
21:29:35.000000000 +0200
+++ new/kontactinterface-21.12.0/src/CMakeLists.txt 2021-11-30
19:23:17.000000000 +0100
@@ -6,7 +6,13 @@
summary.cpp
processes.cpp
uniqueapphandler.cpp
- pimuniqueapplication.cpp)
+ pimuniqueapplication.cpp
+ processes.h
+ core.h
+ plugin.h
+ uniqueapphandler.h
+ pimuniqueapplication.h
+ summary.h)
ecm_qt_declare_logging_category(KF5KontactInterface HEADER
kontactinterface_debug.h IDENTIFIER KONTACTINTERFACE_LOG CATEGORY_NAME
org.kde.pim.kontactinterface
OLD_CATEGORY_NAMES log_kontactinterface
@@ -74,3 +80,28 @@
install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
ecm_qt_install_logging_categories(EXPORT KONTACTINTERFACE FILE
kontactinterface.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
+
+if (BUILD_QCH)
+ ecm_add_qch(
+ KF5KontactInterface_QCH
+ NAME KF5KontactInterface
+ BASE_NAME KF5KontactInterface
+ VERSION ${PIM_VERSION}
+ ORG_DOMAIN org.kde
+ SOURCES # using only public headers, to cover only public API
+ ${KontactInterface_HEADERS}
+ #MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md"
+ #IMAGE_DIRS "${CMAKE_SOURCE_DIR}/docs/pics"
+ LINK_QCHS
+ Qt5Core_QCH
+ Qt5Gui_QCH
+ Qt5Widgets_QCH
+ INCLUDE_DIRS
+ ${CMAKE_CURRENT_BINARY_DIR}
+ BLANK_MACROS
+ KONTACTINTERFACE_EXPORT
+ TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
+ QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
+ COMPONENT Devel
+ )
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-21.08.3/src/core.cpp
new/kontactinterface-21.12.0/src/core.cpp
--- old/kontactinterface-21.08.3/src/core.cpp 2021-10-07 21:29:35.000000000
+0200
+++ new/kontactinterface-21.12.0/src/core.cpp 2021-11-30 19:23:17.000000000
+0100
@@ -9,11 +9,10 @@
*/
#include "core.h"
-
#include "kontactinterface_debug.h"
#include <KPluginFactory>
-#include <KPluginLoader>
+#include <KPluginMetaData>
#include <QDateTime>
#include <QTimer>
@@ -21,12 +20,12 @@
using namespace KontactInterface;
//@cond PRIVATE
-class Q_DECL_HIDDEN KontactInterface::Core::Private
+class Q_DECL_HIDDEN KontactInterface::CorePrivate
{
Core *const q;
public:
- explicit Private(Core *qq);
+ explicit CorePrivate(Core *qq);
void slotPartDestroyed(QObject *);
void checkNewDay();
@@ -36,7 +35,7 @@
QMap<QByteArray, KParts::Part *> mParts;
};
-Core::Private::Private(Core *qq)
+CorePrivate::CorePrivate(Core *qq)
: q(qq)
, mLastDate(QDate::currentDate())
{
@@ -45,7 +44,7 @@
Core::Core(QWidget *parent, Qt::WindowFlags f)
: KParts::MainWindow(parent, f)
- , d(new Private(this))
+ , d(new CorePrivate(this))
{
auto timer = new QTimer(this);
connect(timer, &QTimer::timeout, this, [this]() {
@@ -54,10 +53,7 @@
timer->start(1000 * 60);
}
-Core::~Core()
-{
- delete d;
-}
+Core::~Core() = default;
KParts::Part *Core::createPart(const char *libname)
{
@@ -69,31 +65,23 @@
return it.value();
}
- qCDebug(KONTACTINTERFACE_LOG) << "Creating new KPart";
-
- KPluginLoader loader(QString::fromLatin1(libname));
- qCDebug(KONTACTINTERFACE_LOG) << loader.fileName();
- KPluginFactory *factory = loader.factory();
- KParts::Part *part = nullptr;
- if (factory) {
- part = factory->create<KParts::Part>(this);
- }
- if (part) {
- d->mParts.insert(libname, part);
- QObject::connect(part, &KParts::Part::destroyed, this, [this](QObject
*obj) {
+ qCDebug(KONTACTINTERFACE_LOG) << "Creating new KPart";
+ const auto result =
KPluginFactory::instantiatePlugin<KParts::Part>(KPluginMetaData(QString::fromLatin1(libname)),
this);
+ if (result.plugin) {
+ d->mParts.insert(libname, result.plugin);
+ QObject::connect(result.plugin, &KParts::Part::destroyed, this,
[this](QObject *obj) {
d->slotPartDestroyed(obj);
});
} else {
- d->lastErrorMessage = loader.errorString();
+ d->lastErrorMessage = result.errorString;
qCWarning(KONTACTINTERFACE_LOG) << d->lastErrorMessage;
}
-
- return part;
+ return result.plugin;
}
//@cond PRIVATE
-void Core::Private::slotPartDestroyed(QObject *obj)
+void CorePrivate::slotPartDestroyed(QObject *obj)
{
// the part was deleted, we need to remove it from the part map to not
return
// a dangling pointer in createPart
@@ -107,7 +95,7 @@
}
}
-void Core::Private::checkNewDay()
+void CorePrivate::checkNewDay()
{
if (mLastDate != QDate::currentDate()) {
Q_EMIT q->dayChanged(QDate::currentDate());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-21.08.3/src/core.h
new/kontactinterface-21.12.0/src/core.h
--- old/kontactinterface-21.08.3/src/core.h 2021-10-07 21:29:35.000000000
+0200
+++ new/kontactinterface-21.12.0/src/core.h 2021-11-30 19:23:17.000000000
+0100
@@ -17,7 +17,7 @@
namespace KontactInterface
{
class Plugin;
-
+class CorePrivate;
/**
* @short The abstract interface that represents the Kontact core.
*
@@ -94,8 +94,8 @@
private:
//@cond PRIVATE
- class Private;
- Private *const d;
+ friend class CorePrivate;
+ std::unique_ptr<CorePrivate> const d;
//@endcond
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kontactinterface-21.08.3/src/pimuniqueapplication.cpp
new/kontactinterface-21.12.0/src/pimuniqueapplication.cpp
--- old/kontactinterface-21.08.3/src/pimuniqueapplication.cpp 2021-10-07
21:29:35.000000000 +0200
+++ new/kontactinterface-21.12.0/src/pimuniqueapplication.cpp 2021-11-30
19:23:17.000000000 +0100
@@ -32,15 +32,15 @@
}
//@cond PRIVATE
-class Q_DECL_HIDDEN KontactInterface::PimUniqueApplication::Private
+class Q_DECL_HIDDEN
KontactInterface::PimUniqueApplication::PimUniqueApplicationPrivate
{
public:
- Private()
+ PimUniqueApplicationPrivate()
: cmdArgs(new QCommandLineParser())
{
}
- ~Private()
+ ~PimUniqueApplicationPrivate()
{
delete cmdArgs;
}
@@ -60,14 +60,11 @@
PimUniqueApplication::PimUniqueApplication(int &argc, char **argv[])
: QApplication(argc, *argv)
- , d(new Private())
+ , d(new PimUniqueApplicationPrivate())
{
}
-PimUniqueApplication::~PimUniqueApplication()
-{
- delete d;
-}
+PimUniqueApplication::~PimUniqueApplication() = default;
QCommandLineParser *PimUniqueApplication::cmdArgs() const
{
@@ -139,7 +136,7 @@
QDBusConnection::sessionBus().registerService(serviceName);
// Make sure we have DrKonqi
- Private::disableChromiumCrashHandler();
+ PimUniqueApplicationPrivate::disableChromiumCrashHandler();
static_cast<PimUniqueApplication *>(qApp)->activate(arguments,
QDir::currentPath());
return true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-21.08.3/src/pimuniqueapplication.h
new/kontactinterface-21.12.0/src/pimuniqueapplication.h
--- old/kontactinterface-21.08.3/src/pimuniqueapplication.h 2021-10-07
21:29:35.000000000 +0200
+++ new/kontactinterface-21.12.0/src/pimuniqueapplication.h 2021-11-30
19:23:17.000000000 +0100
@@ -9,6 +9,7 @@
#include "kontactinterface_export.h"
#include <QApplication>
+#include <memory>
class KAboutData;
class QCommandLineParser;
@@ -56,8 +57,8 @@
private:
//@cond PRIVATE
- class Private;
- Private *const d;
+ class PimUniqueApplicationPrivate;
+ std::unique_ptr<PimUniqueApplicationPrivate> const d;
//@endcond
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-21.08.3/src/plugin.cpp
new/kontactinterface-21.12.0/src/plugin.cpp
--- old/kontactinterface-21.08.3/src/plugin.cpp 2021-10-07 21:29:35.000000000
+0200
+++ new/kontactinterface-21.12.0/src/plugin.cpp 2021-11-30 19:23:17.000000000
+0100
@@ -27,11 +27,11 @@
using namespace KontactInterface;
/**
- Private class that helps to provide binary compatibility between releases.
+ PluginPrivate class that helps to provide binary compatibility between
releases.
@internal
*/
//@cond PRIVATE
-class Q_DECL_HIDDEN Plugin::Private
+class Q_DECL_HIDDEN Plugin::PluginPrivate
{
public:
void partDestroyed();
@@ -57,7 +57,7 @@
Plugin::Plugin(Core *core, QObject *parent, const char *appName, const char
*pluginName)
: KXMLGUIClient(core)
, QObject(parent)
- , d(new Private)
+ , d(new PluginPrivate)
{
setObjectName(QLatin1String(appName));
core->factory()->addClient(this);
@@ -72,7 +72,6 @@
Plugin::~Plugin()
{
delete d->part;
- delete d;
}
void Plugin::setIdentifier(const QString &identifier)
@@ -234,12 +233,12 @@
}
//@cond PRIVATE
-void Plugin::Private::partDestroyed()
+void Plugin::PluginPrivate::partDestroyed()
{
part = nullptr;
}
-void Plugin::Private::removeInvisibleToolbarActions(Plugin *plugin)
+void Plugin::PluginPrivate::removeInvisibleToolbarActions(Plugin *plugin)
{
if (pluginName.isEmpty()) {
return;
@@ -294,7 +293,7 @@
setXmlFiles();
}
-void Plugin::Private::setXmlFiles()
+void Plugin::PluginPrivate::setXmlFiles()
{
if (pluginName.isEmpty()) {
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-21.08.3/src/plugin.h
new/kontactinterface-21.12.0/src/plugin.h
--- old/kontactinterface-21.08.3/src/plugin.h 2021-10-07 21:29:35.000000000
+0200
+++ new/kontactinterface-21.12.0/src/plugin.h 2021-11-30 19:23:17.000000000
+0100
@@ -52,7 +52,7 @@
/**
Exports Kontact plugin.
- @param pluginclass the class to instanciate (must derive from
KontactInterface::Plugin
+ @param pluginclass the class to instantiate (must derive from
KontactInterface::Plugin)
@param jsonFile filename of the JSON file, generated from a .desktop file
*/
#define EXPORT_KONTACT_PLUGIN_WITH_JSON(pluginclass, jsonFile)
\
@@ -321,8 +321,8 @@
private:
//@cond PRIVATE
- class Private;
- Private *const d;
+ class PluginPrivate;
+ std::unique_ptr<PluginPrivate> const d;
//@endcond
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-21.08.3/src/summary.cpp
new/kontactinterface-21.12.0/src/summary.cpp
--- old/kontactinterface-21.08.3/src/summary.cpp 2021-10-07
21:29:35.000000000 +0200
+++ new/kontactinterface-21.12.0/src/summary.cpp 2021-11-30
19:23:17.000000000 +0100
@@ -41,7 +41,7 @@
//@endcond
//@cond PRIVATE
-class Q_DECL_HIDDEN Summary::Private
+class Q_DECL_HIDDEN Summary::SummaryPrivate
{
public:
QPoint mDragStartPoint;
@@ -50,16 +50,13 @@
Summary::Summary(QWidget *parent)
: QWidget(parent)
- , d(new Private)
+ , d(new SummaryPrivate)
{
setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont));
setAcceptDrops(true);
}
-Summary::~Summary()
-{
- delete d;
-}
+Summary::~Summary() = default;
int Summary::summaryHeight() const
{
@@ -70,7 +67,7 @@
{
auto box = new QWidget(parent);
auto hbox = new QHBoxLayout(box);
- hbox->setContentsMargins(0, 0, 0, 0);
+ hbox->setContentsMargins({});
hbox->setSpacing(0);
box->setAutoFillBackground(true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-21.08.3/src/summary.h
new/kontactinterface-21.12.0/src/summary.h
--- old/kontactinterface-21.08.3/src/summary.h 2021-10-07 21:29:35.000000000
+0200
+++ new/kontactinterface-21.12.0/src/summary.h 2021-11-30 19:23:17.000000000
+0100
@@ -100,8 +100,8 @@
private:
//@cond PRIVATE
- class Private;
- Private *const d;
+ class SummaryPrivate;
+ std::unique_ptr<SummaryPrivate> const d;
//@endcond
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-21.08.3/src/uniqueapphandler.cpp
new/kontactinterface-21.12.0/src/uniqueapphandler.cpp
--- old/kontactinterface-21.08.3/src/uniqueapphandler.cpp 2021-10-07
21:29:35.000000000 +0200
+++ new/kontactinterface-21.12.0/src/uniqueapphandler.cpp 2021-11-30
19:23:17.000000000 +0100
@@ -65,7 +65,7 @@
using namespace KontactInterface;
//@cond PRIVATE
-class UniqueAppHandler::Private
+class UniqueAppHandler::UniqueAppHandlerPrivate
{
public:
Plugin *mPlugin;
@@ -74,7 +74,7 @@
UniqueAppHandler::UniqueAppHandler(Plugin *plugin)
: QObject(plugin)
- , d(new Private)
+ , d(new UniqueAppHandlerPrivate)
{
qCDebug(KONTACTINTERFACE_LOG) << "plugin->objectName():" <<
plugin->objectName();
@@ -91,7 +91,6 @@
QDBusConnection session = QDBusConnection::sessionBus();
const QString appName = parent()->objectName();
session.unregisterService(QLatin1String("org.kde.") + appName);
- delete d;
}
// DBUS call
@@ -141,7 +140,7 @@
}
//@cond PRIVATE
-class Q_DECL_HIDDEN UniqueAppWatcher::Private
+class Q_DECL_HIDDEN UniqueAppWatcher::UniqueAppWatcherPrivate
{
public:
UniqueAppHandlerFactoryBase *mFactory = nullptr;
@@ -152,7 +151,7 @@
UniqueAppWatcher::UniqueAppWatcher(UniqueAppHandlerFactoryBase *factory,
Plugin *plugin)
: QObject(plugin)
- , d(new Private)
+ , d(new UniqueAppWatcherPrivate)
{
d->mFactory = factory;
d->mPlugin = plugin;
@@ -200,7 +199,6 @@
UniqueAppWatcher::~UniqueAppWatcher()
{
delete d->mFactory;
- delete d;
}
bool UniqueAppWatcher::isRunningStandalone() const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-21.08.3/src/uniqueapphandler.h
new/kontactinterface-21.12.0/src/uniqueapphandler.h
--- old/kontactinterface-21.08.3/src/uniqueapphandler.h 2021-10-07
21:29:35.000000000 +0200
+++ new/kontactinterface-21.12.0/src/uniqueapphandler.h 2021-11-30
19:23:17.000000000 +0100
@@ -10,7 +10,7 @@
#include "kontactinterface_export.h"
#include "plugin.h"
-
+#include <memory>
class QCommandLineParser;
namespace KontactInterface
@@ -57,8 +57,8 @@
virtual int activate(const QStringList &args, const QString
&workingDirectory);
private:
- class Private;
- Private *const d;
+ class UniqueAppHandlerPrivate;
+ std::unique_ptr<UniqueAppHandlerPrivate> const d;
};
/// Base class for UniqueAppHandler
@@ -118,8 +118,8 @@
void slotApplicationRemoved(const QString &name, const QString &oldOwner,
const QString &newOwner);
private:
- class Private;
- Private *const d;
+ class UniqueAppWatcherPrivate;
+ std::unique_ptr<UniqueAppWatcherPrivate> const d;
};
} // namespace
