Hello community, here is the log from the commit of package kitemviews for openSUSE:Factory checked in at 2019-04-19 21:23:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemviews (Old) and /work/SRC/openSUSE:Factory/.kitemviews.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemviews" Fri Apr 19 21:23:17 2019 rev:65 rq:695234 version:5.57.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kitemviews/kitemviews.changes 2019-03-21 09:46:55.562888890 +0100 +++ /work/SRC/openSUSE:Factory/.kitemviews.new.5536/kitemviews.changes 2019-04-19 21:23:19.047792715 +0200 @@ -1,0 +2,10 @@ +Sun Apr 14 20:21:43 UTC 2019 - [email protected] + +- Update to 5.57.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.57.0.php +- Changes since 5.56.0: + * [kitemview] compile without foreach + +------------------------------------------------------------------- Old: ---- kitemviews-5.56.0.tar.xz New: ---- kitemviews-5.57.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemviews.spec ++++++ --- /var/tmp/diff_new_pack.MyyisE/_old 2019-04-19 21:23:20.547794625 +0200 +++ /var/tmp/diff_new_pack.MyyisE/_new 2019-04-19 21:23:20.579794666 +0200 @@ -17,14 +17,14 @@ %define lname libKF5ItemViews5 -%define _tar_path 5.56 +%define _tar_path 5.57 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kitemviews -Version: 5.56.0 +Version: 5.57.0 Release: 0 Summary: Set of item views extending the Qt model-view framework License: LGPL-2.1-or-later AND GPL-2.0-or-later ++++++ kitemviews-5.56.0.tar.xz -> kitemviews-5.57.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.56.0/.gitignore new/kitemviews-5.57.0/.gitignore --- old/kitemviews-5.56.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kitemviews-5.57.0/.gitignore 2019-04-07 09:29:49.000000000 +0200 @@ -0,0 +1,21 @@ +# Ignore the following files +*~ +*.[oa] +*.diff +*.kate-swp +*.kdev4 +.kdev_include_paths +*.kdevelop.pcs +*.moc +*.moc.cpp +*.orig +*.user +.*.swp +.swp.* +Doxyfile +Makefile +avail +random_seed +/build*/ +CMakeLists.txt.user* +*.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.56.0/CMakeLists.txt new/kitemviews-5.57.0/CMakeLists.txt --- old/kitemviews-5.56.0/CMakeLists.txt 2019-03-02 14:43:50.000000000 +0100 +++ new/kitemviews-5.57.0/CMakeLists.txt 2019-04-07 09:29:49.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.56.0") # handled by release scripts +set(KF5_VERSION "5.57.0") # handled by release scripts project(KItemViews VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.56.0 NO_MODULE) +find_package(ECM 5.57.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -36,7 +36,8 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ecm_install_po_files_as_qm(po) endif() - +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050c00) +add_definitions(-DQT_NO_FOREACH) add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(autotests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.56.0/po/en_GB/kitemviews5_qt.po new/kitemviews-5.57.0/po/en_GB/kitemviews5_qt.po --- old/kitemviews-5.56.0/po/en_GB/kitemviews5_qt.po 2019-03-02 14:43:50.000000000 +0100 +++ new/kitemviews-5.57.0/po/en_GB/kitemviews5_qt.po 2019-04-07 09:29:49.000000000 +0200 @@ -2,21 +2,22 @@ # Malcolm Hunter <[email protected]>, 2002,2003,2004, 2005, 2006, 2007, 2008, 2009. # Jonathan Riddell <[email protected]>, 2003. # Andrew Coles <[email protected]>, 2004, 2005, 2009, 2010. -# Steve Allewell <[email protected]>, 2014. +# Steve Allewell <[email protected]>, 2014, 2019. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2014-06-28 11:58+0100\n" +"PO-Revision-Date: 2019-03-24 19:15+0000\n" "Last-Translator: Steve Allewell <[email protected]>\n" -"Language-Team: British English <[email protected]>\n" +"Language-Team: British English <[email protected]>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" +"X-Generator: Lokalize 19.07.70\n" #: kfilterproxysearchline.cpp:73 msgctxt "KFilterProxySearchLine|" @@ -24,12 +25,9 @@ msgstr "Search" #: ktreewidgetsearchline.cpp:226 -#, fuzzy -#| msgctxt "KFilterProxySearchLine|" -#| msgid "Search" msgctxt "KTreeWidgetSearchLine|" msgid "Search..." -msgstr "Search" +msgstr "Search..." #: ktreewidgetsearchline.cpp:435 msgctxt "KTreeWidgetSearchLine|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.56.0/po/id/kitemviews5_qt.po new/kitemviews-5.57.0/po/id/kitemviews5_qt.po --- old/kitemviews-5.56.0/po/id/kitemviews5_qt.po 2019-03-02 14:43:50.000000000 +0100 +++ new/kitemviews-5.57.0/po/id/kitemviews5_qt.po 2019-04-07 09:29:49.000000000 +0200 @@ -16,7 +16,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 18.12.0\n" "X-Qt-Contexts: true\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.56.0/po/te/kitemviews5_qt.po new/kitemviews-5.57.0/po/te/kitemviews5_qt.po --- old/kitemviews-5.56.0/po/te/kitemviews5_qt.po 2019-03-02 14:43:50.000000000 +0100 +++ new/kitemviews-5.57.0/po/te/kitemviews5_qt.po 2019-04-07 09:29:49.000000000 +0200 @@ -22,8 +22,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.5\n" -"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : " -"4;\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "X-Qt-Contexts: true\n" #: kfilterproxysearchline.cpp:73 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.56.0/po/zh_CN/kitemviews5_qt.po new/kitemviews-5.57.0/po/zh_CN/kitemviews5_qt.po --- old/kitemviews-5.56.0/po/zh_CN/kitemviews5_qt.po 2019-03-02 14:43:50.000000000 +0100 +++ new/kitemviews-5.57.0/po/zh_CN/kitemviews5_qt.po 2019-04-07 09:29:49.000000000 +0200 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2019-02-20 23:16\n" +"PO-Revision-Date: 2019-03-07 09:22\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.56.0/src/kcategorizedview.cpp new/kitemviews-5.57.0/src/kcategorizedview.cpp --- old/kitemviews-5.56.0/src/kcategorizedview.cpp 2019-03-02 14:43:50.000000000 +0100 +++ new/kitemviews-5.57.0/src/kcategorizedview.cpp 2019-04-07 09:29:49.000000000 +0200 @@ -308,9 +308,9 @@ const QModelIndex firstAffectedCategory = blocks[category].firstIndex; //BEGIN: order for marking as alternate those blocks that are alternate QList<Block> blockList = blocks.values(); - qSort(blockList.begin(), blockList.end(), Block::lessThan); + std::sort(blockList.begin(), blockList.end(), Block::lessThan); QList<int> firstIndexesRows; - foreach (const Block &block, blockList) { + for (const Block &block : qAsConst(blockList)) { firstIndexesRows << block.firstIndex.row(); } //END: order for marking as alternate those blocks that are alternate @@ -1310,7 +1310,7 @@ } //END: update the items that are in quarantine in affected categories - Q_FOREACH (const QString &category, listOfCategoriesMarkedForRemoval) { + for (const QString &category : qAsConst(listOfCategoriesMarkedForRemoval)) { d->blocks.remove(category); } @@ -1318,9 +1318,9 @@ { //BEGIN: order for marking as alternate those blocks that are alternate QList<Private::Block> blockList = d->blocks.values(); - qSort(blockList.begin(), blockList.end(), Private::Block::lessThan); + std::sort(blockList.begin(), blockList.end(), Private::Block::lessThan); QList<int> firstIndexesRows; - foreach (const Private::Block &block, blockList) { + for (const Private::Block &block : qAsConst(blockList)) { firstIndexesRows << block.firstIndex.row(); } //END: order for marking as alternate those blocks that are alternate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.56.0/src/kextendableitemdelegate.cpp new/kitemviews-5.57.0/src/kextendableitemdelegate.cpp --- old/kitemviews-5.56.0/src/kextendableitemdelegate.cpp 2019-03-02 14:43:50.000000000 +0100 +++ new/kitemviews-5.57.0/src/kextendableitemdelegate.cpp 2019-04-07 09:29:49.000000000 +0200 @@ -149,7 +149,7 @@ //slot void KExtendableItemDelegate::Private::_k_verticalScroll() { - foreach (QWidget *extender, extenders) { + for (QWidget *extender : qAsConst(extenders)) { // Fast scrolling can lead to artifacts where extenders stay in the viewport // of the parent's scroll area even though their items are scrolled out. // Therefore we hide all extenders when scrolling. @@ -387,7 +387,7 @@ void KExtendableItemDelegate::Private::deleteExtenders() { - foreach (QWidget *ext, extenders) { + for (QWidget *ext : qAsConst(extenders)) { ext->hide(); ext->deleteLater(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.56.0/src/ktreewidgetsearchline.cpp new/kitemviews-5.57.0/src/ktreewidgetsearchline.cpp --- old/kitemviews-5.56.0/src/ktreewidgetsearchline.cpp 2019-03-02 14:43:50.000000000 +0100 +++ new/kitemviews-5.57.0/src/ktreewidgetsearchline.cpp 2019-04-07 09:29:49.000000000 +0200 @@ -84,7 +84,7 @@ } QTreeWidget *widget = nullptr; - foreach (QTreeWidget *tree, treeWidgets) + for (QTreeWidget *tree : qAsConst(treeWidgets)) if (tree->model() == model) { widget = tree; break; @@ -316,7 +316,7 @@ { d->search = pattern.isNull() ? text() : pattern; - foreach (QTreeWidget *treeWidget, d->treeWidgets) { + for (QTreeWidget *treeWidget : qAsConst(d->treeWidgets)) { updateSearch(treeWidget); } } @@ -378,13 +378,13 @@ void KTreeWidgetSearchLine::setTreeWidgets(const QList<QTreeWidget *> &treeWidgets) { - foreach (QTreeWidget *treeWidget, d->treeWidgets) { + for (QTreeWidget *treeWidget : qAsConst(d->treeWidgets)) { disconnectTreeWidget(treeWidget); } d->treeWidgets = treeWidgets; - foreach (QTreeWidget *treeWidget, d->treeWidgets) { + for (QTreeWidget *treeWidget : qAsConst(d->treeWidgets)) { connectTreeWidget(treeWidget); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.56.0/src/kwidgetitemdelegate.cpp new/kitemviews-5.57.0/src/kwidgetitemdelegate.cpp --- old/kitemviews-5.56.0/src/kwidgetitemdelegate.cpp 2019-03-02 14:43:50.000000000 +0100 +++ new/kitemviews-5.57.0/src/kwidgetitemdelegate.cpp 2019-04-07 09:29:49.000000000 +0200 @@ -93,7 +93,8 @@ void KWidgetItemDelegatePrivate::_k_slotLayoutChanged() { - foreach (QWidget *widget, widgetPool->invalidIndexesWidgets()) { + const auto lst = widgetPool->invalidIndexesWidgets(); + for (QWidget *widget : lst) { widget->setVisible(false); } QTimer::singleShot(0, this, SLOT(initializeModel())); @@ -107,10 +108,12 @@ void KWidgetItemDelegatePrivate::_k_slotSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected) { - foreach (const QModelIndex &index, selected.indexes()) { + const auto lstSelected = selected.indexes(); + for (const QModelIndex &index : lstSelected) { widgetPool->findWidgets(index, optionView(index)); } - foreach (const QModelIndex &index, deselected.indexes()) { + const auto lstDeselected = deselected.indexes(); + for (const QModelIndex &index : lstDeselected) { widgetPool->findWidgets(index, optionView(index)); } } @@ -121,11 +124,11 @@ while (i <= end) { for (int j = 0; j < model->columnCount(parent); ++j) { const QModelIndex index = model->index(i, j, parent); - QList<QWidget *> widgetList = widgetPool->findWidgets(index, optionView(index), isRemoving ? KWidgetItemDelegatePool::NotUpdateWidgets + const QList<QWidget *> widgetList = widgetPool->findWidgets(index, optionView(index), isRemoving ? KWidgetItemDelegatePool::NotUpdateWidgets : KWidgetItemDelegatePool::UpdateWidgets); if (isRemoving) { widgetPool->d->allocatedWidgets.removeAll(widgetList); - foreach (QWidget *widget, widgetList) { + for (QWidget *widget : widgetList) { const QModelIndex idx = widgetPool->d->widgetInIndex[widget]; widgetPool->d->usedWidgets.remove(idx); widgetPool->d->widgetInIndex.remove(widget); @@ -275,7 +278,8 @@ case QEvent::FocusIn: case QEvent::FocusOut: if (qobject_cast<QAbstractItemView *>(watched)) { - foreach (const QModelIndex &index, selectionModel->selectedIndexes()) { + const auto lst = selectionModel->selectedIndexes(); + for (const QModelIndex &index : lst) { if (index.isValid()) { widgetPool->findWidgets(index, optionView(index)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.56.0/src/kwidgetitemdelegatepool.cpp new/kitemviews-5.57.0/src/kwidgetitemdelegatepool.cpp --- old/kitemviews-5.56.0/src/kwidgetitemdelegatepool.cpp 2019-03-02 14:43:50.000000000 +0100 +++ new/kitemviews-5.57.0/src/kwidgetitemdelegatepool.cpp 2019-04-07 09:29:49.000000000 +0200 @@ -106,7 +106,7 @@ result = d->delegate->createItemWidgets(index); d->allocatedWidgets << result; d->usedWidgets[index] = result; - foreach (QWidget *widget, result) { + for (QWidget *widget : qAsConst(result)) { d->widgetInIndex[widget] = index; widget->setParent(d->delegate->d->itemView->viewport()); widget->installEventFilter(d->eventListener); @@ -115,13 +115,13 @@ } if (updateWidgets == UpdateWidgets) { - foreach (QWidget *widget, result) { + for (QWidget *widget : qAsConst(result)) { widget->setVisible(true); } d->delegate->updateItemWidgets(result, option, idx); - foreach (QWidget *widget, result) { + for (QWidget *widget : qAsConst(result)) { widget->move(widget->x() + option.rect.left(), widget->y() + option.rect.top()); } } @@ -132,16 +132,18 @@ QList<QWidget *> KWidgetItemDelegatePool::invalidIndexesWidgets() const { QList<QWidget *> result; - foreach (QWidget *widget, d->widgetInIndex.keys()) { + QHashIterator<QWidget *, QPersistentModelIndex> i(d->widgetInIndex); + while (i.hasNext()) { + i.next(); const QAbstractProxyModel *proxyModel = qobject_cast<const QAbstractProxyModel *>(d->delegate->d->model); QModelIndex index; if (proxyModel) { - index = proxyModel->mapFromSource(d->widgetInIndex[widget]); + index = proxyModel->mapFromSource(i.value()); } else { - index = d->widgetInIndex[widget]; + index = i.value(); } if (!index.isValid()) { - result << widget; + result << i.key(); } } return result; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.56.0/tests/kwidgetitemdelegatetest.cpp new/kitemviews-5.57.0/tests/kwidgetitemdelegatetest.cpp --- old/kitemviews-5.56.0/tests/kwidgetitemdelegatetest.cpp 2019-03-02 14:43:50.000000000 +0100 +++ new/kitemviews-5.57.0/tests/kwidgetitemdelegatetest.cpp 2019-04-07 09:29:49.000000000 +0200 @@ -242,9 +242,17 @@ toolButtonOpt.toolButtonStyle = Qt::ToolButtonTextBesideIcon; toolButtonOpt.text = "Install"; +#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) int widthInstall = QApplication::style()->sizeFromContents(QStyle::CT_ToolButton, &toolButtonOpt, QSize(option.fontMetrics.width(QStringLiteral("Install")) + HARDCODED_BORDER * 3, option.fontMetrics.height()), toolButton).width(); +#else + int widthInstall = QApplication::style()->sizeFromContents(QStyle::CT_ToolButton, &toolButtonOpt, QSize(option.fontMetrics.horizontalAdvance(QStringLiteral("Install")) + HARDCODED_BORDER * 3, option.fontMetrics.height()), toolButton).width(); +#endif toolButtonOpt.text = "Uninstall"; +#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) int widthUninstall = QApplication::style()->sizeFromContents(QStyle::CT_ToolButton, &toolButtonOpt, QSize(option.fontMetrics.width(QStringLiteral("Uninstall")) + HARDCODED_BORDER * 3, option.fontMetrics.height()), toolButton).width(); +#else + int widthUninstall = QApplication::style()->sizeFromContents(QStyle::CT_ToolButton, &toolButtonOpt, QSize(option.fontMetrics.horizontalAdvance(QStringLiteral("Uninstall")) + HARDCODED_BORDER * 3, option.fontMetrics.height()), toolButton).width(); +#endif QSize size = toolButton->sizeHint(); size.setWidth(qMax(widthInstall, widthUninstall));
