Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kitemmodels for openSUSE:Factory checked in at 2021-02-17 18:11:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemmodels (Old) and /work/SRC/openSUSE:Factory/.kitemmodels.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemmodels" Wed Feb 17 18:11:09 2021 rev:88 rq:871705 version:5.79.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kitemmodels/kitemmodels.changes 2021-01-13 18:18:50.997240467 +0100 +++ /work/SRC/openSUSE:Factory/.kitemmodels.new.28504/kitemmodels.changes 2021-02-17 18:12:18.713978493 +0100 @@ -1,0 +2,14 @@ +Mon Feb 8 08:46:28 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.79.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.79.0 +- Changes since 5.78.0: + * Port from std::auto_ptr to std::unique_ptr + * Use nullptr instead of 0 + * adds additional nullptr checks + * autotests: don't run the bihash benchmark automatically + * autotests: add missing subdir bihash + +------------------------------------------------------------------- Old: ---- kitemmodels-5.78.0.tar.xz kitemmodels-5.78.0.tar.xz.sig New: ---- kitemmodels-5.79.0.tar.xz kitemmodels-5.79.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemmodels.spec ++++++ --- /var/tmp/diff_new_pack.PKbGSI/_old 2021-02-17 18:12:19.385979043 +0100 +++ /var/tmp/diff_new_pack.PKbGSI/_new 2021-02-17 18:12:19.385979043 +0100 @@ -17,7 +17,7 @@ %define lname libKF5ItemModels5 -%define _tar_path 5.78 +%define _tar_path 5.79 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -26,7 +26,7 @@ # Only needed for the package signature condition %bcond_without lang Name: kitemmodels -Version: 5.78.0 +Version: 5.79.0 Release: 0 Summary: Set of item models extending the Qt model-view framework License: LGPL-2.1-or-later ++++++ kitemmodels-5.78.0.tar.xz -> kitemmodels-5.79.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/.gitignore new/kitemmodels-5.79.0/.gitignore --- old/kitemmodels-5.78.0/.gitignore 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/.gitignore 2021-02-01 17:07:48.000000000 +0100 @@ -20,3 +20,4 @@ CMakeLists.txt.user* *.unc-backup* .cmake/ +/.clang-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/CMakeLists.txt new/kitemmodels-5.79.0/CMakeLists.txt --- old/kitemmodels-5.78.0/CMakeLists.txt 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/CMakeLists.txt 2021-02-01 17:07:48.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.78.0") # handled by release scripts -project(KItemModels VERSION ${KF5_VERSION}) +set(KF_VERSION "5.79.0") # handled by release scripts +project(KItemModels VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.78.0 NO_MODULE) +find_package(ECM 5.79.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/autotests/CMakeLists.txt new/kitemmodels-5.79.0/autotests/CMakeLists.txt --- old/kitemmodels-5.78.0/autotests/CMakeLists.txt 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/autotests/CMakeLists.txt 2021-02-01 17:07:48.000000000 +0100 @@ -11,6 +11,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets) add_subdirectory(proxymodeltestsuite) +add_subdirectory(bihash) include(ECMAddTests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/autotests/bihash/CMakeLists.txt new/kitemmodels-5.79.0/autotests/bihash/CMakeLists.txt --- old/kitemmodels-5.78.0/autotests/bihash/CMakeLists.txt 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/autotests/bihash/CMakeLists.txt 2021-02-01 17:07:48.000000000 +0100 @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.8.12) +include_directories("../../src/core") # for kbihash_p.h + set(functionalitytest_srcs functionalitytest.cpp ) @@ -15,15 +17,8 @@ set(benchmarks_srcs benchmarks.cpp ) -set(benchmarks_srcs2 - benchmarks.cpp -) - -# set(moc_output_file "${CMAKE_CURRENT_BINARY_DIR}/benchmarks.moc") -# qt5_generate_moc(benchmarks.cpp ${moc_output_file}) add_executable(bihash_benchmarks_exec ${benchmarks_srcs} ) -add_test(bihash_benchmarks bihash_benchmarks_exec) target_link_libraries(bihash_benchmarks_exec Qt5::Widgets diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/autotests/bihash/benchmarks.cpp new/kitemmodels-5.79.0/autotests/bihash/benchmarks.cpp --- old/kitemmodels-5.78.0/autotests/bihash/benchmarks.cpp 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/autotests/bihash/benchmarks.cpp 2021-02-01 17:07:48.000000000 +0100 @@ -81,7 +81,7 @@ { Q_OBJECT public: - BiHashBenchmarks(QObject *parent = 0) + BiHashBenchmarks(QObject *parent = nullptr) { qsrand(QDateTime::currentDateTime().toSecsSinceEpoch()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/autotests/bihash/functionalitytest.cpp new/kitemmodels-5.79.0/autotests/bihash/functionalitytest.cpp --- old/kitemmodels-5.78.0/autotests/bihash/functionalitytest.cpp 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/autotests/bihash/functionalitytest.cpp 2021-02-01 17:07:48.000000000 +0100 @@ -7,12 +7,15 @@ #include "kbihash_p.h" +#include <QCoreApplication> +#include <QDataStream> #include <QString> #include <QDebug> #include <QBuffer> int main(int argc, char **argv) { + QCoreApplication app(argc, argv); KBiHash<int, QString> biHash; biHash.insert(5, "5.5"); biHash.insert(6, "6.6"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/autotests/proxymodeltestsuite/eventloggerregister.cpp new/kitemmodels-5.79.0/autotests/proxymodeltestsuite/eventloggerregister.cpp --- old/kitemmodels-5.78.0/autotests/proxymodeltestsuite/eventloggerregister.cpp 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/autotests/proxymodeltestsuite/eventloggerregister.cpp 2021-02-01 17:07:48.000000000 +0100 @@ -15,7 +15,7 @@ } EventLoggerRegister *EventLoggerRegister::s_instance = nullptr; -std::auto_ptr<EventLoggerRegister> EventLoggerRegister::s_destroyer; +std::unique_ptr<EventLoggerRegister> EventLoggerRegister::s_destroyer; EventLoggerRegister *EventLoggerRegister::instance(Behaviour behaviour) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/autotests/proxymodeltestsuite/eventloggerregister.h new/kitemmodels-5.79.0/autotests/proxymodeltestsuite/eventloggerregister.h --- old/kitemmodels-5.78.0/autotests/proxymodeltestsuite/eventloggerregister.h 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/autotests/proxymodeltestsuite/eventloggerregister.h 2021-02-01 17:07:48.000000000 +0100 @@ -23,6 +23,9 @@ InstallMsgHandler, NoInstallMsgHandler }; + + ~EventLoggerRegister(); + static EventLoggerRegister *instance(Behaviour behaviour = InstallMsgHandler); void registerLogger(ModelEventLogger *logger); @@ -32,13 +35,11 @@ private: EventLoggerRegister(Behaviour behaviour); - ~EventLoggerRegister(); QVector<ModelEventLogger *> m_loggers; static EventLoggerRegister *s_instance; - friend class std::auto_ptr<EventLoggerRegister>; - static std::auto_ptr<EventLoggerRegister> s_destroyer; + static std::unique_ptr<EventLoggerRegister> s_destroyer; Q_DISABLE_COPY(EventLoggerRegister) }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/CMakeLists.txt new/kitemmodels-5.79.0/src/core/CMakeLists.txt --- old/kitemmodels-5.78.0/src/core/CMakeLists.txt 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/CMakeLists.txt 2021-02-01 17:07:48.000000000 +0100 @@ -28,7 +28,7 @@ ecm_generate_export_header(KF5ItemModels BASE_NAME KItemModels GROUP_BASE_NAME KF - VERSION ${KF5_VERSION} + VERSION ${KF_VERSION} DEPRECATED_BASE_VERSION 0 DEPRECATION_VERSIONS 4.8 5.65 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} @@ -102,7 +102,7 @@ KF5ItemModels_QCH NAME KItemModels BASE_NAME KF5ItemModels - VERSION ${KF5_VERSION} + VERSION ${KF_VERSION} ORG_DOMAIN org.kde SOURCES # using only public headers, to cover only public API ${KItemModels_HEADERS} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/kbreadcrumbselectionmodel.cpp new/kitemmodels-5.79.0/src/core/kbreadcrumbselectionmodel.cpp --- old/kitemmodels-5.78.0/src/core/kbreadcrumbselectionmodel.cpp 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/kbreadcrumbselectionmodel.cpp 2021-02-01 17:07:48.000000000 +0100 @@ -65,10 +65,7 @@ d_ptr->init(); } -KBreadcrumbSelectionModel::~KBreadcrumbSelectionModel() -{ - delete d_ptr; -} +KBreadcrumbSelectionModel::~KBreadcrumbSelectionModel() = default; bool KBreadcrumbSelectionModel::isActualSelectionIncluded() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/kbreadcrumbselectionmodel.h new/kitemmodels-5.79.0/src/core/kbreadcrumbselectionmodel.h --- old/kitemmodels-5.78.0/src/core/kbreadcrumbselectionmodel.h 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/kbreadcrumbselectionmodel.h 2021-02-01 17:07:48.000000000 +0100 @@ -12,6 +12,8 @@ #include "kitemmodels_export.h" +#include <memory> + class KBreadcrumbSelectionModelPrivate; /** @@ -134,7 +136,8 @@ void select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command) override; protected: - KBreadcrumbSelectionModelPrivate *const d_ptr; + std::unique_ptr<KBreadcrumbSelectionModelPrivate> const d_ptr; + private: //@cond PRIVATE Q_DECLARE_PRIVATE(KBreadcrumbSelectionModel) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/kcheckableproxymodel.cpp new/kitemmodels-5.79.0/src/core/kcheckableproxymodel.cpp --- old/kitemmodels-5.78.0/src/core/kcheckableproxymodel.cpp 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/kcheckableproxymodel.cpp 2021-02-01 17:07:48.000000000 +0100 @@ -31,10 +31,7 @@ } -KCheckableProxyModel::~KCheckableProxyModel() -{ - delete d_ptr; -} +KCheckableProxyModel::~KCheckableProxyModel() = default; void KCheckableProxyModel::setSelectionModel(QItemSelectionModel *itemSelectionModel) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/kcheckableproxymodel.h new/kitemmodels-5.79.0/src/core/kcheckableproxymodel.h --- old/kitemmodels-5.78.0/src/core/kcheckableproxymodel.h 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/kcheckableproxymodel.h 2021-02-01 17:07:48.000000000 +0100 @@ -12,6 +12,8 @@ #include <QItemSelection> #include <QIdentityProxyModel> +#include <memory> + class KCheckableProxyModelPrivate; /** @@ -74,7 +76,7 @@ private: Q_DECLARE_PRIVATE(KCheckableProxyModel) - KCheckableProxyModelPrivate *const d_ptr; + std::unique_ptr<KCheckableProxyModelPrivate> const d_ptr; Q_PRIVATE_SLOT(d_func(), void selectionChanged(const QItemSelection &, const QItemSelection &)) }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/kconcatenaterowsproxymodel.h new/kitemmodels-5.79.0/src/core/kconcatenaterowsproxymodel.h --- old/kitemmodels-5.78.0/src/core/kconcatenaterowsproxymodel.h 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/kconcatenaterowsproxymodel.h 2021-02-01 17:07:48.000000000 +0100 @@ -9,9 +9,10 @@ #define KCONCATENATEROWSPROXYMODEL_H #include <QAbstractItemModel> -#include <QScopedPointer> #include "kitemmodels_export.h" +#include <memory> + class KConcatenateRowsProxyModelPrivate; /** @@ -148,7 +149,7 @@ private: friend class KConcatenateRowsProxyModelPrivate; - const QScopedPointer<KConcatenateRowsProxyModelPrivate> d; + std::unique_ptr<KConcatenateRowsProxyModelPrivate> const d; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/kdescendantsproxymodel.cpp new/kitemmodels-5.79.0/src/core/kdescendantsproxymodel.cpp --- old/kitemmodels-5.78.0/src/core/kdescendantsproxymodel.cpp 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/kdescendantsproxymodel.cpp 2021-02-01 17:07:48.000000000 +0100 @@ -206,10 +206,7 @@ { } -KDescendantsProxyModel::~KDescendantsProxyModel() -{ - delete d_ptr; -} +KDescendantsProxyModel::~KDescendantsProxyModel() = default; QHash<int, QByteArray> KDescendantsProxyModel::roleNames() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/kdescendantsproxymodel.h new/kitemmodels-5.79.0/src/core/kdescendantsproxymodel.h --- old/kitemmodels-5.78.0/src/core/kdescendantsproxymodel.h 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/kdescendantsproxymodel.h 2021-02-01 17:07:48.000000000 +0100 @@ -9,10 +9,12 @@ #include <QAbstractProxyModel> -class KDescendantsProxyModelPrivate; - #include "kitemmodels_export.h" +#include <memory> + +class KDescendantsProxyModelPrivate; + /** @class KDescendantsProxyModel kdescendantsproxymodel.h KDescendantsProxyModel @@ -247,7 +249,7 @@ private: Q_DECLARE_PRIVATE(KDescendantsProxyModel) //@cond PRIVATE - KDescendantsProxyModelPrivate *d_ptr; + std::unique_ptr<KDescendantsProxyModelPrivate> const d_ptr; Q_PRIVATE_SLOT(d_func(), void sourceRowsAboutToBeInserted(const QModelIndex &, int, int)) Q_PRIVATE_SLOT(d_func(), void sourceRowsInserted(const QModelIndex &, int, int)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/kextracolumnsproxymodel.cpp new/kitemmodels-5.79.0/src/core/kextracolumnsproxymodel.cpp --- old/kitemmodels-5.78.0/src/core/kextracolumnsproxymodel.cpp 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/kextracolumnsproxymodel.cpp 2021-02-01 17:07:48.000000000 +0100 @@ -193,7 +193,7 @@ // extra columns are readonly return Qt::ItemIsSelectable | Qt::ItemIsEnabled; } - return sourceModel()->flags(mapToSource(index)); + return sourceModel() != nullptr ? sourceModel()->flags(mapToSource(index)) : Qt::NoItemFlags; } bool KExtraColumnsProxyModel::hasChildren(const QModelIndex &index) const @@ -244,9 +244,11 @@ int KExtraColumnsProxyModel::extraColumnForProxyColumn(int proxyColumn) const { - const int sourceColumnCount = sourceModel()->columnCount(); - if (proxyColumn >= sourceColumnCount) { - return proxyColumn - sourceColumnCount; + if(sourceModel() != nullptr) { + const int sourceColumnCount = sourceModel()->columnCount(); + if (proxyColumn >= sourceColumnCount) { + return proxyColumn - sourceColumnCount; + } } return -1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/kextracolumnsproxymodel.h new/kitemmodels-5.79.0/src/core/kextracolumnsproxymodel.h --- old/kitemmodels-5.78.0/src/core/kextracolumnsproxymodel.h 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/kextracolumnsproxymodel.h 2021-02-01 17:07:48.000000000 +0100 @@ -9,9 +9,10 @@ #define KEXTRACOLUMNSPROXYMODEL_H #include <QIdentityProxyModel> -#include <QScopedPointer> #include "kitemmodels_export.h" +#include <memory> + class KExtraColumnsProxyModelPrivate; /** @@ -139,7 +140,7 @@ Q_DECLARE_PRIVATE(KExtraColumnsProxyModel) Q_PRIVATE_SLOT(d_func(), void _ec_sourceLayoutAboutToBeChanged(const QList<QPersistentModelIndex> &, QAbstractItemModel::LayoutChangeHint)) Q_PRIVATE_SLOT(d_func(), void _ec_sourceLayoutChanged(const QList<QPersistentModelIndex> &, QAbstractItemModel::LayoutChangeHint)) - const QScopedPointer<KExtraColumnsProxyModelPrivate> d_ptr; + std::unique_ptr<KExtraColumnsProxyModelPrivate> const d_ptr; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/klinkitemselectionmodel.cpp new/kitemmodels-5.79.0/src/core/klinkitemselectionmodel.cpp --- old/kitemmodels-5.78.0/src/core/klinkitemselectionmodel.cpp 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/klinkitemselectionmodel.cpp 2021-02-01 17:07:48.000000000 +0100 @@ -80,10 +80,7 @@ { } -KLinkItemSelectionModel::~KLinkItemSelectionModel() -{ - delete d_ptr; -} +KLinkItemSelectionModel::~KLinkItemSelectionModel() = default; QItemSelectionModel *KLinkItemSelectionModel::linkedItemSelectionModel() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/klinkitemselectionmodel.h new/kitemmodels-5.79.0/src/core/klinkitemselectionmodel.h --- old/kitemmodels-5.78.0/src/core/klinkitemselectionmodel.h 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/klinkitemselectionmodel.h 2021-02-01 17:07:48.000000000 +0100 @@ -14,6 +14,8 @@ #include "kitemmodels_export.h" +#include <memory> + class KLinkItemSelectionModelPrivate; /** @@ -106,7 +108,7 @@ void linkedItemSelectionModelChanged(); protected: - KLinkItemSelectionModelPrivate *const d_ptr; + std::unique_ptr<KLinkItemSelectionModelPrivate> const d_ptr; private: Q_DECLARE_PRIVATE(KLinkItemSelectionModel) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/kmodelindexproxymapper.cpp new/kitemmodels-5.79.0/src/core/kmodelindexproxymapper.cpp --- old/kitemmodels-5.78.0/src/core/kmodelindexproxymapper.cpp 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/kmodelindexproxymapper.cpp 2021-02-01 17:07:48.000000000 +0100 @@ -158,10 +158,7 @@ } -KModelIndexProxyMapper::~KModelIndexProxyMapper() -{ - delete d_ptr; -} +KModelIndexProxyMapper::~KModelIndexProxyMapper() = default; QModelIndex KModelIndexProxyMapper::mapLeftToRight(const QModelIndex &index) const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/kmodelindexproxymapper.h new/kitemmodels-5.79.0/src/core/kmodelindexproxymapper.h --- old/kitemmodels-5.78.0/src/core/kmodelindexproxymapper.h 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/kmodelindexproxymapper.h 2021-02-01 17:07:48.000000000 +0100 @@ -14,6 +14,8 @@ #include "kitemmodels_export.h" +#include <memory> + class QAbstractItemModel; class QModelIndex; class QItemSelection; @@ -115,7 +117,7 @@ private: //@cond PRIVATE Q_DECLARE_PRIVATE(KModelIndexProxyMapper) - KModelIndexProxyMapperPrivate *const d_ptr; + std::unique_ptr<KModelIndexProxyMapperPrivate> const d_ptr; //@endcond }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/knumbermodel.h new/kitemmodels-5.79.0/src/core/knumbermodel.h --- old/kitemmodels-5.78.0/src/core/knumbermodel.h 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/knumbermodel.h 2021-02-01 17:07:48.000000000 +0100 @@ -8,11 +8,12 @@ #define KNUMBERMODEL_H #include <QAbstractListModel> -#include <QScopedPointer> #include <QLocale> #include "kitemmodels_export.h" +#include <memory> + class KNumberModelPrivate; /** @@ -97,7 +98,7 @@ void formattingOptionsChanged(); private: - QScopedPointer<KNumberModelPrivate> d; + std::unique_ptr<KNumberModelPrivate> const d; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/krearrangecolumnsproxymodel.h new/kitemmodels-5.79.0/src/core/krearrangecolumnsproxymodel.h --- old/kitemmodels-5.78.0/src/core/krearrangecolumnsproxymodel.h 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/krearrangecolumnsproxymodel.h 2021-02-01 17:07:48.000000000 +0100 @@ -9,9 +9,10 @@ #define REARRANGECOLUMNSPROXYMODEL_H #include <QIdentityProxyModel> -#include <QScopedPointer> #include "kitemmodels_export.h" +#include <memory> + class KRearrangeColumnsProxyModelPrivate; /** @@ -94,7 +95,7 @@ int sourceColumnForProxyColumn(int proxyColumn) const; private: - const QScopedPointer<KRearrangeColumnsProxyModelPrivate> d_ptr; + std::unique_ptr<KRearrangeColumnsProxyModelPrivate> const d_ptr; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/krecursivefilterproxymodel.cpp new/kitemmodels-5.79.0/src/core/krecursivefilterproxymodel.cpp --- old/kitemmodels-5.78.0/src/core/krecursivefilterproxymodel.cpp 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/krecursivefilterproxymodel.cpp 2021-02-01 17:07:48.000000000 +0100 @@ -234,10 +234,7 @@ setDynamicSortFilter(true); } -KRecursiveFilterProxyModel::~KRecursiveFilterProxyModel() -{ - delete d_ptr; -} +KRecursiveFilterProxyModel::~KRecursiveFilterProxyModel() = default; bool KRecursiveFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/krecursivefilterproxymodel.h new/kitemmodels-5.79.0/src/core/krecursivefilterproxymodel.h --- old/kitemmodels-5.78.0/src/core/krecursivefilterproxymodel.h 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/krecursivefilterproxymodel.h 2021-02-01 17:07:48.000000000 +0100 @@ -12,6 +12,8 @@ #if KITEMMODELS_ENABLE_DEPRECATED_SINCE(5, 65) #include <QSortFilterProxyModel> +#include <memory> + class KRecursiveFilterProxyModelPrivate; /** @@ -110,7 +112,7 @@ /** @reimp */ bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; - KRecursiveFilterProxyModelPrivate *const d_ptr; + std::unique_ptr<KRecursiveFilterProxyModelPrivate> const d_ptr; private: //@cond PRIVATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/kselectionproxymodel.cpp new/kitemmodels-5.79.0/src/core/kselectionproxymodel.cpp --- old/kitemmodels-5.78.0/src/core/kselectionproxymodel.cpp 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/kselectionproxymodel.cpp 2021-02-01 17:07:48.000000000 +0100 @@ -2004,10 +2004,7 @@ { } -KSelectionProxyModel::~KSelectionProxyModel() -{ - delete d_ptr; -} +KSelectionProxyModel::~KSelectionProxyModel() = default; void KSelectionProxyModel::setFilterBehavior(FilterBehavior behavior) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.78.0/src/core/kselectionproxymodel.h new/kitemmodels-5.79.0/src/core/kselectionproxymodel.h --- old/kitemmodels-5.78.0/src/core/kselectionproxymodel.h 2021-01-02 13:28:54.000000000 +0100 +++ new/kitemmodels-5.79.0/src/core/kselectionproxymodel.h 2021-02-01 17:07:48.000000000 +0100 @@ -12,6 +12,8 @@ #include "kitemmodels_export.h" +#include <memory> + class KSelectionProxyModelPrivate; /** @@ -298,7 +300,7 @@ private: Q_DECLARE_PRIVATE(KSelectionProxyModel) //@cond PRIVATE - KSelectionProxyModelPrivate *d_ptr; + std::unique_ptr<KSelectionProxyModelPrivate> const d_ptr; Q_PRIVATE_SLOT(d_func(), void sourceRowsAboutToBeInserted(const QModelIndex &, int, int)) Q_PRIVATE_SLOT(d_func(), void sourceRowsInserted(const QModelIndex &, int, int))
