Hello community, here is the log from the commit of package kqtquickcharts for openSUSE:Factory checked in at 2019-08-16 15:47:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kqtquickcharts (Old) and /work/SRC/openSUSE:Factory/.kqtquickcharts.new.22127 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kqtquickcharts" Fri Aug 16 15:47:28 2019 rev:67 rq:723700 version:19.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kqtquickcharts/kqtquickcharts.changes 2019-07-17 13:18:09.903716363 +0200 +++ /work/SRC/openSUSE:Factory/.kqtquickcharts.new.22127/kqtquickcharts.changes 2019-08-16 15:47:58.913650920 +0200 @@ -1,0 +2,30 @@ +Fri Aug 9 08:31:35 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 19.08.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.08.0.php +- No code change since 19.07.90 + +------------------------------------------------------------------- +Tue Aug 06 16:50:50 UTC 2019 - lbeltr...@kde.org + +- Update to 19.07.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.08-rc.php +- Changes since 19.07.80: + * No code changes since 19.07.80 + +------------------------------------------------------------------- +Tue Jul 23 11:59:04 UTC 2019 - lbeltr...@kde.org + +- Update to 19.07.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.08-beta.php +- Changes since 19.04.3: + * It's time to use cmake 3.5 + * Use nullptr + port to new connect api + use QStringLiteral + +------------------------------------------------------------------- Old: ---- kqtquickcharts-19.04.3.tar.xz New: ---- applications.keyring kqtquickcharts-19.08.0.tar.xz kqtquickcharts-19.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kqtquickcharts.spec ++++++ --- /var/tmp/diff_new_pack.ubzoOJ/_old 2019-08-16 15:47:59.405650740 +0200 +++ /var/tmp/diff_new_pack.ubzoOJ/_new 2019-08-16 15:47:59.409650738 +0200 @@ -19,14 +19,19 @@ %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%bcond_without lang Name: kqtquickcharts -Version: 19.04.3 +Version: 19.08.0 Release: 0 Summary: Plugin to render beautiful and interactive graphs License: LGPL-2.1-or-later Group: Amusements/Teaching/Other -URL: http://edu.kde.org -Source0: %{name}-%{version}.tar.xz +URL: https://edu.kde.org +Source: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz +%if %{with lang} +Source1: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig +Source2: applications.keyring +%endif BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: pkgconfig ++++++ kqtquickcharts-19.04.3.tar.xz -> kqtquickcharts-19.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/CMakeLists.txt new/kqtquickcharts-19.08.0/CMakeLists.txt --- old/kqtquickcharts-19.04.3/CMakeLists.txt 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/CMakeLists.txt 2019-05-13 07:09:57.000000000 +0200 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) project(KQtQuickCharts) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/barchartcore.cpp new/kqtquickcharts-19.08.0/src/barchartcore.cpp --- old/kqtquickcharts-19.04.3/src/barchartcore.cpp 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/barchartcore.cpp 2019-05-13 07:09:57.000000000 +0200 @@ -22,7 +22,7 @@ BarChartCore::BarChartCore(QQuickItem* parent) : ChartCore(parent) { - connect(this, SIGNAL(pitchChanged()), SIGNAL(barWidthChanged())); + connect(this, &ChartCore::pitchChanged, this, &BarChartCore::barWidthChanged); } qreal BarChartCore::barWidth() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/barchartcore.h new/kqtquickcharts-19.08.0/src/barchartcore.h --- old/kqtquickcharts-19.04.3/src/barchartcore.h 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/barchartcore.h 2019-05-13 07:09:57.000000000 +0200 @@ -27,7 +27,7 @@ Q_OBJECT Q_PROPERTY(qreal barWidth READ barWidth NOTIFY barWidthChanged) public: - explicit BarChartCore(QQuickItem* parent = 0); + explicit BarChartCore(QQuickItem* parent = nullptr); qreal barWidth() const; void paint(QPainter* painter) override; Q_SIGNALS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/barchartsegment.cpp new/kqtquickcharts-19.08.0/src/barchartsegment.cpp --- old/kqtquickcharts-19.04.3/src/barchartsegment.cpp 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/barchartsegment.cpp 2019-05-13 07:09:57.000000000 +0200 @@ -26,11 +26,11 @@ BarChartSegment::BarChartSegment(QQuickItem* parent) : QQuickItem(parent), - m_barChartCore(0), + m_barChartCore(nullptr), m_dimension(-1), m_row(-1) { - connect(this, SIGNAL(heightChanged()), SLOT(triggerUpdate())); + connect(this, &QQuickItem::heightChanged, this, &BarChartSegment::triggerUpdate); } BarChartCore* BarChartSegment::barChartCore() const @@ -51,7 +51,7 @@ if (m_barChartCore) { - connect(m_barChartCore, SIGNAL(updated()), SLOT(triggerUpdate())); + connect(m_barChartCore, &ChartCore::updated, this, &BarChartSegment::triggerUpdate); } triggerUpdate(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/barchartsegment.h new/kqtquickcharts-19.08.0/src/barchartsegment.h --- old/kqtquickcharts-19.04.3/src/barchartsegment.h 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/barchartsegment.h 2019-05-13 07:09:57.000000000 +0200 @@ -33,7 +33,7 @@ Q_PROPERTY(qreal barHeight READ barHeight NOTIFY barHeightChanged) Q_PROPERTY(QString text READ text NOTIFY textChanged) public: - explicit BarChartSegment(QQuickItem* parent = 0); + explicit BarChartSegment(QQuickItem* parent = nullptr); BarChartCore* barChartCore() const; void setBarChartCore(BarChartCore* barChartCore); int dimension() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/chartcore.cpp new/kqtquickcharts-19.08.0/src/chartcore.cpp --- old/kqtquickcharts-19.04.3/src/chartcore.cpp 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/chartcore.cpp 2019-05-13 07:09:57.000000000 +0200 @@ -24,7 +24,7 @@ ChartCore::ChartCore(QQuickItem *parent) : QQuickPaintedItem(parent), - m_model(0), + m_model(nullptr), m_pitch(50.0), m_textRole(-1) { @@ -49,12 +49,12 @@ if (m_model) { - connect(m_model, SIGNAL(modelReset()), SLOT(triggerUpdate())); - connect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), SLOT(triggerUpdate())); - connect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), SLOT(triggerUpdate())); - connect(m_model, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)), SLOT(triggerUpdate())); - connect(m_model, SIGNAL(layoutChanged()), SLOT(triggerUpdate())); - connect(m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), SLOT(triggerUpdate())); + connect(m_model, &QAbstractItemModel::modelReset, this, &ChartCore::triggerUpdate); + connect(m_model, &QAbstractItemModel::rowsInserted, this, &ChartCore::triggerUpdate); + connect(m_model, &QAbstractItemModel::rowsRemoved, this, &ChartCore::triggerUpdate); + connect(m_model, &QAbstractItemModel::rowsMoved, this, &ChartCore::triggerUpdate); + connect(m_model, &QAbstractItemModel::layoutChanged, this, &ChartCore::triggerUpdate); + connect(m_model, &QAbstractItemModel::dataChanged, this, &ChartCore::triggerUpdate); } triggerUpdate(); @@ -63,7 +63,7 @@ } QQmlListProperty<Dimension> ChartCore::dimensions() { - return QQmlListProperty<Dimension>(this, 0, &ChartCore::appendDimension, &ChartCore::countDimensions, &ChartCore::dimensionAt, &ChartCore::clearDimensions); + return QQmlListProperty<Dimension>(this, nullptr, &ChartCore::appendDimension, &ChartCore::countDimensions, &ChartCore::dimensionAt, &ChartCore::clearDimensions); } QList<Dimension*> ChartCore::dimensionsList() const @@ -139,7 +139,7 @@ if (chartCore) { dimension->setParent(chartCore); chartCore->m_dimensions.append(dimension); - connect(dimension, SIGNAL(updated()), chartCore, SLOT(triggerUpdate())); + connect(dimension, &Dimension::updated, chartCore, &ChartCore::triggerUpdate); chartCore->triggerUpdate(); } } @@ -157,7 +157,7 @@ if (chartCore) { return chartCore->m_dimensions.at(index); } - return 0; + return nullptr; } void ChartCore::clearDimensions(QQmlListProperty<Dimension>* list) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/chartcore.h new/kqtquickcharts-19.08.0/src/chartcore.h --- old/kqtquickcharts-19.04.3/src/chartcore.h 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/chartcore.h 2019-05-13 07:09:57.000000000 +0200 @@ -34,7 +34,7 @@ Q_PROPERTY(qreal pitch READ pitch WRITE setPitch NOTIFY pitchChanged) Q_PROPERTY(int textRole READ textRole WRITE setTextRole NOTIFY textRoleChanged) public: - explicit ChartCore(QQuickItem *parent = 0); + explicit ChartCore(QQuickItem *parent = nullptr); QAbstractTableModel* model() const; void setModel(QAbstractTableModel* model); QQmlListProperty<Dimension> dimensions(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/chartforegroundpainter.cpp new/kqtquickcharts-19.08.0/src/chartforegroundpainter.cpp --- old/kqtquickcharts-19.04.3/src/chartforegroundpainter.cpp 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/chartforegroundpainter.cpp 2019-05-13 07:09:57.000000000 +0200 @@ -25,7 +25,7 @@ ChartForegroundPainter::ChartForegroundPainter(QQuickItem *parent) : QQuickPaintedItem(parent), - m_chartCore(0) + m_chartCore(nullptr) { setFlag(QQuickItem::ItemHasContents, true); } @@ -48,7 +48,7 @@ if (m_chartCore) { - connect(m_chartCore, SIGNAL(updated()), SLOT(triggerUpdate())); + connect(m_chartCore, &ChartCore::updated, this, &ChartForegroundPainter::triggerUpdate); } triggerUpdate(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/chartforegroundpainter.h new/kqtquickcharts-19.08.0/src/chartforegroundpainter.h --- old/kqtquickcharts-19.04.3/src/chartforegroundpainter.h 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/chartforegroundpainter.h 2019-05-13 07:09:57.000000000 +0200 @@ -30,7 +30,7 @@ Q_PROPERTY(ChartCore* chartCore READ chartCore WRITE setChartCore NOTIFY chartCoreChanged) Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged) public: - explicit ChartForegroundPainter(QQuickItem* parent = 0); + explicit ChartForegroundPainter(QQuickItem* parent = nullptr); ChartCore* chartCore() const; void setChartCore(ChartCore* chartCore); QColor backgroundColor() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/chartmodel.cpp new/kqtquickcharts-19.08.0/src/chartmodel.cpp --- old/kqtquickcharts-19.04.3/src/chartmodel.cpp 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/chartmodel.cpp 2019-05-13 07:09:57.000000000 +0200 @@ -29,7 +29,7 @@ QQmlListProperty<Record> ChartModel::records() { - return QQmlListProperty<Record>(this, 0, &ChartModel::appendRecord, &ChartModel::countRecords, &ChartModel::recordAt, &ChartModel::clearRecords); + return QQmlListProperty<Record>(this, nullptr, &ChartModel::appendRecord, &ChartModel::countRecords, &ChartModel::recordAt, &ChartModel::clearRecords); } int ChartModel::columns() const @@ -124,7 +124,7 @@ { beginInsertRows(QModelIndex(), row, row); record->setParent(this); - connect(record, SIGNAL(valuesChanged(Record*)), SLOT(onRecordChanged(Record*))); + connect(record, &Record::valuesChanged, this, &ChartModel::onRecordChanged); m_records.insert(row, record); endInsertRows(); emit rowsChanged(); @@ -156,7 +156,7 @@ { return chartModel->m_records.at(index); } - return 0; + return nullptr; } void ChartModel::clearRecords(QQmlListProperty<Record>* list) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/chartmodel.h new/kqtquickcharts-19.08.0/src/chartmodel.h --- old/kqtquickcharts-19.04.3/src/chartmodel.h 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/chartmodel.h 2019-05-13 07:09:57.000000000 +0200 @@ -43,7 +43,7 @@ Q_INVOKABLE void removeRecord(int row); Q_INVOKABLE qreal value(int row, int column) const; Q_INVOKABLE void setValue(int row, int column, qreal value); - explicit ChartModel(QObject* parent = 0); + explicit ChartModel(QObject* parent = nullptr); int rowCount(const QModelIndex& parent) const override; int columnCount(const QModelIndex& parent) const override; QVariant data(const QModelIndex& index, int role) const override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/chartplugin.cpp new/kqtquickcharts-19.08.0/src/chartplugin.cpp --- old/kqtquickcharts-19.04.3/src/chartplugin.cpp 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/chartplugin.cpp 2019-05-13 07:09:57.000000000 +0200 @@ -58,5 +58,5 @@ qmlRegisterType<ChartModel>(uri, 0, 1, "ChartModel"); qmlRegisterType<Record>(uri, 0, 1, "Record"); - qmlRegisterUncreatableType<QAbstractTableModel>(uri, 0, 1, "QAbstractTableModel", "abstract class"); + qmlRegisterUncreatableType<QAbstractTableModel>(uri, 0, 1, "QAbstractTableModel", QStringLiteral("abstract class")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/dimension.h new/kqtquickcharts-19.08.0/src/dimension.h --- old/kqtquickcharts-19.04.3/src/dimension.h 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/dimension.h 2019-05-13 07:09:57.000000000 +0200 @@ -54,7 +54,7 @@ Q_PROPERTY(MarkerStyle markerStyle READ markerStyle WRITE setMarkerStyle NOTIFY markerStyleChanged) Q_PROPERTY(LineStyle lineStyle READ lineStyle WRITE setLineStyle NOTIFY lineStyleChanged) - explicit Dimension(QObject* parent = 0); + explicit Dimension(QObject* parent = nullptr); QColor color() const; void setColor(const QColor& color); int dataColumn() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/linechartbackgroundpainter.cpp new/kqtquickcharts-19.08.0/src/linechartbackgroundpainter.cpp --- old/kqtquickcharts-19.04.3/src/linechartbackgroundpainter.cpp 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/linechartbackgroundpainter.cpp 2019-05-13 07:09:57.000000000 +0200 @@ -27,11 +27,11 @@ LineChartBackgroundPainter::LineChartBackgroundPainter(QQuickItem* parent) : QQuickPaintedItem(parent), - m_lineChartCore(0) + m_lineChartCore(nullptr) { setFlag(QQuickItem::ItemHasContents, true); - connect(this, SIGNAL(heightChanged()), SLOT(triggerUpdate())); + connect(this, &QQuickItem::heightChanged, this, &LineChartBackgroundPainter::triggerUpdate); } LineChartCore* LineChartBackgroundPainter::lineChartCore() const @@ -52,7 +52,7 @@ if (m_lineChartCore) { - connect(m_lineChartCore, SIGNAL(updated()), SLOT(triggerUpdate())); + connect(m_lineChartCore, &ChartCore::updated, this, &LineChartBackgroundPainter::triggerUpdate); } update(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/linechartbackgroundpainter.h new/kqtquickcharts-19.08.0/src/linechartbackgroundpainter.h --- old/kqtquickcharts-19.04.3/src/linechartbackgroundpainter.h 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/linechartbackgroundpainter.h 2019-05-13 07:09:57.000000000 +0200 @@ -31,7 +31,7 @@ Q_OBJECT Q_PROPERTY(LineChartCore* lineChartCore READ lineChartCore WRITE setLineChartCore NOTIFY lineChartCoreChanged) public: - explicit LineChartBackgroundPainter(QQuickItem* parent = 0); + explicit LineChartBackgroundPainter(QQuickItem* parent = nullptr); LineChartCore* lineChartCore() const; void setLineChartCore(LineChartCore* lineChartCore); void paint(QPainter* painter) override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/linechartcore.h new/kqtquickcharts-19.08.0/src/linechartcore.h --- old/kqtquickcharts-19.04.3/src/linechartcore.h 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/linechartcore.h 2019-05-13 07:09:57.000000000 +0200 @@ -27,7 +27,7 @@ Q_OBJECT Q_PROPERTY(qreal pointRadius READ pointRadius WRITE setPointRadius NOTIFY pointRadiusChanged) public: - explicit LineChartCore(QQuickItem* parent = 0); + explicit LineChartCore(QQuickItem* parent = nullptr); qreal pointRadius() const; void setPointRadius(qreal pointRadius); void paint(QPainter* painter) override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/linechartpainter.cpp new/kqtquickcharts-19.08.0/src/linechartpainter.cpp --- old/kqtquickcharts-19.04.3/src/linechartpainter.cpp 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/linechartpainter.cpp 2019-05-13 07:09:57.000000000 +0200 @@ -27,8 +27,8 @@ LineChartPainter::LineChartPainter(QQuickItem* parent) : QQuickPaintedItem(parent), - m_lineChartCore(0), - m_backgroundPainter(0), + m_lineChartCore(nullptr), + m_backgroundPainter(nullptr), m_dimension(-1) { setFlag(QQuickItem::ItemHasContents, true); @@ -52,7 +52,7 @@ if (m_lineChartCore) { - connect(m_lineChartCore, SIGNAL(updated()), SLOT(triggerUpdate())); + connect(m_lineChartCore, &ChartCore::updated, this, &LineChartPainter::triggerUpdate); } update(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/linechartpainter.h new/kqtquickcharts-19.08.0/src/linechartpainter.h --- old/kqtquickcharts-19.04.3/src/linechartpainter.h 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/linechartpainter.h 2019-05-13 07:09:57.000000000 +0200 @@ -31,7 +31,7 @@ Q_PROPERTY(LineChartBackgroundPainter* backgroundPainter READ backgroundPainter WRITE setBackgroundPainter NOTIFY backgroundPainterChanged) Q_PROPERTY(int dimension READ dimension WRITE setDimension NOTIFY dimensionChanged) public: - explicit LineChartPainter(QQuickItem* parent = 0); + explicit LineChartPainter(QQuickItem* parent = nullptr); LineChartCore* lineChartCore() const; void setLineChartCore(LineChartCore* lineChartCore); LineChartBackgroundPainter* backgroundPainter() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/linechartpoint.cpp new/kqtquickcharts-19.08.0/src/linechartpoint.cpp --- old/kqtquickcharts-19.04.3/src/linechartpoint.cpp 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/linechartpoint.cpp 2019-05-13 07:09:57.000000000 +0200 @@ -28,8 +28,8 @@ LineChartPoint::LineChartPoint(QQuickItem* parent) : QQuickPaintedItem(parent), - m_lineChartCore(0), - m_backgroundPainter(0), + m_lineChartCore(nullptr), + m_backgroundPainter(nullptr), m_dimension(-1), m_row(-1) { @@ -54,7 +54,7 @@ if (m_lineChartCore) { - connect(m_lineChartCore, SIGNAL(updated()), SLOT(triggerUpdate())); + connect(m_lineChartCore, &ChartCore::updated, this, &LineChartPoint::triggerUpdate); } triggerUpdate(); @@ -80,7 +80,7 @@ if (m_backgroundPainter) { - connect(m_backgroundPainter, SIGNAL(linePolygonsUpdated()), SLOT(triggerUpdate())); + connect(m_backgroundPainter, &LineChartBackgroundPainter::linePolygonsUpdated, this, &LineChartPoint::triggerUpdate); } triggerUpdate(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/linechartpoint.h new/kqtquickcharts-19.08.0/src/linechartpoint.h --- old/kqtquickcharts-19.04.3/src/linechartpoint.h 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/linechartpoint.h 2019-05-13 07:09:57.000000000 +0200 @@ -34,7 +34,7 @@ Q_PROPERTY(int row READ row WRITE setRow NOTIFY rowChanged) Q_PROPERTY(QString text READ text NOTIFY textChanged) public: - explicit LineChartPoint(QQuickItem* parent = 0); + explicit LineChartPoint(QQuickItem* parent = nullptr); LineChartCore* lineChartCore() const; void setLineChartCore(LineChartCore* lineChartCore); LineChartBackgroundPainter* backgroundPainter() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/record.h new/kqtquickcharts-19.08.0/src/record.h --- old/kqtquickcharts-19.04.3/src/record.h 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/record.h 2019-05-13 07:09:57.000000000 +0200 @@ -29,7 +29,7 @@ Q_OBJECT Q_PROPERTY(QVariantList values READ values WRITE setValues NOTIFY valuesChanged) public: - explicit Record(QObject* parent = 0); + explicit Record(QObject* parent = nullptr); QVariantList values() const; void setValues(const QVariantList& values); Q_INVOKABLE qreal value(int column) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/xychartbackgroundpainter.cpp new/kqtquickcharts-19.08.0/src/xychartbackgroundpainter.cpp --- old/kqtquickcharts-19.04.3/src/xychartbackgroundpainter.cpp 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/xychartbackgroundpainter.cpp 2019-05-13 07:09:57.000000000 +0200 @@ -27,12 +27,12 @@ XYChartBackgroundPainter::XYChartBackgroundPainter(QQuickItem* parent) : QQuickPaintedItem(parent), - m_xyChartCore(0) + m_xyChartCore(nullptr) { setFlag(QQuickItem::ItemHasContents, true); - connect(this, SIGNAL(widthChanged()), SLOT(triggerUpdate())); - connect(this, SIGNAL(heightChanged()), SLOT(triggerUpdate())); + connect(this, &QQuickItem::widthChanged, this, &XYChartBackgroundPainter::triggerUpdate); + connect(this, &QQuickItem::heightChanged, this, &XYChartBackgroundPainter::triggerUpdate); } XYChartCore* XYChartBackgroundPainter::xyChartCore() const @@ -53,7 +53,7 @@ if (m_xyChartCore) { - connect(m_xyChartCore, SIGNAL(updated()), SLOT(triggerUpdate())); + connect(m_xyChartCore, &ChartCore::updated, this, &XYChartBackgroundPainter::triggerUpdate); } update(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/xychartbackgroundpainter.h new/kqtquickcharts-19.08.0/src/xychartbackgroundpainter.h --- old/kqtquickcharts-19.04.3/src/xychartbackgroundpainter.h 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/xychartbackgroundpainter.h 2019-05-13 07:09:57.000000000 +0200 @@ -31,7 +31,7 @@ Q_OBJECT Q_PROPERTY(XYChartCore* xyChartCore READ xyChartCore WRITE setXYChartCore NOTIFY xyChartCoreChanged) public: - explicit XYChartBackgroundPainter(QQuickItem* parent = 0); + explicit XYChartBackgroundPainter(QQuickItem* parent = nullptr); XYChartCore* xyChartCore() const; void setXYChartCore(XYChartCore* lineChartCore); void paint(QPainter* painter) override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/xychartcore.cpp new/kqtquickcharts-19.08.0/src/xychartcore.cpp --- old/kqtquickcharts-19.04.3/src/xychartcore.cpp 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/xychartcore.cpp 2019-05-13 07:09:57.000000000 +0200 @@ -30,8 +30,8 @@ ChartCore(parent), m_pointRadius(5.0), m_lineWidth(2.0), - m_xAxis(0), - m_yAxis(0), + m_xAxis(nullptr), + m_yAxis(nullptr), m_labelFont(), m_labelFontMetrics(m_labelFont), m_minorTickSize(2), @@ -178,7 +178,7 @@ void XYChartCore::paintAxisLabels(QPainter* painter) { - int labelHeight = painter->fontMetrics().tightBoundingRect("0123456789").height(); + int labelHeight = painter->fontMetrics().tightBoundingRect(QStringLiteral("0123456789")).height(); foreach(qreal label, m_xAxisLabels) { QString strLabel = formatLabel(label, xAxis()); @@ -251,8 +251,8 @@ const int minKeyStringLength = formatLabel(minKey, xAxis()).length(); const int maxKeyStringLength = formatLabel(maxKey, xAxis()).length(); - int maxYLabelWidth = m_labelFontMetrics.width("W") * std::max(minValueStringLength, maxValueStringLength); - int maxXLabelWidth = m_labelFontMetrics.width("W") * std::max(minKeyStringLength, maxKeyStringLength); + int maxYLabelWidth = m_labelFontMetrics.width(QStringLiteral("W")) * std::max(minValueStringLength, maxValueStringLength); + int maxXLabelWidth = m_labelFontMetrics.width(QStringLiteral("W")) * std::max(minKeyStringLength, maxKeyStringLength); m_lowerLeftCorner.setX(maxYLabelWidth + m_margin); m_lowerLeftCorner.setY(height() - m_labelFontMetrics.height() - m_margin); @@ -342,7 +342,7 @@ return m_labelFont; } -void XYChartCore::setFont(QFont font) +void XYChartCore::setFont(const QFont &font) { if (font != m_labelFont) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/xychartcore.h new/kqtquickcharts-19.08.0/src/xychartcore.h --- old/kqtquickcharts-19.04.3/src/xychartcore.h 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/xychartcore.h 2019-05-13 07:09:57.000000000 +0200 @@ -38,7 +38,7 @@ Q_PROPERTY(bool gridLines READ gridLines WRITE setGridLines NOTIFY gridLinesChanged) Q_PROPERTY(unsigned int axisLabelCountGoal READ axisLabelCountGoal WRITE setAxisLabelCountGoal NOTIFY axisLabelCountGoalChanged) public: - explicit XYChartCore(QQuickItem* parent = 0); + explicit XYChartCore(QQuickItem* parent = nullptr); qreal pointRadius() const; void setPointRadius(qreal pointRadius); qreal lineWidth() const; @@ -50,7 +50,7 @@ QColor textColor() const; void setTextColor(QColor color); QFont font() const; - void setFont(QFont font); + void setFont(const QFont &font); bool gridLines() const; void setGridLines(bool gridLines); unsigned int axisLabelCountGoal() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/xychartpainter.cpp new/kqtquickcharts-19.08.0/src/xychartpainter.cpp --- old/kqtquickcharts-19.04.3/src/xychartpainter.cpp 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/xychartpainter.cpp 2019-05-13 07:09:57.000000000 +0200 @@ -27,8 +27,8 @@ XYChartPainter::XYChartPainter(QQuickItem* parent) : QQuickPaintedItem(parent), - m_xyChartCore(0), - m_backgroundPainter(0), + m_xyChartCore(nullptr), + m_backgroundPainter(nullptr), m_dimension(-1) { setFlag(QQuickItem::ItemHasContents, true); @@ -52,7 +52,7 @@ if (m_xyChartCore) { - connect(m_xyChartCore, SIGNAL(updated()), SLOT(triggerUpdate())); + connect(m_xyChartCore, &ChartCore::updated, this, &XYChartPainter::triggerUpdate); } update(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/xychartpainter.h new/kqtquickcharts-19.08.0/src/xychartpainter.h --- old/kqtquickcharts-19.04.3/src/xychartpainter.h 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/xychartpainter.h 2019-05-13 07:09:57.000000000 +0200 @@ -31,7 +31,7 @@ Q_PROPERTY(XYChartBackgroundPainter* backgroundPainter READ backgroundPainter WRITE setBackgroundPainter NOTIFY backgroundPainterChanged) Q_PROPERTY(int dimension READ dimension WRITE setDimension NOTIFY dimensionChanged) public: - explicit XYChartPainter(QQuickItem* parent = 0); + explicit XYChartPainter(QQuickItem* parent = nullptr); XYChartCore* xyChartCore() const; void setXYChartCore(XYChartCore* xyChartCore); XYChartBackgroundPainter* backgroundPainter() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/xychartpoint.cpp new/kqtquickcharts-19.08.0/src/xychartpoint.cpp --- old/kqtquickcharts-19.04.3/src/xychartpoint.cpp 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/xychartpoint.cpp 2019-05-13 07:09:57.000000000 +0200 @@ -28,8 +28,8 @@ XYChartPoint::XYChartPoint(QQuickItem* parent) : QQuickPaintedItem(parent), - m_xyChartCore(0), - m_backgroundPainter(0), + m_xyChartCore(nullptr), + m_backgroundPainter(nullptr), m_dimension(-1), m_row(-1) { @@ -54,7 +54,7 @@ if (m_xyChartCore) { - connect(m_xyChartCore, SIGNAL(updated()), SLOT(triggerUpdate())); + connect(m_xyChartCore, &ChartCore::updated, this, &XYChartPoint::triggerUpdate); } triggerUpdate(); @@ -80,7 +80,7 @@ if (m_backgroundPainter) { - connect(m_backgroundPainter, SIGNAL(linePolygonsUpdated()), SLOT(triggerUpdate())); + connect(m_backgroundPainter, &XYChartBackgroundPainter::linePolygonsUpdated, this, &XYChartPoint::triggerUpdate); } triggerUpdate(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kqtquickcharts-19.04.3/src/xychartpoint.h new/kqtquickcharts-19.08.0/src/xychartpoint.h --- old/kqtquickcharts-19.04.3/src/xychartpoint.h 2018-12-20 07:38:32.000000000 +0100 +++ new/kqtquickcharts-19.08.0/src/xychartpoint.h 2019-05-13 07:09:57.000000000 +0200 @@ -34,7 +34,7 @@ Q_PROPERTY(int row READ row WRITE setRow NOTIFY rowChanged) Q_PROPERTY(QString text READ text NOTIFY textChanged) public: - explicit XYChartPoint(QQuickItem* parent = 0); + explicit XYChartPoint(QQuickItem* parent = nullptr); XYChartCore* xyChartCore() const; void setXYChartCore(XYChartCore* xyChartCore); XYChartBackgroundPainter* backgroundPainter() const;
