Hello community, here is the log from the commit of package kitemmodels for openSUSE:Leap:15.2 checked in at 2020-06-17 11:36:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/kitemmodels (Old) and /work/SRC/openSUSE:Leap:15.2/.kitemmodels.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemmodels" Wed Jun 17 11:36:06 2020 rev:65 rq:814451 version:5.71.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/kitemmodels/kitemmodels.changes 2020-05-12 11:39:18.096614206 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.kitemmodels.new.3606/kitemmodels.changes 2020-06-17 11:37:10.716000724 +0200 @@ -1,0 +2,11 @@ +Sun Jun 7 08:06:47 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.71.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.71.0 +- Changes since 5.70.0: + * Use Q_EMIT and build with QT_NO_KEYWORDS + * Fix build with EXCLUDE_DEPRECATED_BEFORE_AND_AT=CURRENT + +------------------------------------------------------------------- Old: ---- kitemmodels-5.70.0.tar.xz kitemmodels-5.70.0.tar.xz.sig New: ---- kitemmodels-5.71.0.tar.xz kitemmodels-5.71.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemmodels.spec ++++++ --- /var/tmp/diff_new_pack.hGrqLi/_old 2020-06-17 11:37:11.084001817 +0200 +++ /var/tmp/diff_new_pack.hGrqLi/_new 2020-06-17 11:37:11.084001817 +0200 @@ -17,7 +17,7 @@ %define lname libKF5ItemModels5 -%define _tar_path 5.70 +%define _tar_path 5.71 # 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.70.0 +Version: 5.71.0 Release: 0 Summary: Set of item models extending the Qt model-view framework License: LGPL-2.1-or-later ++++++ kitemmodels-5.70.0.tar.xz -> kitemmodels-5.71.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.70.0/.arcconfig new/kitemmodels-5.71.0/.arcconfig --- old/kitemmodels-5.70.0/.arcconfig 2020-05-02 23:58:45.000000000 +0200 +++ new/kitemmodels-5.71.0/.arcconfig 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -{ - "phabricator.uri" : "https://phabricator.kde.org/"; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.70.0/CMakeLists.txt new/kitemmodels-5.71.0/CMakeLists.txt --- old/kitemmodels-5.70.0/CMakeLists.txt 2020-05-02 23:58:45.000000000 +0200 +++ new/kitemmodels-5.71.0/CMakeLists.txt 2020-06-06 21:35:01.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.70.0") # handled by release scripts +set(KF5_VERSION "5.71.0") # handled by release scripts project(KItemModels VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.70.0 NO_MODULE) +find_package(ECM 5.71.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) @@ -39,6 +39,7 @@ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kitemmodels_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ItemModelsConfigVersion.cmake" SOVERSION 5) +add_definitions(-DQT_NO_KEYWORDS) add_definitions(-DQT_NO_FOREACH) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.70.0/autotests/CMakeLists.txt new/kitemmodels-5.71.0/autotests/CMakeLists.txt --- old/kitemmodels-5.70.0/autotests/CMakeLists.txt 2020-05-02 23:58:45.000000000 +0200 +++ new/kitemmodels-5.71.0/autotests/CMakeLists.txt 2020-06-06 21:35:01.000000000 +0200 @@ -14,6 +14,11 @@ include(ECMAddTests) +if(NOT EXCLUDE_DEPRECATED_BEFORE_AND_AT STREQUAL "CURRENT" AND + EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.65.0) + set(krecursivefilterproxymodeltest_SRC krecursivefilterproxymodeltest.cpp) +endif() + ecm_add_tests( kconcatenaterowsproxymodeltest.cpp kdescendantsproxymodel_smoketest.cpp @@ -22,7 +27,7 @@ klinkitemselectionmodeltest.cpp kselectionproxymodeltest.cpp kmodelindexproxymappertest.cpp - krecursivefilterproxymodeltest.cpp + ${krecursivefilterproxymodeltest_SRC} krearrangecolumnsproxymodeltest.cpp knumbermodeltest.cpp kcolumnheadersmodeltest.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.70.0/autotests/proxymodeltestsuite/dynamictreemodel.cpp new/kitemmodels-5.71.0/autotests/proxymodeltestsuite/dynamictreemodel.cpp --- old/kitemmodels-5.70.0/autotests/proxymodeltestsuite/dynamictreemodel.cpp 2020-05-02 23:58:45.000000000 +0200 +++ new/kitemmodels-5.71.0/autotests/proxymodeltestsuite/dynamictreemodel.cpp 2020-06-06 21:35:01.000000000 +0200 @@ -604,7 +604,7 @@ connect(this, SIGNAL(beginRemoveRows(QModelIndex,int,int)), SLOT(queuedBeginRemoveRows(QModelIndex,int,int)), Qt::QueuedConnection); connect(this, SIGNAL(endRemoveRows()), SLOT(queuedEndRemoveRows()), Qt::QueuedConnection); - emit beginInsertRows(parent, m_startRow, m_endRow); + Q_EMIT beginInsertRows(parent, m_startRow, m_endRow); // m_model->beginInsertRows(parent, m_startRow, m_endRow); qint64 parentId = parent.internalId(); for (int row = m_startRow; row <= m_endRow; row++) { @@ -621,10 +621,10 @@ } } - emit endInsertRows(); + Q_EMIT endInsertRows(); // m_model->endInsertRows(); - emit beginRemoveRows(parent, m_startRow, m_endRow); + Q_EMIT beginRemoveRows(parent, m_startRow, m_endRow); // m_model->beginRemoveRows(parent, m_startRow, m_endRow); for (int col = 0; col < m_numCols; col++) { QList<qint64> childItems = m_model->m_childItems.value(parentId).value(col); @@ -634,7 +634,7 @@ m_model->m_childItems[parentId][col].removeOne(item); } } - emit endRemoveRows(); + Q_EMIT endRemoveRows(); // m_model->endRemoveRows(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.70.0/autotests/proxymodeltestsuite/proxymodeltest.cpp new/kitemmodels-5.71.0/autotests/proxymodeltestsuite/proxymodeltest.cpp --- old/kitemmodels-5.70.0/autotests/proxymodeltestsuite/proxymodeltest.cpp 2020-05-02 23:58:45.000000000 +0200 +++ new/kitemmodels-5.71.0/autotests/proxymodeltestsuite/proxymodeltest.cpp 2020-06-06 21:35:01.000000000 +0200 @@ -67,12 +67,25 @@ QMetaObject::invokeMethod(m_modelCommander, QString("init_" + currentTest).toLatin1(), Q_ARG(QString, currentTag)); } +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) +static QSet<QString> unmatchedItems(const QStringList &list, const QStringList &items) +{ + const QSet<QString> itemsAset(items.constBegin(), items.constEnd()); + const QSet<QString> listAsSet(list.constBegin(), list.constEnd()); + return listAsSet - itemsAset; +} +#endif + void ProxyModelTest::verifyExecutedTests() { if (m_dataTags.contains(ProxyModelTestData::failTag())) { return; } +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + const QSet<QString> unimplemented = unmatchedItems(m_modelCommanderTags, m_dataTags); +#else const QSet<QString> unimplemented = m_modelCommanderTags.toSet().subtract(m_dataTags.toSet()); +#endif QString unimplementedTestsString(QStringLiteral("(")); for (const QString &test : unimplemented) { unimplementedTestsString.append(test + ","); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.70.0/src/core/kcheckableproxymodel.cpp new/kitemmodels-5.71.0/src/core/kcheckableproxymodel.cpp --- old/kitemmodels-5.70.0/src/core/kcheckableproxymodel.cpp 2020-05-02 23:58:45.000000000 +0200 +++ new/kitemmodels-5.71.0/src/core/kcheckableproxymodel.cpp 2020-06-06 21:35:01.000000000 +0200 @@ -89,7 +89,7 @@ Qt::CheckState state = static_cast<Qt::CheckState>(value.toInt()); const QModelIndex srcIndex = mapToSource(index); bool result = select(QItemSelection(srcIndex, srcIndex), state == Qt::Checked ? QItemSelectionModel::Select : QItemSelectionModel::Deselect); - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); return result; } return QIdentityProxyModel::setData(index, value, role); @@ -106,11 +106,11 @@ Q_Q(KCheckableProxyModel); const auto lstSelected = q->mapSelectionFromSource(selected); for (const QItemSelectionRange &range : lstSelected) { - emit q->dataChanged(range.topLeft(), range.bottomRight()); + Q_EMIT q->dataChanged(range.topLeft(), range.bottomRight()); } const auto lstDeselected = q->mapSelectionFromSource(deselected); for (const QItemSelectionRange &range : lstDeselected) { - emit q->dataChanged(range.topLeft(), range.bottomRight()); + Q_EMIT q->dataChanged(range.topLeft(), range.bottomRight()); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.70.0/src/core/kconcatenaterowsproxymodel.cpp new/kitemmodels-5.71.0/src/core/kconcatenaterowsproxymodel.cpp --- old/kitemmodels-5.70.0/src/core/kconcatenaterowsproxymodel.cpp 2020-05-02 23:58:45.000000000 +0200 +++ new/kitemmodels-5.71.0/src/core/kconcatenaterowsproxymodel.cpp 2020-06-06 21:35:01.000000000 +0200 @@ -309,7 +309,7 @@ } const QModelIndex myFrom = q->mapFromSource(from); const QModelIndex myTo = q->mapFromSource(to); - emit q->dataChanged(myFrom, myTo, roles); + Q_EMIT q->dataChanged(myFrom, myTo, roles); } void KConcatenateRowsProxyModelPrivate::slotSourceLayoutAboutToBeChanged(const QList<QPersistentModelIndex> &sourceParents, QAbstractItemModel::LayoutChangeHint hint) @@ -326,7 +326,7 @@ parents << mappedParent; } - emit q->layoutAboutToBeChanged(parents, hint); + Q_EMIT q->layoutAboutToBeChanged(parents, hint); const QModelIndexList persistentIndexList = q->persistentIndexList(); layoutChangePersistentIndexes.reserve(persistentIndexList.size()); @@ -362,7 +362,7 @@ Q_ASSERT(mappedParent.isValid()); parents << mappedParent; } - emit q->layoutChanged(parents, hint); + Q_EMIT q->layoutChanged(parents, hint); } void KConcatenateRowsProxyModelPrivate::slotModelAboutToBeReset() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.70.0/src/core/kdescendantsproxymodel.cpp new/kitemmodels-5.71.0/src/core/kdescendantsproxymodel.cpp --- old/kitemmodels-5.70.0/src/core/kdescendantsproxymodel.cpp 2020-05-02 23:58:45.000000000 +0200 +++ new/kitemmodels-5.71.0/src/core/kdescendantsproxymodel.cpp 2020-06-06 21:35:01.000000000 +0200 @@ -217,9 +217,9 @@ bool displayChanged = (display != d->m_displayAncestorData); d->m_displayAncestorData = display; if (displayChanged) { - emit displayAncestorDataChanged(); + Q_EMIT displayAncestorDataChanged(); // send out big hammer. Everything needs to be updated. - emit dataChanged(index(0,0),index(rowCount()-1,columnCount()-1), changedRoles); + Q_EMIT dataChanged(index(0,0),index(rowCount()-1,columnCount()-1), changedRoles); } } @@ -235,10 +235,10 @@ bool separatorChanged = (separator != d->m_ancestorSeparator); d->m_ancestorSeparator = separator; if (separatorChanged) { - emit ancestorSeparatorChanged(); + Q_EMIT ancestorSeparatorChanged(); if (d->m_displayAncestorData) { // send out big hammer. Everything needs to be updated. - emit dataChanged(index(0,0),index(rowCount()-1,columnCount()-1), changedRoles); + Q_EMIT dataChanged(index(0,0),index(rowCount()-1,columnCount()-1), changedRoles); } } } @@ -304,7 +304,7 @@ } endResetModel(); - emit sourceModelChanged(); + Q_EMIT sourceModelChanged(); } QModelIndex KDescendantsProxyModel::parent(const QModelIndex &index) const @@ -892,7 +892,7 @@ return; } - emit q->layoutAboutToBeChanged(); + Q_EMIT q->layoutAboutToBeChanged(); QPersistentModelIndex srcPersistentIndex; const auto lst = q->persistentIndexList(); @@ -929,7 +929,7 @@ m_layoutChangePersistentIndexes.clear(); m_proxyIndexes.clear(); - emit q->layoutChanged(); + Q_EMIT q->layoutChanged(); } void KDescendantsProxyModelPrivate::sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) @@ -951,7 +951,7 @@ const QModelIndex proxyBottomRight = q->mapFromSource(sourceBottomRight); Q_ASSERT(proxyTopLeft.isValid()); Q_ASSERT(proxyBottomRight.isValid()); - emit q->dataChanged(proxyTopLeft, proxyBottomRight); + Q_EMIT q->dataChanged(proxyTopLeft, proxyBottomRight); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.70.0/src/core/kextracolumnsproxymodel.cpp new/kitemmodels-5.71.0/src/core/kextracolumnsproxymodel.cpp --- old/kitemmodels-5.70.0/src/core/kextracolumnsproxymodel.cpp 2020-05-02 23:58:45.000000000 +0200 +++ new/kitemmodels-5.71.0/src/core/kextracolumnsproxymodel.cpp 2020-06-06 21:35:01.000000000 +0200 @@ -68,7 +68,7 @@ void KExtraColumnsProxyModel::extraColumnDataChanged(const QModelIndex &parent, int row, int extraColumn, const QVector<int> &roles) { const QModelIndex idx = index(row, proxyColumnForExtraColumn(extraColumn), parent); - emit dataChanged(idx, idx, roles); + Q_EMIT dataChanged(idx, idx, roles); } void KExtraColumnsProxyModel::setSourceModel(QAbstractItemModel *model) @@ -272,7 +272,7 @@ parents << mappedParent; } - emit q->layoutAboutToBeChanged(parents, hint); + Q_EMIT q->layoutAboutToBeChanged(parents, hint); const QModelIndexList persistentIndexList = q->persistentIndexList(); layoutChangePersistentIndexes.reserve(persistentIndexList.size()); @@ -320,7 +320,7 @@ parents << mappedParent; } - emit q->layoutChanged(parents, hint); + Q_EMIT q->layoutChanged(parents, hint); } #include "moc_kextracolumnsproxymodel.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.70.0/src/core/knumbermodel.cpp new/kitemmodels-5.71.0/src/core/knumbermodel.cpp --- old/kitemmodels-5.70.0/src/core/knumbermodel.cpp 2020-05-02 23:58:45.000000000 +0200 +++ new/kitemmodels-5.71.0/src/core/knumbermodel.cpp 2020-06-06 21:35:01.000000000 +0200 @@ -36,7 +36,7 @@ beginResetModel(); d->minimumValue = minimumValue; endResetModel(); - emit minimumValueChanged(); + Q_EMIT minimumValueChanged(); } qreal KNumberModel::minimumValue() const @@ -52,7 +52,7 @@ beginResetModel(); d->maximumValue = maximumValue; endResetModel(); - emit maximumValueChanged(); + Q_EMIT maximumValueChanged(); } qreal KNumberModel::maximumValue() const @@ -68,7 +68,7 @@ beginResetModel(); d->stepSize = stepSize; endResetModel(); - emit stepSizeChanged(); + Q_EMIT stepSizeChanged(); } qreal KNumberModel::stepSize() const @@ -87,7 +87,7 @@ return; } dataChanged(index(0, 0, QModelIndex()), index(rowCount(), 0, QModelIndex()), QVector<int>{DisplayRole}); - emit formattingOptionsChanged(); + Q_EMIT formattingOptionsChanged(); } QLocale::NumberOptions KNumberModel::formattingOptions() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.70.0/src/core/kselectionproxymodel.cpp new/kitemmodels-5.71.0/src/core/kselectionproxymodel.cpp --- old/kitemmodels-5.70.0/src/core/kselectionproxymodel.cpp 2020-05-02 23:58:45.000000000 +0200 +++ new/kitemmodels-5.71.0/src/core/kselectionproxymodel.cpp 2020-06-06 21:35:01.000000000 +0200 @@ -630,7 +630,7 @@ const int sourceRangeSize = sourceLast.row() - sourceFirst.row(); if (proxyRangeSize == sourceRangeSize) { - emit q->dataChanged(proxyFirst, proxyLast); + Q_EMIT q->dataChanged(proxyFirst, proxyLast); return; } @@ -646,11 +646,11 @@ // // if (proxyRangeSize == sourceRangeSize) // { -// emit q->dataChanged(proxyFirst, proxyLast.sibling(proxyFirst.row() + proxyRangeSize, proxyLast.column())); +// Q_EMIT q->dataChanged(proxyFirst, proxyLast.sibling(proxyFirst.row() + proxyRangeSize, proxyLast.column())); // return; // } - emit q->dataChanged(proxyFirst, proxyLast); + Q_EMIT q->dataChanged(proxyFirst, proxyLast); } void KSelectionProxyModelPrivate::sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) @@ -703,14 +703,14 @@ } else { const QModelIndex _top = q->index(first, topLeft.column()); const QModelIndex _bottom = q->index(previous, bottomRight.column()); - emit q->dataChanged(_top, _bottom); + Q_EMIT q->dataChanged(_top, _bottom); previous = first = *it; } } if (first != previous) { const QModelIndex _top = q->index(first, topLeft.column()); const QModelIndex _bottom = q->index(previous, bottomRight.column()); - emit q->dataChanged(_top, _bottom); + Q_EMIT q->dataChanged(_top, _bottom); } return; } @@ -724,14 +724,14 @@ return; } // SubTrees and SubTreesWithoutRoots - emit q->dataChanged(proxyTopLeft, proxyBottomRight); + Q_EMIT q->dataChanged(proxyTopLeft, proxyBottomRight); return; } if (m_startWithChildTrees && !m_omitChildren && !m_includeAllSelected && !m_omitDescendants) { // SubTreesWithoutRoots if (proxyTopLeft.isValid()) { - emit q->dataChanged(proxyTopLeft, proxyBottomRight); + Q_EMIT q->dataChanged(proxyTopLeft, proxyBottomRight); } return; } @@ -750,17 +750,17 @@ return; } - emit q->layoutAboutToBeChanged(); + Q_EMIT q->layoutAboutToBeChanged(); QItemSelection selection; for (const QModelIndex &rootIndex : qAsConst(m_rootIndexList)) { // This will be optimized later. - emit q->rootIndexAboutToBeRemoved(rootIndex); + Q_EMIT q->rootIndexAboutToBeRemoved(rootIndex); selection.append(QItemSelectionRange(rootIndex, rootIndex)); } selection = kNormalizeSelection(selection); - emit q->rootSelectionAboutToBeRemoved(selection); + Q_EMIT q->rootSelectionAboutToBeRemoved(selection); QPersistentModelIndex srcPersistentIndex; const auto lst = q->persistentIndexList(); @@ -816,7 +816,7 @@ m_layoutChangePersistentIndexes.clear(); m_proxyIndexes.clear(); - emit q->layoutChanged(); + Q_EMIT q->layoutChanged(); } void KSelectionProxyModelPrivate::resetInternalData() @@ -1943,7 +1943,7 @@ // We still need to make sure its future children are inserted into the model. m_rootIndexList.insert(rootListRow, newIndex); if (!m_resetting || m_layoutChanging) { - emit q->rootIndexAdded(newIndex); + Q_EMIT q->rootIndexAdded(newIndex); } continue; } @@ -1953,7 +1953,7 @@ Q_ASSERT(newIndex.isValid()); m_rootIndexList.insert(rootListRow, newIndex); if (!m_resetting || m_layoutChanging) { - emit q->rootIndexAdded(newIndex); + Q_EMIT q->rootIndexAdded(newIndex); } int _start = 0; @@ -1979,7 +1979,7 @@ m_rootIndexList.insert(row, newIndex); if (!m_resetting || m_layoutChanging) { - emit q->rootIndexAdded(newIndex); + Q_EMIT q->rootIndexAdded(newIndex); } Q_ASSERT(m_rootIndexList.size() > row); updateInternalIndexes(QModelIndex(), row, 1); @@ -2061,7 +2061,7 @@ break; } } - emit filterBehaviorChanged(); + Q_EMIT filterBehaviorChanged(); d->resetInternalData(); if (d->m_selectionModel) { d->selectionChanged(d->m_selectionModel->selection(), QItemSelection()); @@ -2364,7 +2364,7 @@ } d->m_selectionModel = itemSelectionModel; - emit selectionModelChanged(); + Q_EMIT selectionModelChanged(); if (d->m_selectionModel) { connect(d->m_selectionModel, SIGNAL(selectionChanged(QItemSelection,QItemSelection)), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.70.0/tests/proxymodeltestapp/CMakeLists.txt new/kitemmodels-5.71.0/tests/proxymodeltestapp/CMakeLists.txt --- old/kitemmodels-5.70.0/tests/proxymodeltestapp/CMakeLists.txt 2020-05-02 23:58:45.000000000 +0200 +++ new/kitemmodels-5.71.0/tests/proxymodeltestapp/CMakeLists.txt 2020-06-06 21:35:01.000000000 +0200 @@ -9,7 +9,6 @@ selectionpmwidget.cpp # statesaverwidget.cpp kidentityproxymodelwidget.cpp - recursivefilterpmwidget.cpp descendantpmwidget.cpp kreparentingproxymodel.cpp proxymodeltestwidget.cpp @@ -18,6 +17,12 @@ modelcommanderwidget.cpp matchcheckingwidget.cpp ) +if(NOT EXCLUDE_DEPRECATED_BEFORE_AND_AT STREQUAL "CURRENT" AND + EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.65.0) + list(APPEND proxymodeltestapp_SRCS + recursivefilterpmwidget.cpp + ) +endif() find_package(Qt5Widgets ${REQUIRED_QT_VERSION} QUIET CONFIG) find_package(Qt5Script ${REQUIRED_QT_VERSION} QUIET CONFIG) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.70.0/tests/proxymodeltestapp/kreparentingproxymodel.cpp new/kitemmodels-5.71.0/tests/proxymodeltestapp/kreparentingproxymodel.cpp --- old/kitemmodels-5.70.0/tests/proxymodeltestapp/kreparentingproxymodel.cpp 2020-05-02 23:58:45.000000000 +0200 +++ new/kitemmodels-5.71.0/tests/proxymodeltestapp/kreparentingproxymodel.cpp 2020-06-06 21:35:01.000000000 +0200 @@ -1244,7 +1244,7 @@ // removal.end = i; // pendingRemovals.insert(proxyParent, removal); // -// emit q->rowsAboutToBeRemoved(proxyParent, start, i); +// Q_EMIT q->rowsAboutToBeRemoved(proxyParent, start, i); // proxyParent = affectedIndex.parent(); // // end -= (i - start + 1); @@ -1306,7 +1306,7 @@ m_pendingRemovalParents.remove(parent.internalId()); it.remove(); - emit q->endRemoveRows(); + Q_EMIT q->endRemoveRows(); } // qDebug() << "Remove done ##########"; @@ -1369,7 +1369,7 @@ return; #if 0 - emit q->layoutAboutToBeChanged(); + Q_EMIT q->layoutAboutToBeChanged(); Q_FOREACH (QPersistentModelIndex proxyPersistentIndex, q->persistentIndexList()) { m_proxyIndexes << proxyPersistentIndex; @@ -1392,7 +1392,7 @@ m_layoutChangePersistentIndexes.clear(); m_proxyIndexes.clear(); - emit q->layoutChanged(); + Q_EMIT q->layoutChanged(); #endif } @@ -1449,7 +1449,7 @@ proxySibling = getIndexBelow(proxySibling); } - emit q->dataChanged(startIndex, lastAffectedSibling); + Q_EMIT q->dataChanged(startIndex, lastAffectedSibling); if (numChanged < maxChanged) { emitDataChangedSignals(proxySibling, maxChanged - numChanged); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.70.0/tests/proxymodeltestapp/lessthanwidget.cpp new/kitemmodels-5.71.0/tests/proxymodeltestapp/lessthanwidget.cpp --- old/kitemmodels-5.70.0/tests/proxymodeltestapp/lessthanwidget.cpp 2020-05-02 23:58:45.000000000 +0200 +++ new/kitemmodels-5.71.0/tests/proxymodeltestapp/lessthanwidget.cpp 2020-06-06 21:35:01.000000000 +0200 @@ -31,7 +31,7 @@ const QModelIndex topLeft = index(0, 0, parent); const int _rowCount = rowCount(parent); const QModelIndex bottomRight = index(_rowCount - 1, columnCount(parent) - 1, parent); - emit dataChanged(topLeft, bottomRight); + Q_EMIT dataChanged(topLeft, bottomRight); static const int column = 0; QModelIndex idx; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.70.0/tests/proxymodeltestapp/mainwindow.cpp new/kitemmodels-5.71.0/tests/proxymodeltestapp/mainwindow.cpp --- old/kitemmodels-5.70.0/tests/proxymodeltestapp/mainwindow.cpp 2020-05-02 23:58:45.000000000 +0200 +++ new/kitemmodels-5.71.0/tests/proxymodeltestapp/mainwindow.cpp 2020-06-06 21:35:01.000000000 +0200 @@ -24,7 +24,9 @@ #ifdef QT_SCRIPT_LIB #include "reparentingpmwidget.h" #endif +#if KITEMMODELS_BUILD_DEPRECATED_SINCE(5, 65) #include "recursivefilterpmwidget.h" +#endif #include "lessthanwidget.h" #include "matchcheckingwidget.h" #include "kidentityproxymodelwidget.h" @@ -52,7 +54,9 @@ #ifdef QT_SCRIPT_LIB tabWidget->addTab(new ReparentingProxyModelWidget(), QStringLiteral("reparenting PM")); #endif +#if KITEMMODELS_BUILD_DEPRECATED_SINCE(5, 65) tabWidget->addTab(new RecursiveFilterProxyWidget(), QStringLiteral("Recursive Filter")); +#endif tabWidget->addTab(new LessThanWidget(), QStringLiteral("Less Than")); tabWidget->addTab(new ProxyModelTestWidget(), QStringLiteral("Proxy Model Test")); // tabWidget->addTab(new StateSaverWidget(), "State Saver Test");
