Hello community, here is the log from the commit of package kplotting for openSUSE:Factory checked in at 2020-05-11 13:29:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kplotting (Old) and /work/SRC/openSUSE:Factory/.kplotting.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kplotting" Mon May 11 13:29:31 2020 rev:78 rq:802108 version:5.70.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kplotting/kplotting.changes 2020-04-15 20:04:12.278010549 +0200 +++ /work/SRC/openSUSE:Factory/.kplotting.new.2738/kplotting.changes 2020-05-11 13:31:38.511896063 +0200 @@ -1,0 +2,11 @@ +Sun May 3 09:40:09 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.70.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.70.0 +- Changes since 5.69.0: + * [KPlotting] foreach is gone, build with -DQT_NO_FOREACH + * [KPlotting] Port foreach (deprecated) to range for + +------------------------------------------------------------------- Old: ---- kplotting-5.69.0.tar.xz kplotting-5.69.0.tar.xz.sig New: ---- kplotting-5.70.0.tar.xz kplotting-5.70.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kplotting.spec ++++++ --- /var/tmp/diff_new_pack.CwaIlv/_old 2020-05-11 13:31:40.127899450 +0200 +++ /var/tmp/diff_new_pack.CwaIlv/_new 2020-05-11 13:31:40.127899450 +0200 @@ -17,7 +17,7 @@ %define lname libKF5Plotting5 -%define _tar_path 5.69 +%define _tar_path 5.70 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without lang Name: kplotting -Version: 5.69.0 +Version: 5.70.0 Release: 0 Summary: KDE Data plotting library License: LGPL-2.1-or-later ++++++ kplotting-5.69.0.tar.xz -> kplotting-5.70.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kplotting-5.69.0/CMakeLists.txt new/kplotting-5.70.0/CMakeLists.txt --- old/kplotting-5.69.0/CMakeLists.txt 2020-04-05 00:37:02.000000000 +0200 +++ new/kplotting-5.70.0/CMakeLists.txt 2020-05-03 00:00:01.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.69.0") # handled by release scripts +set(KF5_VERSION "5.70.0") # handled by release scripts project(KPlotting VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.69.0 NO_MODULE) +find_package(ECM 5.70.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) @@ -36,6 +36,7 @@ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5PlottingConfigVersion.cmake" SOVERSION 5) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) +add_definitions(-DQT_NO_FOREACH) add_subdirectory(src) add_subdirectory(examples) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kplotting-5.69.0/src/kplotobject.cpp new/kplotting-5.70.0/src/kplotobject.cpp --- old/kplotting-5.69.0/src/kplotobject.cpp 2020-04-05 00:37:02.000000000 +0200 +++ new/kplotting-5.70.0/src/kplotobject.cpp 2020-05-03 00:00:01.000000000 +0200 @@ -248,7 +248,7 @@ QPointF Previous = QPointF(); //Initialize to null - Q_FOREACH (KPlotPoint *pp, d->pList) { + for (const KPlotPoint *pp : qAsConst(d->pList)) { //q is the position of the point in screen pixel coordinates QPointF q = pw->mapToWidget(pp->position()); @@ -264,7 +264,7 @@ //Draw points: if (d->type & Points) { - Q_FOREACH (KPlotPoint *pp, d->pList) { + for (const KPlotPoint *pp : qAsConst(d->pList)) { //q is the position of the point in screen pixel coordinates QPointF q = pw->mapToWidget(pp->position()); if (pw->pixRect().contains(q.toPoint(), false)) { @@ -358,7 +358,7 @@ //Draw labels painter->setPen(labelPen()); - Q_FOREACH (KPlotPoint *pp, d->pList) { + for (KPlotPoint *pp : qAsConst(d->pList)) { QPoint q = pw->mapToWidget(pp->position()).toPoint(); if (pw->pixRect().contains(q, false) && ! pp->label().isEmpty()) { pw->placeLabel(painter, pp); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kplotting-5.69.0/src/kplotwidget.cpp new/kplotting-5.70.0/src/kplotwidget.cpp --- old/kplotting-5.69.0/src/kplotwidget.cpp 2020-04-05 00:37:02.000000000 +0200 +++ new/kplotting-5.70.0/src/kplotwidget.cpp 2020-05-03 00:00:01.000000000 +0200 @@ -225,7 +225,7 @@ void KPlotWidget::addPlotObjects(const QList< KPlotObject * > &objects) { bool addedsome = false; - Q_FOREACH (KPlotObject *o, objects) { + for (KPlotObject *o : objects) { if (!o) { continue; } @@ -389,8 +389,9 @@ QList<KPlotPoint *> KPlotWidget::pointsUnderPoint(const QPoint &p) const { QList<KPlotPoint *> pts; - Q_FOREACH (KPlotObject *po, d->objectList) { - Q_FOREACH (KPlotPoint *pp, po->points()) { + for (const KPlotObject *po : qAsConst(d->objectList)) { + const auto pointsList = po->points(); + for (KPlotPoint *pp : pointsList) { if ((p - mapToWidget(pp->position()).toPoint()).manhattanLength() <= 4) { pts << pp; } @@ -720,7 +721,7 @@ resetPlotMask(); - Q_FOREACH (KPlotObject *po, d->objectList) { + for (KPlotObject *po : qAsConst(d->objectList)) { po->draw(&p, this); } @@ -740,12 +741,14 @@ //Grid lines are placed at locations of primary axes' major tickmarks //vertical grid lines - Q_FOREACH (double xx, axis(BottomAxis)->majorTickMarks()) { + const QList<double> majMarks = axis(BottomAxis)->majorTickMarks(); + for (const double xx : majMarks) { double px = d->pixRect.width() * (xx - d->dataRect.x()) / d->dataRect.width(); p->drawLine(QPointF(px, 0.0), QPointF(px, double(d->pixRect.height()))); } //horizontal grid lines - Q_FOREACH (double yy, axis(LeftAxis)->majorTickMarks()) { + const QList<double> leftTickMarks = axis(LeftAxis)->majorTickMarks(); + for (const double yy : leftTickMarks) { double py = d->pixRect.height() * (1.0 - (yy - d->dataRect.y()) / d->dataRect.height()); p->drawLine(QPointF(0.0, py), QPointF(double(d->pixRect.width()), py)); } @@ -767,7 +770,8 @@ p->drawLine(0, d->pixRect.height(), d->pixRect.width(), d->pixRect.height()); // Draw major tickmarks - Q_FOREACH (double xx, a->majorTickMarks()) { + const QList<double> majMarks = a->majorTickMarks(); + for (const double xx : majMarks) { double px = d->pixRect.width() * (xx - d->dataRect.x()) / d->dataRect.width(); if (px > 0 && px < d->pixRect.width()) { p->drawLine(QPointF(px, double(d->pixRect.height() - TICKOFFSET)), @@ -782,7 +786,8 @@ } // Draw minor tickmarks - Q_FOREACH (double xx, a->minorTickMarks()) { + const QList<double> minTickMarks = a->minorTickMarks(); + for (const double xx : minTickMarks) { double px = d->pixRect.width() * (xx - d->dataRect.x()) / d->dataRect.width(); if (px > 0 && px < d->pixRect.width()) { p->drawLine(QPointF(px, double(d->pixRect.height() - TICKOFFSET)), @@ -804,7 +809,8 @@ p->drawLine(0, 0, 0, d->pixRect.height()); // Draw major tickmarks - Q_FOREACH (double yy, a->majorTickMarks()) { + const QList<double> majMarks = a->majorTickMarks(); + for (const double yy : majMarks) { double py = d->pixRect.height() * (1.0 - (yy - d->dataRect.y()) / d->dataRect.height()); if (py > 0 && py < d->pixRect.height()) { p->drawLine(QPointF(TICKOFFSET, py), QPointF(double(TICKOFFSET + BIGTICKSIZE), py)); @@ -818,7 +824,8 @@ } // Draw minor tickmarks - Q_FOREACH (double yy, a->minorTickMarks()) { + const QList<double> minTickMarks = a->minorTickMarks(); + for (const double yy : minTickMarks ) { double py = d->pixRect.height() * (1.0 - (yy - d->dataRect.y()) / d->dataRect.height()); if (py > 0 && py < d->pixRect.height()) { p->drawLine(QPointF(TICKOFFSET, py), QPointF(double(TICKOFFSET + SMALLTICKSIZE), py)); @@ -860,7 +867,8 @@ p->drawLine(0, 0, d->pixRect.width(), 0); // Draw major tickmarks - Q_FOREACH (double xx, a->majorTickMarks()) { + const QList<double> majMarks = a->majorTickMarks(); + for (const double xx : majMarks) { double px = d->pixRect.width() * (xx - x0) / dw; if (px > 0 && px < d->pixRect.width()) { p->drawLine(QPointF(px, TICKOFFSET), QPointF(px, double(BIGTICKSIZE + TICKOFFSET))); @@ -874,7 +882,8 @@ } // Draw minor tickmarks - Q_FOREACH (double xx, a->minorTickMarks()) { + const QList<double> minMarks = a->minorTickMarks(); + for (const double xx : minMarks) { double px = d->pixRect.width() * (xx - x0) / dw; if (px > 0 && px < d->pixRect.width()) { p->drawLine(QPointF(px, TICKOFFSET), QPointF(px, double(SMALLTICKSIZE + TICKOFFSET))); @@ -895,7 +904,8 @@ p->drawLine(d->pixRect.width(), 0, d->pixRect.width(), d->pixRect.height()); // Draw major tickmarks - Q_FOREACH (double yy, a->majorTickMarks()) { + const QList<double> majMarks = a->majorTickMarks(); + for (const double yy : majMarks) { double py = d->pixRect.height() * (1.0 - (yy - y0) / dh); if (py > 0 && py < d->pixRect.height()) { p->drawLine(QPointF(double(d->pixRect.width() - TICKOFFSET), py), @@ -910,7 +920,8 @@ } // Draw minor tickmarks - Q_FOREACH (double yy, a->minorTickMarks()) { + const QList<double> minMarks = a->minorTickMarks(); + for (const double yy : minMarks) { double py = d->pixRect.height() * (1.0 - (yy - y0) / dh); if (py > 0 && py < d->pixRect.height()) { p->drawLine(QPointF(double(d->pixRect.width() - 0.0), py),
