summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.qmake.conf4
-rw-r--r--src/charts/animations/axisanimation.cpp6
-rw-r--r--src/charts/animations/baranimation.cpp6
-rw-r--r--src/charts/animations/boxwhiskersanimation.cpp10
-rw-r--r--src/charts/animations/candlestickbodywicksanimation.cpp10
-rw-r--r--src/charts/animations/piesliceanimation.cpp10
-rw-r--r--src/charts/animations/splineanimation.cpp6
-rw-r--r--src/charts/animations/xyanimation.cpp6
-rw-r--r--src/charts/axis/chartaxiselement.cpp6
-rw-r--r--src/charts/barchart/abstractbarchartitem.cpp24
-rw-r--r--src/charts/glwidget.cpp5
-rw-r--r--src/charts/scroller.cpp8
-rw-r--r--src/charts/scroller_p.h4
-rw-r--r--src/charts/xychart/glxyseriesdata_p.h1
-rw-r--r--src/chartsqml2/declarativeopenglrendernode.cpp16
-rw-r--r--tests/auto/qbarseries/BLACKLIST2
-rw-r--r--tests/manual/chartviewer/window.cpp7
17 files changed, 56 insertions, 75 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 1ed62c5a..2c781f2e 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,5 @@
load(qt_build_config)
-MODULE_VERSION = 5.13.1
+DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
+
+MODULE_VERSION = 5.14.0
diff --git a/src/charts/animations/axisanimation.cpp b/src/charts/animations/axisanimation.cpp
index b2f2c496..a5db92e0 100644
--- a/src/charts/animations/axisanimation.cpp
+++ b/src/charts/animations/axisanimation.cpp
@@ -113,8 +113,8 @@ void AxisAnimation::setValues(QVector<qreal> &oldLayout, QVector<qreal> &newLayo
QVariantAnimation::KeyValues value;
setKeyValues(value); //workaround for wrong interpolation call
- setKeyValueAt(0.0, qVariantFromValue(oldLayout));
- setKeyValueAt(1.0, qVariantFromValue(newLayout));
+ setKeyValueAt(0.0, QVariant::fromValue(oldLayout));
+ setKeyValueAt(1.0, QVariant::fromValue(newLayout));
}
QVariant AxisAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
@@ -129,7 +129,7 @@ QVariant AxisAnimation::interpolated(const QVariant &start, const QVariant &end,
qreal value = startVector[i] + ((endVecotr[i] - startVector[i]) * progress);
result << value;
}
- return qVariantFromValue(result);
+ return QVariant::fromValue(result);
}
diff --git a/src/charts/animations/baranimation.cpp b/src/charts/animations/baranimation.cpp
index a7752272..9ab942fb 100644
--- a/src/charts/animations/baranimation.cpp
+++ b/src/charts/animations/baranimation.cpp
@@ -65,7 +65,7 @@ QVariant BarAnimation::interpolated(const QVariant &from, const QVariant &to, qr
QRectF value(QPointF(x1, y1), QPointF(x2, y2));
result << value.normalized();
}
- return qVariantFromValue(result);
+ return QVariant::fromValue(result);
}
void BarAnimation::updateCurrentValue(const QVariant &value)
@@ -81,8 +81,8 @@ void BarAnimation::setup(const QVector<QRectF> &oldLayout, const QVector<QRectF>
{
QVariantAnimation::KeyValues value;
setKeyValues(value); //workaround for wrong interpolation call
- setKeyValueAt(0.0, qVariantFromValue(oldLayout));
- setKeyValueAt(1.0, qVariantFromValue(newLayout));
+ setKeyValueAt(0.0, QVariant::fromValue(oldLayout));
+ setKeyValueAt(1.0, QVariant::fromValue(newLayout));
}
QT_CHARTS_END_NAMESPACE
diff --git a/src/charts/animations/boxwhiskersanimation.cpp b/src/charts/animations/boxwhiskersanimation.cpp
index 141fadd8..8bb5c25e 100644
--- a/src/charts/animations/boxwhiskersanimation.cpp
+++ b/src/charts/animations/boxwhiskersanimation.cpp
@@ -84,7 +84,7 @@ QVariant BoxWhiskersAnimation::interpolated(const QVariant &from, const QVariant
result.m_seriesIndex = endData.m_seriesIndex;
result.m_seriesCount = endData.m_seriesCount;
- return qVariantFromValue(result);
+ return QVariant::fromValue(result);
}
void BoxWhiskersAnimation::updateCurrentValue(const QVariant &value)
@@ -95,8 +95,8 @@ void BoxWhiskersAnimation::updateCurrentValue(const QVariant &value)
void BoxWhiskersAnimation::setup(const BoxWhiskersData &startData, const BoxWhiskersData &endData)
{
- setKeyValueAt(0.0, qVariantFromValue(startData));
- setKeyValueAt(1.0, qVariantFromValue(endData));
+ setKeyValueAt(0.0, QVariant::fromValue(startData));
+ setKeyValueAt(1.0, QVariant::fromValue(endData));
}
void BoxWhiskersAnimation::setEndData(const BoxWhiskersData &endData)
@@ -104,7 +104,7 @@ void BoxWhiskersAnimation::setEndData(const BoxWhiskersData &endData)
if (state() != QAbstractAnimation::Stopped)
stop();
- setEndValue(qVariantFromValue(endData));
+ setEndValue(QVariant::fromValue(endData));
}
void BoxWhiskersAnimation::setStartData(const BoxWhiskersData &endData)
@@ -112,7 +112,7 @@ void BoxWhiskersAnimation::setStartData(const BoxWhiskersData &endData)
if (state() != QAbstractAnimation::Stopped)
stop();
- setStartValue(qVariantFromValue(endData));
+ setStartValue(QVariant::fromValue(endData));
}
QT_CHARTS_END_NAMESPACE
diff --git a/src/charts/animations/candlestickbodywicksanimation.cpp b/src/charts/animations/candlestickbodywicksanimation.cpp
index 7e9be617..aae5c0ff 100644
--- a/src/charts/animations/candlestickbodywicksanimation.cpp
+++ b/src/charts/animations/candlestickbodywicksanimation.cpp
@@ -58,8 +58,8 @@ CandlestickBodyWicksAnimation::~CandlestickBodyWicksAnimation()
void CandlestickBodyWicksAnimation::setup(const CandlestickData &startData,
const CandlestickData &endData)
{
- setKeyValueAt(0.0, qVariantFromValue(startData));
- setKeyValueAt(1.0, qVariantFromValue(endData));
+ setKeyValueAt(0.0, QVariant::fromValue(startData));
+ setKeyValueAt(1.0, QVariant::fromValue(endData));
}
void CandlestickBodyWicksAnimation::setStartData(const CandlestickData &startData)
@@ -67,7 +67,7 @@ void CandlestickBodyWicksAnimation::setStartData(const CandlestickData &startDat
if (state() != QAbstractAnimation::Stopped)
stop();
- setStartValue(qVariantFromValue(startData));
+ setStartValue(QVariant::fromValue(startData));
}
void CandlestickBodyWicksAnimation::setEndData(const CandlestickData &endData)
@@ -75,7 +75,7 @@ void CandlestickBodyWicksAnimation::setEndData(const CandlestickData &endData)
if (state() != QAbstractAnimation::Stopped)
stop();
- setEndValue(qVariantFromValue(endData));
+ setEndValue(QVariant::fromValue(endData));
}
void CandlestickBodyWicksAnimation::updateCurrentValue(const QVariant &value)
@@ -104,7 +104,7 @@ QVariant CandlestickBodyWicksAnimation::interpolated(const QVariant &from, const
result.m_high = median + progress * (endData.m_high - median);
}
- return qVariantFromValue(result);
+ return QVariant::fromValue(result);
}
QT_CHARTS_END_NAMESPACE
diff --git a/src/charts/animations/piesliceanimation.cpp b/src/charts/animations/piesliceanimation.cpp
index c2c17bc1..2efc0882 100644
--- a/src/charts/animations/piesliceanimation.cpp
+++ b/src/charts/animations/piesliceanimation.cpp
@@ -85,8 +85,8 @@ void PieSliceAnimation::setValue(const PieSliceData &startValue, const PieSliceD
m_currentValue = startValue;
- setKeyValueAt(0.0, qVariantFromValue(startValue));
- setKeyValueAt(1.0, qVariantFromValue(endValue));
+ setKeyValueAt(0.0, QVariant::fromValue(startValue));
+ setKeyValueAt(1.0, QVariant::fromValue(endValue));
}
void PieSliceAnimation::updateValue(const PieSliceData &endValue)
@@ -94,8 +94,8 @@ void PieSliceAnimation::updateValue(const PieSliceData &endValue)
if (state() != QAbstractAnimation::Stopped)
stop();
- setKeyValueAt(0.0, qVariantFromValue(m_currentValue));
- setKeyValueAt(1.0, qVariantFromValue(endValue));
+ setKeyValueAt(0.0, QVariant::fromValue(m_currentValue));
+ setKeyValueAt(1.0, QVariant::fromValue(endValue));
}
PieSliceData PieSliceAnimation::currentSliceValue()
@@ -123,7 +123,7 @@ QVariant PieSliceAnimation::interpolated(const QVariant &start, const QVariant &
result.m_sliceBrush = linearPos(startValue.m_sliceBrush, endValue.m_sliceBrush, progress);
result.m_holeRadius = linearPos(startValue.m_holeRadius, endValue.m_holeRadius, progress);
- return qVariantFromValue(result);
+ return QVariant::fromValue(result);
}
void PieSliceAnimation::updateCurrentValue(const QVariant &value)
diff --git a/src/charts/animations/splineanimation.cpp b/src/charts/animations/splineanimation.cpp
index 555c76dd..bc625532 100644
--- a/src/charts/animations/splineanimation.cpp
+++ b/src/charts/animations/splineanimation.cpp
@@ -119,8 +119,8 @@ void SplineAnimation::setup(QVector<QPointF> &oldPoints, QVector<QPointF> &newPo
}
- setKeyValueAt(0.0, qVariantFromValue(m_oldSpline));
- setKeyValueAt(1.0, qVariantFromValue(m_newSpline));
+ setKeyValueAt(0.0, QVariant::fromValue(m_oldSpline));
+ setKeyValueAt(1.0, QVariant::fromValue(m_newSpline));
m_valid = true;
@@ -173,7 +173,7 @@ QVariant SplineAnimation::interpolated(const QVariant &start, const QVariant &en
break;
}
- return qVariantFromValue(result);
+ return QVariant::fromValue(result);
}
void SplineAnimation::updateCurrentValue(const QVariant &value)
diff --git a/src/charts/animations/xyanimation.cpp b/src/charts/animations/xyanimation.cpp
index b96bf7f6..4cfa5972 100644
--- a/src/charts/animations/xyanimation.cpp
+++ b/src/charts/animations/xyanimation.cpp
@@ -97,8 +97,8 @@ void XYAnimation::setup(const QVector<QPointF> &oldPoints, const QVector<QPointF
else if (m_type == NewAnimation)
m_type = ReplacePointAnimation;
- setKeyValueAt(0.0, qVariantFromValue(m_oldPoints));
- setKeyValueAt(1.0, qVariantFromValue(m_newPoints));
+ setKeyValueAt(0.0, QVariant::fromValue(m_oldPoints));
+ setKeyValueAt(1.0, QVariant::fromValue(m_newPoints));
}
QVariant XYAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
@@ -133,7 +133,7 @@ QVariant XYAnimation::interpolated(const QVariant &start, const QVariant &end, q
break;
}
- return qVariantFromValue(result);
+ return QVariant::fromValue(result);
}
void XYAnimation::updateCurrentValue(const QVariant &value)
diff --git a/src/charts/axis/chartaxiselement.cpp b/src/charts/axis/chartaxiselement.cpp
index 62da84f4..8db5ef36 100644
--- a/src/charts/axis/chartaxiselement.cpp
+++ b/src/charts/axis/chartaxiselement.cpp
@@ -382,13 +382,13 @@ QString ChartAxisElement::formatLabel(const QString &formatSpec, const QByteArra
if (presenter()->localizeNumbers())
retVal = preStr + presenter()->locale().toString(qint64(value)) + postStr;
else
- retVal = QString().sprintf(array, qint64(value));
+ retVal = QString::asprintf(array.constData(), qint64(value));
} else if (formatSpec.at(0) == QLatin1Char('u')
|| formatSpec.at(0) == QLatin1Char('o')
|| formatSpec.at(0) == QLatin1Char('x')
|| formatSpec.at(0) == QLatin1Char('X')) {
// These formats are not supported by localized numbers
- retVal = QString().sprintf(array, quint64(value));
+ retVal = QString::asprintf(array.constData(), quint64(value));
} else if (formatSpec.at(0) == QLatin1Char('f')
|| formatSpec.at(0) == QLatin1Char('F')
|| formatSpec.at(0) == QLatin1Char('e')
@@ -401,7 +401,7 @@ QString ChartAxisElement::formatLabel(const QString &formatSpec, const QByteArra
precision)
+ postStr;
} else {
- retVal = QString().sprintf(array, value);
+ retVal = QString::asprintf(array.constData(), value);
}
}
}
diff --git a/src/charts/barchart/abstractbarchartitem.cpp b/src/charts/barchart/abstractbarchartitem.cpp
index 36bf81e9..56b48773 100644
--- a/src/charts/barchart/abstractbarchartitem.cpp
+++ b/src/charts/barchart/abstractbarchartitem.cpp
@@ -207,12 +207,9 @@ void AbstractBarChartItem::handleLayoutChanged()
void AbstractBarChartItem::handleLabelsVisibleChanged(bool visible)
{
bool newVisible = visible && m_series->isVisible();
- QMapIterator<QBarSet *, QList<Bar *> > i(m_barMap);
- while (i.hasNext()) {
- i.next();
- const QList<Bar *> &bars = i.value();
- for (int j = 0; j < bars.size(); j++) {
- QGraphicsTextItem *label = bars.at(j)->labelItem();
+ for (const QList<Bar *> &bars : qAsConst(m_barMap)) {
+ for (Bar *bar : bars) {
+ QGraphicsTextItem *label = bar->labelItem();
if (label)
label->setVisible(newVisible);
}
@@ -235,9 +232,7 @@ void AbstractBarChartItem::handleVisibleChanged()
bool visible = m_series->isVisible();
handleLabelsVisibleChanged(m_series->isLabelsVisible());
- QMapIterator<QBarSet *, QList<Bar *> > i(m_barMap);
- while (i.hasNext()) {
- i.next();
+ for (auto i = m_barMap.cbegin(), end = m_barMap.cend(); i != end; ++i) {
const QList<Bar *> &bars = i.value();
for (int j = 0; j < bars.size(); j++) {
Bar *bar = bars.at(j);
@@ -505,17 +500,14 @@ void AbstractBarChartItem::createLabelItems()
m_labelItemsMissing = false;
- QMapIterator<QBarSet *, QList<Bar *> > i(m_barMap);
- while (i.hasNext()) {
- i.next();
- const QList<Bar *> &bars = i.value();
- for (int j = 0; j < bars.size(); j++) {
- QGraphicsTextItem *label = bars.at(j)->labelItem();
+ for (const QList<Bar *> &bars : qAsConst(m_barMap)) {
+ for (Bar *bar : bars) {
+ QGraphicsTextItem *label = bar->labelItem();
if (!label) {
QGraphicsTextItem *newLabel = new QGraphicsTextItem(this);
newLabel->setAcceptHoverEvents(false);
newLabel->document()->setDocumentMargin(ChartPresenter::textMargin());
- bars.at(j)->setLabelItem(newLabel);
+ bar->setLabelItem(newLabel);
}
}
}
diff --git a/src/charts/glwidget.cpp b/src/charts/glwidget.cpp
index ff22050f..105e489a 100644
--- a/src/charts/glwidget.cpp
+++ b/src/charts/glwidget.cpp
@@ -327,10 +327,9 @@ void GLWidget::render(bool selection)
QOpenGLVertexArrayObject::Binder vaoBinder(&m_vao);
m_program->bind();
- GLXYDataMapIterator i(m_xyDataManager->dataMap());
int counter = 0;
- while (i.hasNext()) {
- i.next();
+ const auto &dataMap = m_xyDataManager->dataMap();
+ for (auto i = dataMap.begin(), end = dataMap.end(); i != end; ++i) {
QOpenGLBuffer *vbo = m_seriesBufferMap.value(i.key());
GLXYSeriesData *data = i.value();
diff --git a/src/charts/scroller.cpp b/src/charts/scroller.cpp
index 09809973..57a257c8 100644
--- a/src/charts/scroller.cpp
+++ b/src/charts/scroller.cpp
@@ -52,11 +52,11 @@ void Scroller::move(const QPointF &delta)
{
switch (m_state) {
case Pressed:
- m_timeStamp = QTime::currentTime();
+ m_timeStamp.restart();
break;
case Scroll:
stopTicker();
- m_timeStamp = QTime::currentTime();
+ m_timeStamp.restart();
break;
default:
break;
@@ -69,10 +69,10 @@ void Scroller::scrollTo(const QPointF &delta)
// Starts scrolling, if at least m_timeTresholdMin msecs has gone since timestamp
// current time is no more than m_timeTresholdMax from timestamp
- if ((m_timeStamp.elapsed() > m_timeTresholdMin) && (m_timeStamp.msecsTo(QTime::currentTime()) < m_timeTresholdMax)) {
+ if ((m_timeStamp.elapsed() > m_timeTresholdMin) && (m_timeStamp.elapsed() < m_timeTresholdMax)) {
// Release was quick enough. Start scrolling.
qreal interval = 25;
- qreal time = m_timeStamp.msecsTo(QTime::currentTime());
+ qreal time = m_timeStamp.elapsed();
if (qFuzzyCompare(time, 0)) {
m_speed = delta / 5;
} else {
diff --git a/src/charts/scroller_p.h b/src/charts/scroller_p.h
index 7cc7a4f6..1b7a8f69 100644
--- a/src/charts/scroller_p.h
+++ b/src/charts/scroller_p.h
@@ -42,7 +42,7 @@
#include <QtCharts/QChartGlobal>
#include <QtCore/QObject>
#include <QtCore/QBasicTimer>
-#include <QtCore/QTime>
+#include <QtCore/QElapsedTimer>
#include <QtCore/QPointF>
#include <QtCharts/private/qchartglobal_p.h>
@@ -105,7 +105,7 @@ private:
private:
ScrollTicker m_ticker;
- QTime m_timeStamp;
+ QElapsedTimer m_timeStamp;
QPointF m_speed;
QPointF m_fraction;
int m_timeTresholdMin;
diff --git a/src/charts/xychart/glxyseriesdata_p.h b/src/charts/xychart/glxyseriesdata_p.h
index 006a810c..2db3e490 100644
--- a/src/charts/xychart/glxyseriesdata_p.h
+++ b/src/charts/xychart/glxyseriesdata_p.h
@@ -77,7 +77,6 @@ public:
};
typedef QMap<const QXYSeries *, GLXYSeriesData *> GLXYDataMap;
-typedef QMapIterator<const QXYSeries *, GLXYSeriesData *> GLXYDataMapIterator;
class Q_CHARTS_PRIVATE_EXPORT GLXYSeriesDataManager : public QObject
{
diff --git a/src/chartsqml2/declarativeopenglrendernode.cpp b/src/chartsqml2/declarativeopenglrendernode.cpp
index 685c331b..58f7aef6 100644
--- a/src/chartsqml2/declarativeopenglrendernode.cpp
+++ b/src/chartsqml2/declarativeopenglrendernode.cpp
@@ -225,9 +225,7 @@ void DeclarativeOpenGLRenderNode::setSeriesData(bool mapDirty, const GLXYDataMap
GLXYDataMap oldMap = m_xyDataMap;
m_xyDataMap.clear();
- GLXYDataMapIterator i(dataMap);
- while (i.hasNext()) {
- i.next();
+ for (auto i = dataMap.begin(), end = dataMap.end(); i != end; ++i) {
GLXYSeriesData *data = oldMap.take(i.key());
const GLXYSeriesData *newData = i.value();
if (!data || newData->dirty) {
@@ -237,18 +235,14 @@ void DeclarativeOpenGLRenderNode::setSeriesData(bool mapDirty, const GLXYDataMap
m_xyDataMap.insert(i.key(), data);
}
// Delete remaining old data
- i = oldMap;
- while (i.hasNext()) {
- i.next();
+ for (auto i = oldMap.begin(), end = oldMap.end(); i != end; ++i) {
delete i.value();
cleanXYSeriesResources(i.key());
}
dirty = true;
} else {
// Series have not changed, so just copy dirty data over
- GLXYDataMapIterator i(dataMap);
- while (i.hasNext()) {
- i.next();
+ for (auto i = dataMap.begin(), end = dataMap.end(); i != end; ++i) {
const GLXYSeriesData *newData = i.value();
if (i.value()->dirty) {
dirty = true;
@@ -308,10 +302,8 @@ void DeclarativeOpenGLRenderNode::renderGL(bool selection)
glViewport(0, 0, m_textureSize.width(), m_textureSize.height());
- GLXYDataMapIterator i(m_xyDataMap);
int counter = 0;
- while (i.hasNext()) {
- i.next();
+ for (auto i = m_xyDataMap.begin(), end = m_xyDataMap.end(); i != end; ++i) {
QOpenGLBuffer *vbo = m_seriesBufferMap.value(i.key());
GLXYSeriesData *data = i.value();
diff --git a/tests/auto/qbarseries/BLACKLIST b/tests/auto/qbarseries/BLACKLIST
index ea01d313..a1b10c85 100644
--- a/tests/auto/qbarseries/BLACKLIST
+++ b/tests/auto/qbarseries/BLACKLIST
@@ -1,2 +1,2 @@
[mousehovered]
-ci
+macos
diff --git a/tests/manual/chartviewer/window.cpp b/tests/manual/chartviewer/window.cpp
index 9af09d69..4d41da64 100644
--- a/tests/manual/chartviewer/window.cpp
+++ b/tests/manual/chartviewer/window.cpp
@@ -421,10 +421,7 @@ void Window::checkOpenGL()
bool antialias = m_antialiasCheckBox->isChecked();
- if (opengl)
- m_view->setRenderHint(QPainter::HighQualityAntialiasing, antialias);
- else
- m_view->setRenderHint(QPainter::Antialiasing, antialias);
+ m_view->setRenderHint(QPainter::Antialiasing, antialias);
}
void Window::checkAnimationOptions()
@@ -574,7 +571,7 @@ QMenu *Window::createMenu()
foreach (Chart *chart, subCategoryMap.values(subCategory)) {
createMenuAction(subMenu, QIcon(), chart->name(),
- qVariantFromValue((void *) chart));
+ QVariant::fromValue(static_cast<void *>(chart)));
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 14:24:04 +0000