Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kquickcharts for openSUSE:Factory checked in at 2021-04-12 12:34:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kquickcharts (Old) and /work/SRC/openSUSE:Factory/.kquickcharts.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kquickcharts" Mon Apr 12 12:34:42 2021 rev:17 rq:884283 version:5.81.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kquickcharts/kquickcharts.changes 2021-03-16 15:42:20.924839793 +0100 +++ /work/SRC/openSUSE:Factory/.kquickcharts.new.2401/kquickcharts.changes 2021-04-12 12:36:46.473328113 +0200 @@ -1,0 +2,12 @@ +Mon Apr 5 07:12:44 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.81.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.81.0 +- Changes since 5.80.0: + * Run clang-format + * Remove custom clang-format file + * Add clang-format pre-commit hook + +------------------------------------------------------------------- Old: ---- kquickcharts-5.80.0.tar.xz kquickcharts-5.80.0.tar.xz.sig New: ---- kquickcharts-5.81.0.tar.xz kquickcharts-5.81.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kquickcharts.spec ++++++ --- /var/tmp/diff_new_pack.AvPkHj/_old 2021-04-12 12:36:47.129328875 +0200 +++ /var/tmp/diff_new_pack.AvPkHj/_new 2021-04-12 12:36:47.133328880 +0200 @@ -16,14 +16,14 @@ # -%define _tar_path 5.80 +%define _tar_path 5.81 # 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: kquickcharts -Version: 5.80.0 +Version: 5.81.0 Release: 0 Summary: Set of charts for QtQuick applications License: LGPL-2.1-or-later ++++++ kquickcharts-5.80.0.tar.xz -> kquickcharts-5.81.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/.clang-format new/kquickcharts-5.81.0/.clang-format --- old/kquickcharts-5.80.0/.clang-format 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/.clang-format 1970-01-01 01:00:00.000000000 +0100 @@ -1,65 +0,0 @@ ---- -BasedOnStyle: WebKit - -Language: Cpp -Standard: Cpp11 - -# Align pointer to the right. -PointerAlignment: Right - -# As a base rule, the left curly brace goes on the same line as the start of the -# statement, except function implementations, classes, structs, and namespace -# declarations. -BreakBeforeBraces: Custom -BraceWrapping: - AfterClass: true - AfterControlStatement: false - AfterEnum: false - AfterFunction: true - AfterNamespace: true - AfterObjCDeclaration: false - AfterStruct: true - AfterUnion: false - AfterExternBlock: false - BeforeCatch: false - BeforeElse: false - IndentBraces: false - SplitEmptyFunction: true - SplitEmptyRecord: true - SplitEmptyNamespace: true - -# Macros that should be interpreted as foreach loops instead of as function calls. -ForEachMacros: - - foreach - - Q_FOREACH - - BOOST_FOREACH - - forever - - Q_FOREVER - - QBENCHMARK - - QBENCHMARK_ONCE - -# Each include section has to be sorted. -SortIncludes: true - -# Case labels are on the same column as the switch. -IndentCaseLabels: false - -# Don't indent in namespaces. -NamespaceIndentation: None - -# The maximum number of consecutive empty lines to keep. -MaxEmptyLinesToKeep: 1 - -# Break before operators that aren???t assignments. -BreakBeforeBinaryOperators: NonAssignment - -# Treat C++11 braced initialization like all other initialization -Cpp11BracedListStyle: true -SpaceBeforeCpp11BracedList: false - -BreakConstructorInitializers: BeforeComma - -AlignAfterOpenBracket: AlwaysBreak -BinPackArguments: false -ColumnLimit: 150 -AllowShortFunctionsOnASingleLine: None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/.gitignore new/kquickcharts-5.81.0/.gitignore --- old/kquickcharts-5.80.0/.gitignore 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/.gitignore 2021-04-03 11:36:40.000000000 +0200 @@ -1,3 +1,6 @@ *kdev* *.kate-swp /compile_commands.json +/.clang-format +.idea +/build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/CMakeLists.txt new/kquickcharts-5.81.0/CMakeLists.txt --- old/kquickcharts-5.80.0/CMakeLists.txt 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/CMakeLists.txt 2021-04-03 11:36:40.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(KF_VERSION "5.80.0") # handled by release scripts -set(KF_DEP_VERSION "5.80.0") # handled by release scripts +set(KF_VERSION "5.81.0") # handled by release scripts +set(KF_DEP_VERSION "5.81.0") # handled by release scripts project(KQuickCharts VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.80.0 NO_MODULE) +find_package(ECM 5.81.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) @@ -15,6 +15,7 @@ include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) +include(KDEGitCommitHooks) include(ECMGenerateExportHeader) @@ -71,3 +72,5 @@ ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) + +kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/autotests/ArraySourceTest.cpp new/kquickcharts-5.81.0/autotests/ArraySourceTest.cpp --- old/kquickcharts-5.80.0/autotests/ArraySourceTest.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/autotests/ArraySourceTest.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -1,7 +1,7 @@ /* * This file is part of KQuickCharts * SPDX-FileCopyrightText: 2019 Arjen Hiemstra <ahiems...@heimr.nl> - * + * * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ @@ -95,7 +95,6 @@ } }; - QTEST_GUILESS_MAIN(ArraySourceTest) #include "ArraySourceTest.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/autotests/HistoryProxySourceTest.cpp new/kquickcharts-5.81.0/autotests/HistoryProxySourceTest.cpp --- old/kquickcharts-5.80.0/autotests/HistoryProxySourceTest.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/autotests/HistoryProxySourceTest.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -7,8 +7,8 @@ #include <QTest> #include "datasource/HistoryProxySource.h" -#include "datasource/SingleValueSource.h" #include "datasource/ModelSource.h" +#include "datasource/SingleValueSource.h" #define qs QStringLiteral @@ -19,7 +19,8 @@ Q_PROPERTY(int maximum READ maximum NOTIFY maximumChanged) public: - TestModel(QObject *parent = nullptr) : QAbstractListModel(parent) + TestModel(QObject *parent = nullptr) + : QAbstractListModel(parent) { m_items.fill(1, 10); } @@ -171,7 +172,8 @@ } } - void testWithModel() { + void testWithModel() + { auto model = std::make_unique<TestModel>(); auto modelSource = std::make_unique<ModelSource>(); modelSource->setModel(model.get()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/autotests/MapProxySourceTest.cpp new/kquickcharts-5.81.0/autotests/MapProxySourceTest.cpp --- old/kquickcharts-5.80.0/autotests/MapProxySourceTest.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/autotests/MapProxySourceTest.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -37,6 +37,7 @@ QTest::addColumn<QVariant>("minimum"); QTest::addColumn<QVariant>("maximum"); + // clang-format off QTest::newRow("basic mapping") << QVariantList{qs("one"), qs("two"), qs("three"), qs("four")} << QVariantMap{{qs("one"), 4}, {qs("two"), 3}, {qs("three"), 2}, {qs("four"), 1}} @@ -50,6 +51,7 @@ << QVariantList{QColor{Qt::red}, QColor{Qt::green}, QColor{Qt::blue}, QColor{Qt::red}, QColor{Qt::green}, QColor{Qt::blue}} << QVariant{QColor{Qt::blue}} << QVariant{QColor{Qt::red}}; + // clang-format on } void testWithArray() @@ -79,11 +81,8 @@ QFETCH(QVariant, maximum); QCOMPARE(mapSource->maximum(), maximum); } - }; - QTEST_GUILESS_MAIN(MapProxySourceTest) #include "MapProxySourceTest.moc" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/BarChart.cpp new/kquickcharts-5.81.0/src/BarChart.cpp --- old/kquickcharts-5.80.0/src/BarChart.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/BarChart.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -10,9 +10,9 @@ #include <QDebug> #include <QSGNode> +#include "RangeGroup.h" #include "datasource/ChartDataSource.h" #include "scenegraph/BarChartNode.h" -#include "RangeGroup.h" BarChart::BarChart(QQuickItem *parent) : XYChart(parent) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/Chart.cpp new/kquickcharts-5.81.0/src/Chart.cpp --- old/kquickcharts-5.80.0/src/Chart.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/Chart.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -127,7 +127,6 @@ Q_EMIT indexingModeChanged(); } - void Chart::componentComplete() { QQuickItem::componentComplete(); @@ -153,7 +152,9 @@ void Chart::clearSources(Chart::DataSourcesProperty *list) { auto chart = reinterpret_cast<Chart *>(list->data); - std::for_each(chart->m_valueSources.cbegin(), chart->m_valueSources.cend(), [chart](ChartDataSource *source) { source->disconnect(chart); }); + std::for_each(chart->m_valueSources.cbegin(), chart->m_valueSources.cend(), [chart](ChartDataSource *source) { + source->disconnect(chart); + }); chart->m_valueSources.clear(); chart->onDataChanged(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/ChartsPlugin.cpp new/kquickcharts-5.81.0/src/ChartsPlugin.cpp --- old/kquickcharts-5.80.0/src/ChartsPlugin.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/ChartsPlugin.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -21,12 +21,12 @@ #include "datasource/ArraySource.h" #include "datasource/ChartAxisSource.h" #include "datasource/ColorGradientSource.h" +#include "datasource/HistoryProxySource.h" +#include "datasource/MapProxySource.h" #include "datasource/ModelHistorySource.h" #include "datasource/ModelSource.h" #include "datasource/SingleValueSource.h" #include "datasource/ValueHistorySource.h" -#include "datasource/MapProxySource.h" -#include "datasource/HistoryProxySource.h" #include "quickcharts_export.h" @@ -61,10 +61,8 @@ qmlRegisterType<ModelHistorySource>(uri, 1, 0, "ModelHistorySource"); qmlRegisterType<ValueHistorySource>(uri, 1, 0, "ValueHistorySource"); #else - qmlRegisterTypeNotAvailable(uri, 1, 0, "ModelHistorySource", - QStringLiteral("ModelHistorySource is deprecated, use HistoryProxySource instead")); - qmlRegisterTypeNotAvailable(uri, 1, 0, "ValueHistorySource", - QStringLiteral("ValueHistorySource is deprecated, use HistoryProxySource instead")); + qmlRegisterTypeNotAvailable(uri, 1, 0, "ModelHistorySource", QStringLiteral("ModelHistorySource is deprecated, use HistoryProxySource instead")); + qmlRegisterTypeNotAvailable(uri, 1, 0, "ValueHistorySource", QStringLiteral("ValueHistorySource is deprecated, use HistoryProxySource instead")); #endif qmlRegisterUncreatableType<RangeGroup>(uri, 1, 0, "Range", QStringLiteral("Used as a grouped property")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/LineChart.cpp new/kquickcharts-5.81.0/src/LineChart.cpp --- old/kquickcharts-5.80.0/src/LineChart.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/LineChart.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -31,7 +31,7 @@ return result; } -LineChartAttached::LineChartAttached(QObject* parent) +LineChartAttached::LineChartAttached(QObject *parent) : QObject(parent) { } @@ -41,7 +41,7 @@ return m_value; } -void LineChartAttached::setValue(const QVariant& value) +void LineChartAttached::setValue(const QVariant &value) { if (value == m_value) { return; @@ -56,7 +56,7 @@ return m_color; } -void LineChartAttached::setColor(const QColor& color) +void LineChartAttached::setColor(const QColor &color) { if (color == m_color) { return; @@ -71,7 +71,7 @@ return m_name; } -void LineChartAttached::setName(const QString & newName) +void LineChartAttached::setName(const QString &newName) { if (newName == m_name) { return; @@ -90,7 +90,7 @@ } } -void LineChartAttached::setShortName(const QString & newShortName) +void LineChartAttached::setShortName(const QString &newShortName) { if (newShortName == m_shortName) { return; @@ -100,7 +100,6 @@ Q_EMIT shortNameChanged(); } - LineChart::LineChart(QQuickItem *parent) : XYChart(parent) { @@ -212,8 +211,7 @@ value = (valueSource->item(i).toFloat() - range.startY) / range.distanceY; } - auto result = QVector2D{direction() == Direction::ZeroAtStart ? i * stepSize - : float(boundingRect().right()) - i * stepSize, value}; + auto result = QVector2D{direction() == Direction::ZeroAtStart ? i * stepSize : float(boundingRect().right()) - i * stepSize, value}; i++; return result; }; @@ -227,7 +225,7 @@ if (stacked() && !previousValues.isEmpty()) { if (values.size() != previousValues.size()) { qWarning() << "Value source" << valueSource->objectName() - << "has a different number of elements from the previuous source. Ignoring stacking for this source."; + << "has a different number of elements from the previuous source. Ignoring stacking for this source."; } else { std::for_each(values.begin(), values.end(), [previousValues, i = 0](QVector2D &point) mutable { point.setY(point.y() + previousValues.at(i++).y()); @@ -237,7 +235,7 @@ previousValues = values; if (m_pointDelegate) { - auto& delegates = m_pointDelegates[valueSource]; + auto &delegates = m_pointDelegates[valueSource]; if (delegates.size() != values.size()) { qDeleteAll(delegates); createPointDelegates(values, i); @@ -304,7 +302,7 @@ polish(); } -void LineChart::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry) +void LineChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { XYChart::geometryChanged(newGeometry, oldGeometry); @@ -366,9 +364,9 @@ { auto valueSource = valueSources().at(sourceIndex); - QVector<QQuickItem*> delegates; + QVector<QQuickItem *> delegates; for (int i = 0; i < values.size(); ++i) { - auto delegate = qobject_cast<QQuickItem*>(m_pointDelegate->beginCreate(qmlContext(m_pointDelegate))); + auto delegate = qobject_cast<QQuickItem *>(m_pointDelegate->beginCreate(qmlContext(m_pointDelegate))); if (!delegate) { qWarning() << "Delegate creation for point" << i << "of value source" << valueSource->objectName() << "failed, make sure pointDelegate is a QQuickItem"; @@ -392,7 +390,7 @@ auto pos = QPointF{position.x() - delegate->width() / 2, (1.0 - position.y()) * height() - delegate->height() / 2}; delegate->setPosition(pos); - auto attached = static_cast<LineChartAttached*>(qmlAttachedPropertiesObject<LineChart>(delegate, true)); + auto attached = static_cast<LineChartAttached *>(qmlAttachedPropertiesObject<LineChart>(delegate, true)); attached->setValue(value); attached->setColor(colorSource() ? colorSource()->item(sourceIndex).value<QColor>() : Qt::black); attached->setName(nameSource() ? nameSource()->item(sourceIndex).toString() : QString{}); @@ -443,15 +441,11 @@ controlPoint.first = solved[i]; if (i < count - 1) { - controlPoint.second = QPointF{ - 2.0 * points.at(i + 1).x() - solved.at(i + 1).x(), - 2.0 * points.at(i + 1).y() * height - solved.at(i + 1).y() - }; + controlPoint.second = QPointF{2.0 * points.at(i + 1).x() - solved.at(i + 1).x(), // + 2.0 * points.at(i + 1).y() * height - solved.at(i + 1).y()}; } else { - controlPoint.second = QPointF{ - (last.x() + solved.at(count - 1).x()) / 2.0, - (last.y() + solved.at(count - 1).y()) / 2.0 - }; + controlPoint.second = QPointF{(last.x() + solved.at(count - 1).x()) / 2.0, // + (last.y() + solved.at(count - 1).y()) / 2.0}; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/LineChart.h new/kquickcharts-5.81.0/src/LineChart.h --- old/kquickcharts-5.80.0/src/LineChart.h 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/LineChart.h 2021-04-03 11:36:40.000000000 +0200 @@ -55,7 +55,7 @@ Q_SIGNAL void nameChanged(); QString shortName() const; - void setShortName(const QString & newShortName); + void setShortName(const QString &newShortName); Q_SIGNAL void shortNameChanged(); private: @@ -158,9 +158,9 @@ qreal m_fillOpacity = 0.0; bool m_rangeInvalid = true; ChartDataSource *m_fillColorSource = nullptr; - QHash<ChartDataSource*, QVector<QVector2D>> m_values; + QHash<ChartDataSource *, QVector<QVector2D>> m_values; QQmlComponent *m_pointDelegate = nullptr; - QHash<ChartDataSource*, QVector<QQuickItem*>> m_pointDelegates; + QHash<ChartDataSource *, QVector<QQuickItem *>> m_pointDelegates; }; QML_DECLARE_TYPEINFO(LineChart, QML_HAS_ATTACHED_PROPERTIES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/PieChart.cpp new/kquickcharts-5.81.0/src/PieChart.cpp --- old/kquickcharts-5.80.0/src/PieChart.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/PieChart.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -196,7 +196,7 @@ return; } - auto maximum = [](ChartDataSource* source) { + auto maximum = [](ChartDataSource *source) { qreal result = 0.0; for (int i = 0; i < source->itemCount(); ++i) { result += source->item(i).toDouble(); @@ -206,9 +206,10 @@ auto indexMode = indexingMode(); auto colorIndex = 0; - auto range = m_range->calculateRange(valueSources(), - [](ChartDataSource*) { return 0.0; }, - maximum); + auto calculateZeroRange = [](ChartDataSource *) { + return 0.0; + }; + auto range = m_range->calculateRange(valueSources(), calculateZeroRange, maximum); for (auto source : sources) { qreal threshold = range.start; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/QmlDeprecated.h new/kquickcharts-5.81.0/src/QmlDeprecated.h --- old/kquickcharts-5.80.0/src/QmlDeprecated.h 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/QmlDeprecated.h 2021-04-03 11:36:40.000000000 +0200 @@ -9,8 +9,8 @@ #include "charts_deprecated_logging.h" -#include <QQmlEngine> #include <QQmlContext> +#include <QQmlEngine> /** * Tiny helper macro to mark a QML item as deprecated. @@ -24,11 +24,13 @@ * \param since The version since when the deprecation happened. * \param message An extra message to display, like which item to use instead. */ +// clang-format off #define QML_DEPRECATED(item, since, message) \ QMetaObject::invokeMethod(this, [this]() {\ qCWarning(DEPRECATED) << item << "is deprecated (since" << since << "):" << message;\ QString elidedName = QStringLiteral("...") % qmlContext(this)->baseUrl().toString().right(80);\ qCWarning(DEPRECATED) << "Note: Instantiated from" << elidedName;\ }, Qt::QueuedConnection); +// clang-format on #endif // DEPRECATED_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/RangeGroup.cpp new/kquickcharts-5.81.0/src/RangeGroup.cpp --- old/kquickcharts-5.80.0/src/RangeGroup.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/RangeGroup.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -107,8 +107,8 @@ } RangeGroup::RangeResult RangeGroup::calculateRange(const QVector<ChartDataSource *> &sources, - std::function<qreal(ChartDataSource*)> minimumCallback, - std::function<qreal(ChartDataSource*)> maximumCallback) + std::function<qreal(ChartDataSource *)> minimumCallback, + std::function<qreal(ChartDataSource *)> maximumCallback) { RangeResult result; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/RangeGroup.h new/kquickcharts-5.81.0/src/RangeGroup.h --- old/kquickcharts-5.80.0/src/RangeGroup.h 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/RangeGroup.h 2021-04-03 11:36:40.000000000 +0200 @@ -96,9 +96,9 @@ Q_SIGNAL void rangeChanged(); - RangeResult calculateRange(const QVector<ChartDataSource*> &sources, - std::function<qreal(ChartDataSource*)> minimumCallback, - std::function<qreal(ChartDataSource*)> maximumCallback); + RangeResult calculateRange(const QVector<ChartDataSource *> &sources, + std::function<qreal(ChartDataSource *)> minimumCallback, + std::function<qreal(ChartDataSource *)> maximumCallback); private: qreal m_from = 0.0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/XYChart.cpp new/kquickcharts-5.81.0/src/XYChart.cpp --- old/kquickcharts-5.80.0/src/XYChart.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/XYChart.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -12,8 +12,7 @@ bool operator==(const ComputedRange &first, const ComputedRange &second) { - return first.startX == second.startX && first.endX == second.endX && qFuzzyCompare(first.startY, second.startY) - && qFuzzyCompare(first.endY, second.endY); + return first.startX == second.startX && first.endX == second.endX && qFuzzyCompare(first.startY, second.startY) && qFuzzyCompare(first.endY, second.endY); } XYChart::XYChart(QQuickItem *parent) @@ -80,9 +79,14 @@ ComputedRange result; - auto xRange = m_xRange->calculateRange(valueSources(), - [](ChartDataSource *) { return 0; }, - [](ChartDataSource *source) { return source->itemCount(); }); + auto xRange = m_xRange->calculateRange( + valueSources(), + [](ChartDataSource *) { + return 0; + }, + [](ChartDataSource *source) { + return source->itemCount(); + }); result.startX = xRange.start; result.endX = xRange.end; result.distanceX = xRange.distance; @@ -103,9 +107,12 @@ } }; - auto yRange = m_yRange->calculateRange(valueSources(), - [](ChartDataSource *source) { return std::min(0.0, source->minimum().toDouble()); }, - maximumY); + auto yRange = m_yRange->calculateRange( + valueSources(), + [](ChartDataSource *source) { + return std::min(0.0, source->minimum().toDouble()); + }, + maximumY); result.startY = yRange.start; result.endY = yRange.end; result.distanceY = yRange.distance; @@ -125,7 +132,7 @@ QDebug operator<<(QDebug debug, const ComputedRange &range) { - debug << "Range: startX" << range.startX << "endX" << range.endX << "distance" << range.distanceX << "startY" << range.startY << "endY" - << range.endY << "distance" << range.distanceY; + debug << "Range: startX" << range.startX << "endX" << range.endX << "distance" << range.distanceX << "startY" << range.startY << "endY" << range.endY + << "distance" << range.distanceY; return debug; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/XYChart.h new/kquickcharts-5.81.0/src/XYChart.h --- old/kquickcharts-5.80.0/src/XYChart.h 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/XYChart.h 2021-04-03 11:36:40.000000000 +0200 @@ -15,8 +15,7 @@ /** * A helper containing the calculated X and Y ranges of a chart. */ -struct ComputedRange -{ +struct ComputedRange { int startX = 0; int endX = 0; int distanceX = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/datasource/HistoryProxySource.cpp new/kquickcharts-5.81.0/src/datasource/HistoryProxySource.cpp --- old/kquickcharts-5.80.0/src/datasource/HistoryProxySource.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/datasource/HistoryProxySource.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -61,7 +61,7 @@ // TODO: Find a nicer solution for data sources to indicate // "I provide a min/max value not derived from my items" - auto model = m_dataSource->property("model").value<QObject*>(); + auto model = m_dataSource->property("model").value<QObject *>(); if (model) { auto minProperty = model->property("minimum"); auto maxProperty = model->property("maximum"); @@ -79,7 +79,7 @@ return QVariant{}; } - auto model = m_dataSource->property("model").value<QObject*>(); + auto model = m_dataSource->property("model").value<QObject *>(); if (model) { auto minProperty = model->property("minimum"); auto maxProperty = model->property("maximum"); @@ -99,12 +99,12 @@ return QVariant{}; } -ChartDataSource * HistoryProxySource::source() const +ChartDataSource *HistoryProxySource::source() const { return m_dataSource; } -void HistoryProxySource::setSource(ChartDataSource * newSource) +void HistoryProxySource::setSource(ChartDataSource *newSource) { if (newSource == m_dataSource) { return; @@ -142,7 +142,6 @@ Q_EMIT itemChanged(); } - int HistoryProxySource::maximumHistory() const { return m_maximumHistory; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/datasource/HistoryProxySource.h new/kquickcharts-5.81.0/src/datasource/HistoryProxySource.h --- old/kquickcharts-5.80.0/src/datasource/HistoryProxySource.h 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/datasource/HistoryProxySource.h 2021-04-03 11:36:40.000000000 +0200 @@ -8,10 +8,10 @@ #ifndef HISTORYPROXYSOURCE_H #define HISTORYPROXYSOURCE_H -#include <memory> +#include <QTimer> #include <QVariant> #include <QVector> -#include <QTimer> +#include <memory> #include "ChartDataSource.h" @@ -33,7 +33,7 @@ * * \note Changing this property will clear the existing history. */ - Q_PROPERTY(ChartDataSource * source READ source WRITE setSource NOTIFY sourceChanged) + Q_PROPERTY(ChartDataSource *source READ source WRITE setSource NOTIFY sourceChanged) /** * The item of the data source to read data from. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/datasource/MapProxySource.cpp new/kquickcharts-5.81.0/src/datasource/MapProxySource.cpp --- old/kquickcharts-5.80.0/src/datasource/MapProxySource.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/datasource/MapProxySource.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -1,12 +1,12 @@ /* * SPDX-FileCopyrightText: 2020 Arjen Hiemstra <ahiems...@heimr.nl> - * + * * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ #include "MapProxySource.h" -MapProxySource::MapProxySource(QObject* parent) +MapProxySource::MapProxySource(QObject *parent) : ChartDataSource(parent) { connect(this, &MapProxySource::sourceChanged, this, &ChartDataSource::dataChanged); @@ -54,13 +54,12 @@ return m_map.value(mapIndex); } - ChartDataSource *MapProxySource::source() const { return m_source; } -void MapProxySource::setSource(ChartDataSource * newSource) +void MapProxySource::setSource(ChartDataSource *newSource) { if (newSource == m_source) { return; @@ -82,7 +81,7 @@ return m_map; } -void MapProxySource::setMap(const QVariantMap & newMap) +void MapProxySource::setMap(const QVariantMap &newMap) { if (newMap == m_map) { return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/datasource/MapProxySource.h new/kquickcharts-5.81.0/src/datasource/MapProxySource.h --- old/kquickcharts-5.80.0/src/datasource/MapProxySource.h 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/datasource/MapProxySource.h 2021-04-03 11:36:40.000000000 +0200 @@ -1,6 +1,6 @@ /* * SPDX-FileCopyrightText: 2020 Arjen Hiemstra <ahiems...@heimr.nl> - * + * * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ @@ -25,14 +25,14 @@ /** * A ChartDataSource that is used as map indexes. */ - Q_PROPERTY(ChartDataSource * source READ source WRITE setSource NOTIFY sourceChanged) + Q_PROPERTY(ChartDataSource *source READ source WRITE setSource NOTIFY sourceChanged) /** * The map to index for values. */ Q_PROPERTY(QVariantMap map READ map WRITE setMap NOTIFY mapChanged) public: - MapProxySource(QObject* parent = nullptr); + MapProxySource(QObject *parent = nullptr); virtual int itemCount() const override; virtual QVariant item(int index) const override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/datasource/ModelHistorySource.cpp new/kquickcharts-5.81.0/src/datasource/ModelHistorySource.cpp --- old/kquickcharts-5.80.0/src/datasource/ModelHistorySource.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/datasource/ModelHistorySource.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -9,8 +9,8 @@ #include <QAbstractItemModel> #include <QDebug> -#include <QVariantList> #include <QTimer> +#include <QVariantList> #include "QmlDeprecated.h" @@ -135,7 +135,6 @@ Q_EMIT intervalChanged(); } - void ModelHistorySource::clear() { m_history.clear(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/datasource/ModelHistorySource.h new/kquickcharts-5.81.0/src/datasource/ModelHistorySource.h --- old/kquickcharts-5.80.0/src/datasource/ModelHistorySource.h 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/datasource/ModelHistorySource.h 2021-04-03 11:36:40.000000000 +0200 @@ -8,10 +8,10 @@ #ifndef MODELHISTORYSOURCE_H #define MODELHISTORYSOURCE_H -#include <memory> -#include <QTimer> #include "ModelSource.h" #include "quickcharts_export.h" +#include <QTimer> +#include <memory> #if QUICKCHARTS_BUILD_DEPRECATED_SINCE(5, 78) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/datasource/ValueHistorySource.cpp new/kquickcharts-5.81.0/src/datasource/ValueHistorySource.cpp --- old/kquickcharts-5.80.0/src/datasource/ValueHistorySource.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/datasource/ValueHistorySource.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -119,7 +119,6 @@ Q_EMIT intervalChanged(); } - void ValueHistorySource::clear() { m_history.clear(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/datasource/ValueHistorySource.h new/kquickcharts-5.81.0/src/datasource/ValueHistorySource.h --- old/kquickcharts-5.80.0/src/datasource/ValueHistorySource.h 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/datasource/ValueHistorySource.h 2021-04-03 11:36:40.000000000 +0200 @@ -8,10 +8,10 @@ #ifndef VALUEHISTORYSOURCE_H #define VALUEHISTORYSOURCE_H -#include <memory> +#include <QTimer> #include <QVariant> #include <QVector> -#include <QTimer> +#include <memory> #include "ChartDataSource.h" #include "quickcharts_export.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/decorations/AxisLabels.cpp new/kquickcharts-5.81.0/src/decorations/AxisLabels.cpp --- old/kquickcharts-5.80.0/src/decorations/AxisLabels.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/decorations/AxisLabels.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -102,7 +102,9 @@ m_source = newSource; if (m_source) { - connect(m_source, &ChartDataSource::dataChanged, this, [this]() { updateLabels(); }); + connect(m_source, &ChartDataSource::dataChanged, this, [this]() { + updateLabels(); + }); } updateLabels(); @@ -153,10 +155,11 @@ void AxisLabels::scheduleLayout() { if (!m_layoutScheduled) { - QMetaObject::invokeMethod( - this, - [this]() { layout(); m_layoutScheduled = false; }, - Qt::QueuedConnection); + auto scheduleLayoutLambda = [this]() { + layout(); + m_layoutScheduled = false; + }; + QMetaObject::invokeMethod(this, scheduleLayoutLambda, Qt::QueuedConnection); m_layoutScheduled = true; } } @@ -185,10 +188,18 @@ continue; } - QObject::connect(item, &QQuickItem::xChanged, this, [this]() { scheduleLayout(); }); - QObject::connect(item, &QQuickItem::yChanged, this, [this]() { scheduleLayout(); }); - QObject::connect(item, &QQuickItem::widthChanged, this, [this]() { scheduleLayout(); }); - QObject::connect(item, &QQuickItem::heightChanged, this, [this]() { scheduleLayout(); }); + QObject::connect(item, &QQuickItem::xChanged, this, [this]() { + scheduleLayout(); + }); + QObject::connect(item, &QQuickItem::yChanged, this, [this]() { + scheduleLayout(); + }); + QObject::connect(item, &QQuickItem::widthChanged, this, [this]() { + scheduleLayout(); + }); + QObject::connect(item, &QQuickItem::heightChanged, this, [this]() { + scheduleLayout(); + }); context->setParent(item); item->setParentItem(this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/decorations/LegendModel.cpp new/kquickcharts-5.81.0/src/decorations/LegendModel.cpp --- old/kquickcharts-5.80.0/src/decorations/LegendModel.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/decorations/LegendModel.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -211,7 +211,7 @@ i++; }); - for(auto i = 0; i < changedRows.size(); ++i) { + for (auto i = 0; i < changedRows.size(); ++i) { auto changedRoles = changedRows.at(i); if (!changedRoles.isEmpty()) { Q_EMIT dataChanged(index(i, 0), index(i, 0), changedRoles); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/decorations/LegendModel.h new/kquickcharts-5.81.0/src/decorations/LegendModel.h --- old/kquickcharts-5.80.0/src/decorations/LegendModel.h 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/decorations/LegendModel.h 2021-04-03 11:36:40.000000000 +0200 @@ -16,8 +16,7 @@ class Chart; class ChartDataSource; -struct LegendItem -{ +struct LegendItem { QString name; QString shortName; QColor color; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/scenegraph/LineChartNode.cpp new/kquickcharts-5.81.0/src/scenegraph/LineChartNode.cpp --- old/kquickcharts-5.80.0/src/scenegraph/LineChartNode.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/scenegraph/LineChartNode.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -65,7 +65,9 @@ return; m_lineColor = color; - std::for_each(m_segments.cbegin(), m_segments.cend(), [color](LineSegmentNode *node) { node->setLineColor(color); }); + std::for_each(m_segments.cbegin(), m_segments.cend(), [color](LineSegmentNode *node) { + node->setLineColor(color); + }); } void LineChartNode::setFillColor(const QColor &color) @@ -74,7 +76,9 @@ return; m_fillColor = color; - std::for_each(m_segments.cbegin(), m_segments.cend(), [color](LineSegmentNode *node) { node->setFillColor(color); }); + std::for_each(m_segments.cbegin(), m_segments.cend(), [color](LineSegmentNode *node) { + node->setFillColor(color); + }); } void LineChartNode::setValues(const QVector<QVector2D> &values) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.80.0/src/scenegraph/SDFShader.cpp new/kquickcharts-5.81.0/src/scenegraph/SDFShader.cpp --- old/kquickcharts-5.80.0/src/scenegraph/SDFShader.cpp 2021-02-28 20:04:36.000000000 +0100 +++ new/kquickcharts-5.81.0/src/scenegraph/SDFShader.cpp 2021-04-03 11:36:40.000000000 +0200 @@ -30,9 +30,8 @@ setShaderSourceFiles(QOpenGLShader::Vertex, {QString::fromLatin1(shaderRoot) + header, QString::fromLatin1(shaderRoot) + vertex}); - setShaderSourceFiles( - QOpenGLShader::Fragment, - {QString::fromLatin1(shaderRoot) + header, - QString::fromLatin1(shaderRoot) + QStringLiteral("sdf.glsl"), - QString::fromLatin1(shaderRoot) + fragment}); + setShaderSourceFiles(QOpenGLShader::Fragment, + {QString::fromLatin1(shaderRoot) + header, // + QString::fromLatin1(shaderRoot) + QStringLiteral("sdf.glsl"), // + QString::fromLatin1(shaderRoot) + fragment}); }
