diff options
Diffstat (limited to 'src')
55 files changed, 247 insertions, 247 deletions
diff --git a/src/charts/animations/axisanimation.cpp b/src/charts/animations/axisanimation.cpp index 61d9d06e..183abc3a 100644 --- a/src/charts/animations/axisanimation.cpp +++ b/src/charts/animations/axisanimation.cpp @@ -44,42 +44,42 @@ void AxisAnimation::setValues(QList<qreal> &oldLayout, const QList<qreal> &newLa switch (m_type) { case ZoomOutAnimation: { QRectF rect = m_axis->gridGeometry(); - oldLayout.resize(newLayout.count()); + oldLayout.resize(newLayout.size()); - for (int i = 0, j = oldLayout.count() - 1; i < (oldLayout.count() + 1) / 2; ++i, --j) { + for (int i = 0, j = oldLayout.size() - 1; i < (oldLayout.size() + 1) / 2; ++i, --j) { oldLayout[i] = m_axis->axis()->orientation() == Qt::Horizontal ? rect.left() : rect.bottom(); oldLayout[j] = m_axis->axis()->orientation() == Qt::Horizontal ? rect.right() : rect.top(); } } break; case ZoomInAnimation: { - int index = qMin(oldLayout.count() * (m_axis->axis()->orientation() == Qt::Horizontal ? m_point.x() : (1 - m_point.y())), newLayout.count() - (qreal)1.0); - oldLayout.resize(newLayout.count()); + int index = qMin(oldLayout.size() * (m_axis->axis()->orientation() == Qt::Horizontal ? m_point.x() : (1 - m_point.y())), newLayout.size() - (qreal)1.0); + oldLayout.resize(newLayout.size()); if (index < 0) break; - for (int i = 0; i < oldLayout.count(); i++) + for (int i = 0; i < oldLayout.size(); i++) oldLayout[i] = oldLayout[index]; } break; case MoveForwardAnimation: { - oldLayout.resize(newLayout.count()); + oldLayout.resize(newLayout.size()); - for (int i = 0, j = i + 1; i < oldLayout.count() - 1; ++i, ++j) + for (int i = 0, j = i + 1; i < oldLayout.size() - 1; ++i, ++j) oldLayout[i] = oldLayout[j]; } break; case MoveBackwordAnimation: { - oldLayout.resize(newLayout.count()); + oldLayout.resize(newLayout.size()); - for (int i = oldLayout.count() - 1, j = i - 1; i > 0; --i, --j) + for (int i = oldLayout.size() - 1, j = i - 1; i > 0; --i, --j) oldLayout[i] = oldLayout[j]; } break; default: { - oldLayout.resize(newLayout.count()); + oldLayout.resize(newLayout.size()); QRectF rect = m_axis->gridGeometry(); - for (int i = 0, j = oldLayout.count() - 1; i < oldLayout.count(); ++i, --j) + for (int i = 0, j = oldLayout.size() - 1; i < oldLayout.size(); ++i, --j) oldLayout[i] = m_axis->axis()->orientation() == Qt::Horizontal ? rect.left() : rect.top(); } break; @@ -97,9 +97,9 @@ QVariant AxisAnimation::interpolated(const QVariant &start, const QVariant &end, const auto endList = qvariant_cast<QList<qreal>>(end); QList<qreal> result; - Q_ASSERT(startList.count() == endList.count()); + Q_ASSERT(startList.size() == endList.size()); - for (int i = 0; i < startList.count(); i++) { + for (int i = 0; i < startList.size(); i++) { const qreal value = startList[i] + ((endList[i] - startList[i]) * progress); result << value; } diff --git a/src/charts/animations/baranimation.cpp b/src/charts/animations/baranimation.cpp index bed040b8..76411785 100644 --- a/src/charts/animations/baranimation.cpp +++ b/src/charts/animations/baranimation.cpp @@ -26,9 +26,9 @@ QVariant BarAnimation::interpolated(const QVariant &from, const QVariant &to, qr const QList<QRectF> endList = qvariant_cast<QList<QRectF>>(to); QList<QRectF> result; - Q_ASSERT(startList.count() == endList.count()); + Q_ASSERT(startList.size() == endList.size()); - for (int i = 0; i < startList.count(); i++) { + for (int i = 0; i < startList.size(); i++) { const QRectF start = startList[i].normalized(); const QRectF end = endList[i].normalized(); const qreal x1 = start.left() + progress * (end.left() - start.left()); diff --git a/src/charts/animations/splineanimation.cpp b/src/charts/animations/splineanimation.cpp index 0cd109b3..acec5401 100644 --- a/src/charts/animations/splineanimation.cpp +++ b/src/charts/animations/splineanimation.cpp @@ -25,7 +25,7 @@ void SplineAnimation::setup(const QList<QPointF> &oldPoints, const QList<QPointF const QList<QPointF> &oldControlPoints, const QList<QPointF> &newControlPoints, int index) { - if (newPoints.count() * 2 - 2 != newControlPoints.count() || newControlPoints.count() < 2) { + if (newPoints.size() * 2 - 2 != newControlPoints.size() || newControlPoints.size() < 2) { m_valid = false; m_dirty = false; m_item->setGeometryPoints(newPoints); @@ -52,8 +52,8 @@ void SplineAnimation::setup(const QList<QPointF> &oldPoints, const QList<QPointF m_newSpline.second = newControlPoints; - int x = m_oldSpline.first.count(); - int y = m_newSpline.first.count(); + int x = m_oldSpline.first.size(); + int y = m_newSpline.first.size(); if (x - y == 1 && index >= 0 && y > 0) { //remove point @@ -85,8 +85,8 @@ void SplineAnimation::setup(const QList<QPointF> &oldPoints, const QList<QPointF m_type = AddPointAnimation; } - x = m_oldSpline.first.count(); - y = m_newSpline.first.count(); + x = m_oldSpline.first.size(); + y = m_newSpline.first.size(); if (x != y) { m_type = NewAnimation; @@ -113,15 +113,15 @@ QVariant SplineAnimation::interpolated(const QVariant &start, const QVariant &en case RemovePointAnimation: case AddPointAnimation: case ReplacePointAnimation: { - if (startPair.first.count() != endPair.first.count()) + if (startPair.first.size() != endPair.first.size()) break; - Q_ASSERT(startPair.first.count() * 2 - 2 == startPair.second.count()); - Q_ASSERT(endPair.first.count() * 2 - 2 == endPair.second.count()); - for (int i = 0; i < endPair.first.count(); i++) { + Q_ASSERT(startPair.first.size() * 2 - 2 == startPair.second.size()); + Q_ASSERT(endPair.first.size() * 2 - 2 == endPair.second.size()); + for (int i = 0; i < endPair.first.size(); i++) { qreal x = startPair.first[i].x() + ((endPair.first[i].x() - startPair.first[i].x()) * progress); qreal y = startPair.first[i].y() + ((endPair.first[i].y() - startPair.first[i].y()) * progress); result.first << QPointF(x, y); - if (i + 1 >= endPair.first.count()) + if (i + 1 >= endPair.first.size()) continue; x = startPair.second[i * 2].x() + ((endPair.second[i * 2].x() - startPair.second[i * 2].x()) * progress); y = startPair.second[i * 2].y() + ((endPair.second[i * 2].y() - startPair.second[i * 2].y()) * progress); @@ -133,8 +133,8 @@ QVariant SplineAnimation::interpolated(const QVariant &start, const QVariant &en } break; case NewAnimation: { - Q_ASSERT(endPair.first.count() * 2 - 2 == endPair.second.count()); - int count = endPair.first.count() * qBound(qreal(0), progress, qreal(1)); + Q_ASSERT(endPair.first.size() * 2 - 2 == endPair.second.size()); + int count = endPair.first.size() * qBound(qreal(0), progress, qreal(1)); for (int i = 0; i < count; i++) { result.first << endPair.first[i]; if (i + 1 == count) diff --git a/src/charts/animations/xyanimation.cpp b/src/charts/animations/xyanimation.cpp index 330c474a..95ed2f29 100644 --- a/src/charts/animations/xyanimation.cpp +++ b/src/charts/animations/xyanimation.cpp @@ -40,10 +40,10 @@ void XYAnimation::setup(const QList<QPointF> &oldPoints, const QList<QPointF> &n m_newPoints = newPoints; - int x = m_oldPoints.count(); - int y = m_newPoints.count(); + int x = m_oldPoints.size(); + int y = m_newPoints.size(); int diff = x - y; - int requestedDiff = oldPoints.count() - y; + int requestedDiff = oldPoints.size() - y; // m_oldPoints can be whatever between 0 and actual points count if new animation setup // interrupts a previous animation, so only do remove and add animations if both @@ -63,8 +63,8 @@ void XYAnimation::setup(const QList<QPointF> &oldPoints, const QList<QPointF> &n m_type = AddPointAnimation; } - x = m_oldPoints.count(); - y = m_newPoints.count(); + x = m_oldPoints.size(); + y = m_newPoints.size(); if (x != y) m_type = NewAnimation; @@ -86,10 +86,10 @@ QVariant XYAnimation::interpolated(const QVariant &start, const QVariant &end, q case ReplacePointAnimation: case AddPointAnimation: case RemovePointAnimation: { - if (startList.count() != endList.count()) + if (startList.size() != endList.size()) break; - for (int i = 0; i < startList.count(); i++) { + for (int i = 0; i < startList.size(); i++) { qreal x = startList[i].x() + ((endList[i].x() - startList[i].x()) * progress); qreal y = startList[i].y() + ((endList[i].y() - startList[i].y()) * progress); result << QPointF(x, y); @@ -98,7 +98,7 @@ QVariant XYAnimation::interpolated(const QVariant &start, const QVariant &end, q } break; case NewAnimation: { - for (int i = 0; i < endList.count() * qBound(qreal(0), progress, qreal(1)); i++) + for (int i = 0; i < endList.size() * qBound(qreal(0), progress, qreal(1)); i++) result << endList[i]; } break; diff --git a/src/charts/areachart/qareaseries.cpp b/src/charts/areachart/qareaseries.cpp index 892a21c3..4a5c087b 100644 --- a/src/charts/areachart/qareaseries.cpp +++ b/src/charts/areachart/qareaseries.cpp @@ -683,7 +683,7 @@ void QAreaSeriesPrivate::initializeDomain() maxX = minX; maxY = minY; - for (int i = 0; i < points.count(); i++) { + for (int i = 0; i < points.size(); i++) { qreal x = points[i].x(); qreal y = points[i].y(); minX = qMin(minX, x); @@ -704,7 +704,7 @@ void QAreaSeriesPrivate::initializeDomain() maxY = minY; } - for (int i = 0; i < points.count(); i++) { + for (int i = 0; i < points.size(); i++) { qreal x = points[i].x(); qreal y = points[i].y(); minX = qMin(minX, x); diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp index f771395f..219f03af 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp @@ -53,9 +53,9 @@ QStringList ChartBarCategoryAxisX::createCategoryLabels(const QList<qreal> &layo const QRectF &gridRect = gridGeometry(); const qreal d = (max() - min()) / gridRect.width(); - for (int i = 0; i < layout.count() - 1; ++i) { + for (int i = 0; i < layout.size() - 1; ++i) { int x = qFloor((((layout[i] + layout[i + 1]) / 2 - gridRect.left()) * d + min() + 0.5)); - if (x < max() && (x >= 0) && x < m_categoriesAxis->categories().count()) { + if (x < max() && (x >= 0) && x < m_categoriesAxis->categories().size()) { result << m_categoriesAxis->categories().at(x); } else { // No label for x coordinate diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp index 616b4be6..78c1c8d8 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp @@ -53,9 +53,9 @@ QStringList ChartBarCategoryAxisY::createCategoryLabels(const QList<qreal> &layo const QRectF &gridRect = gridGeometry(); const qreal d = (max() - min()) / gridRect.height(); - for (int i = 0; i < layout.count() - 1; ++i) { + for (int i = 0; i < layout.size() - 1; ++i) { int x = qFloor(((gridRect.height() - (layout[i + 1] + layout[i]) / 2 + gridRect.top()) * d + min() + 0.5)); - if ((x < m_categoriesAxis->categories().count()) && (x >= 0)) { + if ((x < m_categoriesAxis->categories().size()) && (x >= 0)) { result << m_categoriesAxis->categories().at(x); } else { // No label for x coordinate diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp index 5612fa74..2cf8fe03 100644 --- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp +++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp @@ -176,7 +176,7 @@ void QBarCategoryAxis::append(const QStringList &categories) Q_D(QBarCategoryAxis); - int count = d->m_categories.count(); + int count = d->m_categories.size(); foreach(QString category, categories) { if (!d->m_categories.contains(category) && !category.isNull()) { @@ -184,7 +184,7 @@ void QBarCategoryAxis::append(const QStringList &categories) } } - if (d->m_categories.count() == count) + if (d->m_categories.size() == count) return; if (count == 0) @@ -208,12 +208,12 @@ void QBarCategoryAxis::append(const QString &category) { Q_D(QBarCategoryAxis); - int count = d->m_categories.count(); + int count = d->m_categories.size(); if (!d->m_categories.contains(category) && !category.isNull()) d->m_categories.append(category); - if (d->m_categories.count() == count) + if (d->m_categories.size() == count) return; if (count == 0) @@ -260,12 +260,12 @@ void QBarCategoryAxis::insert(int index, const QString &category) { Q_D(QBarCategoryAxis); - int count = d->m_categories.count(); + int count = d->m_categories.size(); if (!d->m_categories.contains(category) && !category.isNull()) d->m_categories.insert(index, category); - if (d->m_categories.count() == count) + if (d->m_categories.size() == count) return; if (count == 0) { @@ -351,7 +351,7 @@ QStringList QBarCategoryAxis::categories() int QBarCategoryAxis::count() const { Q_D(const QBarCategoryAxis); - return d->m_categories.count(); + return d->m_categories.size(); } /*! @@ -464,7 +464,7 @@ void QBarCategoryAxisPrivate::setRange(qreal min, qreal max) changed = true; int imin = m_min + 0.5; - if (imin >= 0 && imin < m_categories.count()) { + if (imin >= 0 && imin < m_categories.size()) { QString minCategory = m_categories.at(imin); if (m_minCategory != minCategory && !minCategory.isEmpty()) { m_minCategory = minCategory; @@ -480,7 +480,7 @@ void QBarCategoryAxisPrivate::setRange(qreal min, qreal max) changed = true; int imax = m_max - 0.5; - if (imax >= 0 && imax < m_categories.count()) { + if (imax >= 0 && imax < m_categories.size()) { QString maxCategory = m_categories.at(imax); if (m_maxCategory != maxCategory && !maxCategory.isEmpty()) { m_maxCategory = maxCategory; @@ -592,7 +592,7 @@ void QBarCategoryAxisPrivate::initializeDomain(AbstractDomain *domain) max = domain->maxX() - 0.5; } - if (min > 0 && min < m_categories.count() && max > 0 && max < m_categories.count()) + if (min > 0 && min < m_categories.size() && max > 0 && max < m_categories.size()) q->setRange(m_categories.at(min), m_categories.at(max)); } else { if (orientation() == Qt::Vertical) diff --git a/src/charts/axis/cartesianchartaxis.cpp b/src/charts/axis/cartesianchartaxis.cpp index 9f913df6..30263754 100644 --- a/src/charts/axis/cartesianchartaxis.cpp +++ b/src/charts/axis/cartesianchartaxis.cpp @@ -360,7 +360,7 @@ void CartesianChartAxis::updateLabelsValues(QValueAxis *axis) const qreal ticksFromAnchor = (anchor - min()) / interval; const qreal firstMajorTick = anchor - std::floor(ticksFromAnchor) * interval; - int i = axis->isReverse() ? labelItems().count()-1 : 0; + int i = axis->isReverse() ? labelItems().size()-1 : 0; qreal value = firstMajorTick; while (value <= max()) { static_cast<ValueAxisLabel *>(labelItems().at(i))->setValue(value); diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp b/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp index ea5bfecd..e5efe135 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp +++ b/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp @@ -24,7 +24,7 @@ ChartCategoryAxisX::~ChartCategoryAxisX() QList<qreal> ChartCategoryAxisX::calculateLayout() const { - int tickCount = m_axis->categoriesLabels().count() + 1; + int tickCount = m_axis->categoriesLabels().size() + 1; QList<qreal> points; if (tickCount < 2) diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp b/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp index 425f67d9..9585793a 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp +++ b/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp @@ -25,7 +25,7 @@ ChartCategoryAxisY::~ChartCategoryAxisY() QList<qreal> ChartCategoryAxisY::calculateLayout() const { - int tickCount = m_axis->categoriesLabels().count() + 1; + int tickCount = m_axis->categoriesLabels().size() + 1; QList<qreal> points; if (tickCount < 2) diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp index cc6a6671..b0349b7c 100644 --- a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp +++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp @@ -22,7 +22,7 @@ PolarChartCategoryAxisAngular::~PolarChartCategoryAxisAngular() QList<qreal> PolarChartCategoryAxisAngular::calculateLayout() const { QCategoryAxis *catAxis = static_cast<QCategoryAxis *>(axis()); - int tickCount = catAxis->categoriesLabels().count() + 1; + int tickCount = catAxis->categoriesLabels().size() + 1; QList<qreal> points; if (tickCount < 2) diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp index 9109322f..c27c86b9 100644 --- a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp +++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp @@ -22,7 +22,7 @@ PolarChartCategoryAxisRadial::~PolarChartCategoryAxisRadial() QList<qreal> PolarChartCategoryAxisRadial::calculateLayout() const { QCategoryAxis *catAxis = static_cast<QCategoryAxis *>(axis()); - int tickCount = catAxis->categoriesLabels().count() + 1; + int tickCount = catAxis->categoriesLabels().size() + 1; QList<qreal> points; if (tickCount < 2) diff --git a/src/charts/axis/categoryaxis/qcategoryaxis.cpp b/src/charts/axis/categoryaxis/qcategoryaxis.cpp index 19756ea6..5f8b2f8f 100644 --- a/src/charts/axis/categoryaxis/qcategoryaxis.cpp +++ b/src/charts/axis/categoryaxis/qcategoryaxis.cpp @@ -231,7 +231,7 @@ void QCategoryAxis::remove(const QString &categoryLabel) d->m_categoriesMap.remove(categoryLabel); // the range of the interval that follows (if exists) needs to be updated - if (labelIndex < d->m_categories.count()) { + if (labelIndex < d->m_categories.size()) { QString label = d->m_categories.at(labelIndex); Range range = d->m_categoriesMap.value(label); @@ -287,7 +287,7 @@ QStringList QCategoryAxis::categoriesLabels() int QCategoryAxis::count() const { Q_D(const QCategoryAxis); - return d->m_categories.count(); + return d->m_categories.size(); } /*! @@ -330,7 +330,7 @@ QCategoryAxisPrivate::~QCategoryAxisPrivate() int QCategoryAxisPrivate::ticksCount() const { - return m_categories.count() + 1; + return m_categories.size() + 1; } void QCategoryAxisPrivate::initializeGraphics(QGraphicsItem *parent) diff --git a/src/charts/axis/chartaxiselement.cpp b/src/charts/axis/chartaxiselement.cpp index c230bd6a..1723ba29 100644 --- a/src/charts/axis/chartaxiselement.cpp +++ b/src/charts/axis/chartaxiselement.cpp @@ -433,7 +433,7 @@ void ChartAxisElement::prepareColorScale(const qreal width, const qreal height) gradient.setColorAt(stop.first, stop.second); } else { gradient = QLinearGradient(QPointF(0, 0), QPointF(0, height)); - for (int i = colorAxis->gradient().stops().length() - 1; i >= 0; --i) { + for (int i = colorAxis->gradient().stops().size() - 1; i >= 0; --i) { const auto &stop = colorAxis->gradient().stops()[i]; gradient.setColorAt(1 - stop.first, stop.second); } diff --git a/src/charts/axis/editableaxislabel.cpp b/src/charts/axis/editableaxislabel.cpp index ce09227d..1582cd7b 100644 --- a/src/charts/axis/editableaxislabel.cpp +++ b/src/charts/axis/editableaxislabel.cpp @@ -76,7 +76,7 @@ QRectF EditableAxisLabel::boundingRect() const bool EditableAxisLabel::isEditEndingKeyPress(QKeyEvent *event) { - if (event->text().length() >= 1) { + if (event->text().size() >= 1) { // finish editing with enter or ESC if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) { diff --git a/src/charts/axis/horizontalaxis.cpp b/src/charts/axis/horizontalaxis.cpp index 954ba23c..930d953a 100644 --- a/src/charts/axis/horizontalaxis.cpp +++ b/src/charts/axis/horizontalaxis.cpp @@ -140,7 +140,7 @@ void HorizontalAxis::updateGeometry() //label text wrapping QString text; if (axis()->isReverse() && axis()->type() != QAbstractAxis::AxisTypeCategory) - text = labelList.at(labelList.count() - i - 1); + text = labelList.at(labelList.size() - i - 1); else text = labelList.at(i); @@ -151,7 +151,7 @@ void HorizontalAxis::updateGeometry() } else { QString displayText = text; if (axis()->truncateLabels()) { - qreal labelWidth = axisRect.width() / layout.count() - (2 * labelPadding()); + qreal labelWidth = axisRect.width() / layout.size() - (2 * labelPadding()); // Replace digits with ellipsis "..." if number does not fit displayText = ChartPresenter::truncatedText(axis()->labelsFont(), text, axis()->labelsAngle(), @@ -492,7 +492,7 @@ void HorizontalAxis::updateMinorTickGeometry() minorArrowLineItem->setVisible(minorGridLineVisible); } } else { - if (minorTickCount < 1 || tickSpacing == 0.0 || minorTickSpacings.count() != minorTickCount) + if (minorTickCount < 1 || tickSpacing == 0.0 || minorTickSpacings.size() != minorTickCount) return; for (int i = 0; i < layout.size() - 1; ++i) { diff --git a/src/charts/axis/polarchartaxisangular.cpp b/src/charts/axis/polarchartaxisangular.cpp index f4f51059..2f6269c1 100644 --- a/src/charts/axis/polarchartaxisangular.cpp +++ b/src/charts/axis/polarchartaxisangular.cpp @@ -244,7 +244,7 @@ Qt::Orientation PolarChartAxisAngular::orientation() const void PolarChartAxisAngular::createItems(int count) { - if (arrowItems().count() == 0) { + if (arrowItems().size() == 0) { // angular axis line QGraphicsEllipseItem *arrow = new QGraphicsEllipseItem(presenter()->rootItem()); arrow->setPen(axis()->linePen()); @@ -532,7 +532,7 @@ void PolarChartAxisAngular::updateMinorTickGeometry() break; } - if (minorTickCount < 1 || tickAngle == 0.0 || minorTickAngles.count() != minorTickCount) + if (minorTickCount < 1 || tickAngle == 0.0 || minorTickAngles.size() != minorTickCount) return; const QPointF axisCenter = axisGeometry().center(); diff --git a/src/charts/axis/polarchartaxisradial.cpp b/src/charts/axis/polarchartaxisradial.cpp index a692d9ba..46d8ca77 100644 --- a/src/charts/axis/polarchartaxisradial.cpp +++ b/src/charts/axis/polarchartaxisradial.cpp @@ -231,7 +231,7 @@ Qt::Orientation PolarChartAxisRadial::orientation() const void PolarChartAxisRadial::createItems(int count) { - if (arrowItems().count() == 0) { + if (arrowItems().size() == 0) { // radial axis center line QGraphicsLineItem *arrow = new LineArrowItem(this, presenter()->rootItem()); arrow->setPen(axis()->linePen()); @@ -398,7 +398,7 @@ void PolarChartAxisRadial::updateMinorTickGeometry() break; } - if (minorTickCount < 1 || tickRadius == 0.0 || minorTickRadiuses.count() != minorTickCount) + if (minorTickCount < 1 || tickRadius == 0.0 || minorTickRadiuses.size() != minorTickCount) return; const QPointF axisCenter = axisGeometry().center(); diff --git a/src/charts/axis/valueaxis/valueaxislabel.cpp b/src/charts/axis/valueaxis/valueaxislabel.cpp index ba841ad3..b576d75c 100644 --- a/src/charts/axis/valueaxis/valueaxislabel.cpp +++ b/src/charts/axis/valueaxis/valueaxislabel.cpp @@ -58,7 +58,7 @@ void ValueAxisLabel::keyPressEvent(QKeyEvent *event) return; } - if (event->text().length() >= 1) { + if (event->text().size() >= 1) { QLocale locale; if (!event->text().at(0).isDigit() && event->text().at(0) != locale.decimalPoint() diff --git a/src/charts/axis/verticalaxis.cpp b/src/charts/axis/verticalaxis.cpp index d04bd3b0..6ca65c07 100644 --- a/src/charts/axis/verticalaxis.cpp +++ b/src/charts/axis/verticalaxis.cpp @@ -147,7 +147,7 @@ void VerticalAxis::updateGeometry() //label text wrapping QString text; if (axis()->isReverse() && axis()->type() != QAbstractAxis::AxisTypeCategory) - text = labelList.at(labelList.count() - i - 1); + text = labelList.at(labelList.size() - i - 1); else text = labelList.at(i); @@ -158,7 +158,7 @@ void VerticalAxis::updateGeometry() } else { QString displayText = text; if (axis()->truncateLabels()) { - qreal labelHeight = (axisRect.height() / layout.count()) - (2 * labelPadding()); + qreal labelHeight = (axisRect.height() / layout.size()) - (2 * labelPadding()); // Replace digits with ellipsis "..." if number does not fit displayText = ChartPresenter::truncatedText(axis()->labelsFont(), text, axis()->labelsAngle(), @@ -507,7 +507,7 @@ void VerticalAxis::updateMinorTickGeometry() minorArrowLineItem->setVisible(minorGridLineVisible); } } else { - if (minorTickCount < 1 || tickSpacing == 0.0 || minorTickSpacings.count() != minorTickCount) + if (minorTickCount < 1 || tickSpacing == 0.0 || minorTickSpacings.size() != minorTickCount) return; for (int i = 0; i < layout.size() - 1; ++i) { diff --git a/src/charts/barchart/abstractbarchartitem.cpp b/src/charts/barchart/abstractbarchartitem.cpp index 1335fd47..23bce577 100644 --- a/src/charts/barchart/abstractbarchartitem.cpp +++ b/src/charts/barchart/abstractbarchartitem.cpp @@ -377,7 +377,7 @@ void AbstractBarChartItem::handleBarValueRemove(int index, int count, QBarSet *b // make sure labels are not visible for removed bars const auto bars = m_barMap.value(barset); - for (int c = barset->count(); c < bars.count(); ++c) { + for (int c = barset->count(); c < bars.size(); ++c) { auto label = bars.at(c)->labelItem(); if (label) label->setVisible(false); diff --git a/src/charts/barchart/qabstractbarseries.cpp b/src/charts/barchart/qabstractbarseries.cpp index 9e9c37fd..e25765ec 100644 --- a/src/charts/barchart/qabstractbarseries.cpp +++ b/src/charts/barchart/qabstractbarseries.cpp @@ -542,7 +542,7 @@ void QAbstractBarSeries::clear() int QAbstractBarSeries::count() const { Q_D(const QAbstractBarSeries); - return d->m_barSets.count(); + return d->m_barSets.size(); } /*! @@ -659,7 +659,7 @@ int QAbstractBarSeriesPrivate::categoryCount() const { // No categories defined. return count of longest set. int count = 0; - for (int i = 0; i < m_barSets.count(); i++) { + for (int i = 0; i < m_barSets.size(); i++) { if (m_barSets.at(i)->count() > count) count = m_barSets.at(i)->count(); } @@ -699,12 +699,12 @@ void QAbstractBarSeriesPrivate::setLabelsVisible(bool visible) qreal QAbstractBarSeriesPrivate::min() { - if (m_barSets.count() <= 0) + if (m_barSets.size() <= 0) return 0; qreal min = INT_MAX; - for (int i = 0; i < m_barSets.count(); i++) { + for (int i = 0; i < m_barSets.size(); i++) { int categoryCount = m_barSets.at(i)->count(); for (int j = 0; j < categoryCount; j++) { qreal temp = m_barSets.at(i)->at(j); @@ -717,12 +717,12 @@ qreal QAbstractBarSeriesPrivate::min() qreal QAbstractBarSeriesPrivate::max() { - if (m_barSets.count() <= 0) + if (m_barSets.size() <= 0) return 0; qreal max = INT_MIN; - for (int i = 0; i < m_barSets.count(); i++) { + for (int i = 0; i < m_barSets.size(); i++) { int categoryCount = m_barSets.at(i)->count(); for (int j = 0; j < categoryCount; j++) { qreal temp = m_barSets.at(i)->at(j); @@ -736,7 +736,7 @@ qreal QAbstractBarSeriesPrivate::max() qreal QAbstractBarSeriesPrivate::valueAt(int set, int category) { - if ((set < 0) || (set >= m_barSets.count())) + if ((set < 0) || (set >= m_barSets.size())) return 0; // No set, no value. else if ((category < 0) || (category >= m_barSets.at(set)->count())) return 0; // No category, no value. @@ -746,7 +746,7 @@ qreal QAbstractBarSeriesPrivate::valueAt(int set, int category) qreal QAbstractBarSeriesPrivate::percentageAt(int set, int category) { - if ((set < 0) || (set >= m_barSets.count())) + if ((set < 0) || (set >= m_barSets.size())) return 0; // No set, no value. else if ((category < 0) || (category >= m_barSets.at(set)->count())) return 0; // No category, no value. @@ -762,7 +762,7 @@ qreal QAbstractBarSeriesPrivate::percentageAt(int set, int category) qreal QAbstractBarSeriesPrivate::categorySum(int category) { qreal sum(0); - int count = m_barSets.count(); // Count sets + int count = m_barSets.size(); // Count sets for (int set = 0; set < count; set++) { if (category < m_barSets.at(set)->count()) sum += m_barSets.at(set)->at(category); @@ -773,7 +773,7 @@ qreal QAbstractBarSeriesPrivate::categorySum(int category) qreal QAbstractBarSeriesPrivate::absoluteCategorySum(int category) { qreal sum(0); - int count = m_barSets.count(); // Count sets + int count = m_barSets.size(); // Count sets for (int set = 0; set < count; set++) { if (category < m_barSets.at(set)->count()) sum += qAbs(m_barSets.at(set)->at(category)); @@ -795,12 +795,12 @@ qreal QAbstractBarSeriesPrivate::maxCategorySum() qreal QAbstractBarSeriesPrivate::minX() { - if (m_barSets.count() <= 0) + if (m_barSets.size() <= 0) return 0; qreal min = INT_MAX; - for (int i = 0; i < m_barSets.count(); i++) { + for (int i = 0; i < m_barSets.size(); i++) { int categoryCount = m_barSets.at(i)->count(); for (int j = 0; j < categoryCount; j++) { qreal temp = m_barSets.at(i)->d_ptr.data()->m_values.at(j).x(); @@ -813,12 +813,12 @@ qreal QAbstractBarSeriesPrivate::minX() qreal QAbstractBarSeriesPrivate::maxX() { - if (m_barSets.count() <= 0) + if (m_barSets.size() <= 0) return 0; qreal max = INT_MIN; - for (int i = 0; i < m_barSets.count(); i++) { + for (int i = 0; i < m_barSets.size(); i++) { int categoryCount = m_barSets.at(i)->count(); for (int j = 0; j < categoryCount; j++) { qreal temp = m_barSets.at(i)->d_ptr.data()->m_values.at(j).x(); @@ -835,7 +835,7 @@ qreal QAbstractBarSeriesPrivate::categoryTop(int category) // Returns top (sum of all positive values) of category. // Returns 0, if all values are negative qreal top(0); - int count = m_barSets.count(); + int count = m_barSets.size(); for (int set = 0; set < count; set++) { if (category < m_barSets.at(set)->count()) { qreal temp = m_barSets.at(set)->at(category); @@ -852,7 +852,7 @@ qreal QAbstractBarSeriesPrivate::categoryBottom(int category) // Returns bottom (sum of all negative values) of category // Returns 0, if all values are positive qreal bottom(0); - int count = m_barSets.count(); + int count = m_barSets.size(); for (int set = 0; set < count; set++) { if (category < m_barSets.at(set)->count()) { qreal temp = m_barSets.at(set)->at(category); @@ -1002,7 +1002,7 @@ bool QAbstractBarSeriesPrivate::append(const QList<QBarSet *> &sets) bool QAbstractBarSeriesPrivate::remove(const QList<QBarSet *> &sets) { - if (sets.count() == 0) + if (sets.size() == 0) return false; foreach (QBarSet *set, sets) { @@ -1163,7 +1163,7 @@ void QAbstractBarSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bo // First series count is used to determine the color stepping to keep old applications // with single bar series with a lot of sets colored as they always have been. int actualIndex = 0; - int firstSeriesSetCount = m_barSets.count(); + int firstSeriesSetCount = m_barSets.size(); if (m_item) { auto seriesMap = m_item->themeManager()->seriesMap(); int lowestSeries = index; @@ -1173,7 +1173,7 @@ void QAbstractBarSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bo if (barSeries) { actualIndex += barSeries->count(); if (it.value() < lowestSeries) { - firstSeriesSetCount = qMax(barSeries->count(), gradients.count()); + firstSeriesSetCount = qMax(barSeries->count(), gradients.size()); lowestSeries = it.value(); } } @@ -1185,15 +1185,15 @@ void QAbstractBarSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bo qreal step = 0.2; if (firstSeriesSetCount > 1) { step = 1.0 / qreal(firstSeriesSetCount); - if (firstSeriesSetCount % gradients.count()) - step *= gradients.count(); + if (firstSeriesSetCount % gradients.size()) + step *= gradients.size(); else - step *= (gradients.count() - 1); + step *= (gradients.size() - 1); if (index > 0) { // Take necessary amount of initial steps int initialStepper = actualIndex; - while (initialStepper > gradients.count()) { - initialStepper -= gradients.count(); + while (initialStepper > gradients.size()) { + initialStepper -= gradients.size(); takeAtPos += step; if (takeAtPos == 1.0) takeAtPos += step; @@ -1202,9 +1202,9 @@ void QAbstractBarSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bo } } - for (int i(0); i < m_barSets.count(); i++) { - int colorIndex = (actualIndex + i) % gradients.count(); - if ((actualIndex + i) > 0 && (actualIndex + i) % gradients.count() == 0) { + for (int i(0); i < m_barSets.size(); i++) { + int colorIndex = (actualIndex + i) % gradients.size(); + if ((actualIndex + i) > 0 && (actualIndex + i) % gradients.size() == 0) { // There is no dedicated base color for each sets, generate more colors takeAtPos += step; if (takeAtPos == 1.0) diff --git a/src/charts/barchart/qbarmodelmapper.cpp b/src/charts/barchart/qbarmodelmapper.cpp index a46d8b9c..53567e63 100644 --- a/src/charts/barchart/qbarmodelmapper.cpp +++ b/src/charts/barchart/qbarmodelmapper.cpp @@ -379,7 +379,7 @@ void QBarModelMapperPrivate::barSetsAdded(const QList<QBarSet *> &sets) if (m_seriesSignalsBlock) return; - if (sets.count() == 0) + if (sets.size() == 0) return; int firstIndex = m_series->barSets().indexOf(sets.at(0)); @@ -387,7 +387,7 @@ void QBarModelMapperPrivate::barSetsAdded(const QList<QBarSet *> &sets) return; int maxCount = 0; - for (int i = 0; i < sets.count(); i++) { + for (int i = 0; i < sets.size(); i++) { if (sets.at(i)->count() > m_count) maxCount = sets.at(i)->count(); } @@ -395,7 +395,7 @@ void QBarModelMapperPrivate::barSetsAdded(const QList<QBarSet *> &sets) if (m_count != -1 && m_count < maxCount) m_count = maxCount; - m_lastBarSetSection += sets.count(); + m_lastBarSetSection += sets.size(); blockModelSignals(); int modelCapacity = m_orientation == Qt::Vertical ? m_model->rowCount() - m_first : m_model->columnCount() - m_first; @@ -407,12 +407,12 @@ void QBarModelMapperPrivate::barSetsAdded(const QList<QBarSet *> &sets) } if (m_orientation == Qt::Vertical) - m_model->insertColumns(firstIndex + m_firstBarSetSection, sets.count()); + m_model->insertColumns(firstIndex + m_firstBarSetSection, sets.size()); else - m_model->insertRows(firstIndex + m_firstBarSetSection, sets.count()); + m_model->insertRows(firstIndex + m_firstBarSetSection, sets.size()); - for (int i = firstIndex + m_firstBarSetSection; i < firstIndex + m_firstBarSetSection + sets.count(); i++) { + for (int i = firstIndex + m_firstBarSetSection; i < firstIndex + m_firstBarSetSection + sets.size(); i++) { m_model->setHeaderData(i, m_orientation == Qt::Vertical ? Qt::Horizontal : Qt::Vertical, sets.at(i - firstIndex - m_firstBarSetSection)->label()); for (int j = 0; j < sets.at(i - firstIndex - m_firstBarSetSection)->count(); j++) m_model->setData(barModelIndex(i, j), sets.at(i - firstIndex - m_firstBarSetSection)->at(j)); @@ -426,23 +426,23 @@ void QBarModelMapperPrivate::barSetsRemoved(const QList<QBarSet *> &sets) if (m_seriesSignalsBlock) return; - if (sets.count() == 0) + if (sets.size() == 0) return; int firstIndex = m_barSets.indexOf(sets.at(0)); if (firstIndex == -1) return; - m_lastBarSetSection -= sets.count(); + m_lastBarSetSection -= sets.size(); - for (int i = firstIndex + sets.count() - 1; i >= firstIndex; i--) + for (int i = firstIndex + sets.size() - 1; i >= firstIndex; i--) m_barSets.removeAt(i); blockModelSignals(); if (m_orientation == Qt::Vertical) - m_model->removeColumns(firstIndex + m_firstBarSetSection, sets.count()); + m_model->removeColumns(firstIndex + m_firstBarSetSection, sets.size()); else - m_model->removeRows(firstIndex + m_firstBarSetSection, sets.count()); + m_model->removeRows(firstIndex + m_firstBarSetSection, sets.size()); blockModelSignals(false); initializeBarFromModel(); } diff --git a/src/charts/barchart/qbarset.cpp b/src/charts/barchart/qbarset.cpp index 8e029a2e..a213ca7b 100644 --- a/src/charts/barchart/qbarset.cpp +++ b/src/charts/barchart/qbarset.cpp @@ -343,8 +343,8 @@ QString QBarSet::label() const void QBarSet::append(const qreal value) { // Convert to QPointF - int index = d_ptr->m_values.count(); - d_ptr->append(QPointF(d_ptr->m_values.count(), value)); + int index = d_ptr->m_values.size(); + d_ptr->append(QPointF(d_ptr->m_values.size(), value)); emit valuesAdded(index, 1); } @@ -355,9 +355,9 @@ void QBarSet::append(const qreal value) */ void QBarSet::append(const QList<qreal> &values) { - int index = d_ptr->m_values.count(); + int index = d_ptr->m_values.size(); d_ptr->append(values); - emit valuesAdded(index, values.count()); + emit valuesAdded(index, values.size()); } /*! @@ -434,7 +434,7 @@ void QBarSet::remove(const int index, const int count) */ void QBarSet::replace(const int index, const qreal value) { - if (index >= 0 && index < d_ptr->m_values.count()) { + if (index >= 0 && index < d_ptr->m_values.size()) { d_ptr->replace(index, value); emit valueChanged(index); } @@ -452,7 +452,7 @@ void QBarSet::replace(const int index, const qreal value) */ qreal QBarSet::at(const int index) const { - if (index < 0 || index >= d_ptr->m_values.count()) + if (index < 0 || index >= d_ptr->m_values.size()) return 0; return d_ptr->m_values.at(index).y(); } @@ -471,7 +471,7 @@ qreal QBarSet::operator [](const int index) const */ int QBarSet::count() const { - return d_ptr->m_values.count(); + return d_ptr->m_values.size(); } /*! @@ -480,7 +480,7 @@ int QBarSet::count() const qreal QBarSet::sum() const { qreal total(0); - for (int i = 0; i < d_ptr->m_values.count(); i++) + for (int i = 0; i < d_ptr->m_values.size(); i++) total += d_ptr->m_values.at(i).y(); return total; } @@ -736,7 +736,7 @@ void QBarSet::setBarSelected(int index, bool selected) void QBarSet::selectAllBars() { bool callSignal = false; - for (int i = 0; i < d_ptr->m_values.count(); ++i) + for (int i = 0; i < d_ptr->m_values.size(); ++i) d_ptr->setBarSelected(i, true, callSignal); if (callSignal) @@ -752,7 +752,7 @@ void QBarSet::selectAllBars() void QBarSet::deselectAllBars() { bool callSignal = false; - for (int i = 0; i < d_ptr->m_values.count(); ++i) + for (int i = 0; i < d_ptr->m_values.size(); ++i) d_ptr->setBarSelected(i, false, callSignal); if (callSignal) @@ -843,7 +843,7 @@ void QBarSetPrivate::append(QPointF value) void QBarSetPrivate::append(const QList<QPointF> &values) { - int originalIndex = m_values.count(); + int originalIndex = m_values.size(); for (const auto &value : values) { if (isValidValue(value)) m_values.append(value); @@ -853,7 +853,7 @@ void QBarSetPrivate::append(const QList<QPointF> &values) void QBarSetPrivate::append(const QList<qreal> &values) { - int originalIndex = m_values.count(); + int originalIndex = m_values.size(); int index = originalIndex; for (const auto value : values) { if (isValidValue(value)) { @@ -880,10 +880,10 @@ int QBarSetPrivate::remove(const int index, const int count) { int removeCount = count; - if ((index < 0) || (m_values.count() == 0)) + if ((index < 0) || (m_values.size() == 0)) return 0; // Invalid index or not values in list, remove nothing. - else if ((index + count) > m_values.count()) - removeCount = m_values.count() - index; // Trying to remove more items than list has. Limit amount to be removed. + else if ((index + count) > m_values.size()) + removeCount = m_values.size() - index; // Trying to remove more items than list has. Limit amount to be removed. int c = 0; while (c < removeCount) { @@ -924,21 +924,21 @@ void QBarSetPrivate::replace(const int index, const qreal value) qreal QBarSetPrivate::pos(const int index) { - if (index < 0 || index >= m_values.count()) + if (index < 0 || index >= m_values.size()) return 0; return m_values.at(index).x(); } qreal QBarSetPrivate::value(const int index) { - if (index < 0 || index >= m_values.count()) + if (index < 0 || index >= m_values.size()) return 0; return m_values.at(index).y(); } void QBarSetPrivate::setBarSelected(int index, bool selected, bool &callSignal) { - if (index < 0 || index > m_values.count() - 1) + if (index < 0 || index > m_values.size() - 1) return; if (selected) { diff --git a/src/charts/boxplotchart/qboxplotmodelmapper.cpp b/src/charts/boxplotchart/qboxplotmodelmapper.cpp index 04ec13d7..254ad866 100644 --- a/src/charts/boxplotchart/qboxplotmodelmapper.cpp +++ b/src/charts/boxplotchart/qboxplotmodelmapper.cpp @@ -365,7 +365,7 @@ void QBoxPlotModelMapperPrivate::boxSetsAdded(const QList<QBoxSet *> &sets) if (m_seriesSignalsBlock) return; - if (sets.count() == 0) + if (sets.size() == 0) return; int firstIndex = m_series->boxSets().indexOf(sets.at(0)); @@ -373,7 +373,7 @@ void QBoxPlotModelMapperPrivate::boxSetsAdded(const QList<QBoxSet *> &sets) return; int maxCount = 0; - for (int i = 0; i < sets.count(); i++) { + for (int i = 0; i < sets.size(); i++) { if (sets.at(i)->count() > m_count) maxCount = sets.at(i)->count(); } @@ -381,7 +381,7 @@ void QBoxPlotModelMapperPrivate::boxSetsAdded(const QList<QBoxSet *> &sets) if (m_count != -1 && m_count < maxCount) m_count = maxCount; - m_lastBoxSetSection += sets.count(); + m_lastBoxSetSection += sets.size(); blockModelSignals(); int modelCapacity = m_orientation == Qt::Vertical ? m_model->rowCount() - m_first : m_model->columnCount() - m_first; @@ -393,12 +393,12 @@ void QBoxPlotModelMapperPrivate::boxSetsAdded(const QList<QBoxSet *> &sets) } if (m_orientation == Qt::Vertical) - m_model->insertColumns(firstIndex + m_firstBoxSetSection, sets.count()); + m_model->insertColumns(firstIndex + m_firstBoxSetSection, sets.size()); else - m_model->insertRows(firstIndex + m_firstBoxSetSection, sets.count()); + m_model->insertRows(firstIndex + m_firstBoxSetSection, sets.size()); - for (int i = firstIndex + m_firstBoxSetSection; i < firstIndex + m_firstBoxSetSection + sets.count(); i++) { + for (int i = firstIndex + m_firstBoxSetSection; i < firstIndex + m_firstBoxSetSection + sets.size(); i++) { for (int j = 0; j < sets.at(i - firstIndex - m_firstBoxSetSection)->count(); j++) m_model->setData(boxModelIndex(i, j), sets.at(i - firstIndex - m_firstBoxSetSection)->at(j)); } @@ -411,23 +411,23 @@ void QBoxPlotModelMapperPrivate::boxSetsRemoved(const QList<QBoxSet *> &sets) if (m_seriesSignalsBlock) return; - if (sets.count() == 0) + if (sets.size() == 0) return; int firstIndex = m_boxSets.indexOf(sets.at(0)); if (firstIndex == -1) return; - m_lastBoxSetSection -= sets.count(); + m_lastBoxSetSection -= sets.size(); - for (int i = firstIndex + sets.count() - 1; i >= firstIndex; i--) + for (int i = firstIndex + sets.size() - 1; i >= firstIndex; i--) m_boxSets.removeAt(i); blockModelSignals(); if (m_orientation == Qt::Vertical) - m_model->removeColumns(firstIndex + m_firstBoxSetSection, sets.count()); + m_model->removeColumns(firstIndex + m_firstBoxSetSection, sets.size()); else - m_model->removeRows(firstIndex + m_firstBoxSetSection, sets.count()); + m_model->removeRows(firstIndex + m_firstBoxSetSection, sets.size()); blockModelSignals(false); initializeBoxFromModel(); } diff --git a/src/charts/boxplotchart/qboxplotseries.cpp b/src/charts/boxplotchart/qboxplotseries.cpp index 6bf4a7b9..a6a528d5 100644 --- a/src/charts/boxplotchart/qboxplotseries.cpp +++ b/src/charts/boxplotchart/qboxplotseries.cpp @@ -261,7 +261,7 @@ void QBoxPlotSeries::clear() int QBoxPlotSeries::count() const { Q_D(const QBoxPlotSeries); - return d->m_boxSets.count(); + return d->m_boxSets.size(); } /*! @@ -380,7 +380,7 @@ void QBoxPlotSeriesPrivate::initializeDomain() qreal maxX(domain()->maxX()); qreal maxY(domain()->maxY()); - qreal x = m_boxSets.count(); + qreal x = m_boxSets.size(); minX = qMin(minX, qreal(-0.5)); minY = qMin(minY, min()); maxX = qMax(maxX, x - qreal(0.5)); @@ -419,7 +419,7 @@ void QBoxPlotSeriesPrivate::populateCategories(QBarCategoryAxis *axis) { QStringList categories; if (axis->categories().isEmpty()) { - for (int i(1); i < m_boxSets.count() + 1; i++) { + for (int i(1); i < m_boxSets.size() + 1; i++) { QBoxSet *set = m_boxSets.at(i - 1); if (set->label().isEmpty()) categories << presenter()->numberToString(i); @@ -615,7 +615,7 @@ bool QBoxPlotSeriesPrivate::append(const QList<QBoxSet *> &sets) bool QBoxPlotSeriesPrivate::remove(const QList<QBoxSet *> &sets) { - if (sets.count() == 0) + if (sets.size() == 0) return false; for (auto *set : sets) { @@ -660,7 +660,7 @@ QBoxSet *QBoxPlotSeriesPrivate::boxSetAt(int index) qreal QBoxPlotSeriesPrivate::min() { - if (m_boxSets.count() <= 0) + if (m_boxSets.size() <= 0) return 0; qreal min = m_boxSets.at(0)->at(0); @@ -677,7 +677,7 @@ qreal QBoxPlotSeriesPrivate::min() qreal QBoxPlotSeriesPrivate::max() { - if (m_boxSets.count() <= 0) + if (m_boxSets.size() <= 0) return 0; qreal max = m_boxSets.at(0)->at(0); diff --git a/src/charts/candlestickchart/candlestickchartitem.cpp b/src/charts/candlestickchart/candlestickchartitem.cpp index 26f6a3aa..0ff4a093 100644 --- a/src/charts/candlestickchart/candlestickchartitem.cpp +++ b/src/charts/candlestickchart/candlestickchartitem.cpp @@ -284,7 +284,7 @@ void CandlestickChartItem::updateCandlestickAppearance(Candlestick *item, QCandl void CandlestickChartItem::addTimestamp(qreal timestamp) { int index = 0; - for (int i = m_timestamps.count() - 1; i >= 0; --i) { + for (int i = m_timestamps.size() - 1; i >= 0; --i) { if (timestamp > m_timestamps.at(i)) { index = i + 1; break; @@ -300,18 +300,18 @@ void CandlestickChartItem::removeTimestamp(qreal timestamp) void CandlestickChartItem::updateTimePeriod() { - if (m_timestamps.count() == 0) { + if (m_timestamps.size() == 0) { m_timePeriod = 0; return; } - if (m_timestamps.count() == 1) { + if (m_timestamps.size() == 1) { m_timePeriod = qAbs(domain()->maxX() - domain()->minX()); return; } qreal timePeriod = qAbs(m_timestamps.at(1) - m_timestamps.at(0)); - for (int i = 1; i < m_timestamps.count(); ++i) { + for (int i = 1; i < m_timestamps.size(); ++i) { timePeriod = qMin(timePeriod, qAbs(m_timestamps.at(i) - m_timestamps.at(i - 1))); } m_timePeriod = timePeriod; diff --git a/src/charts/candlestickchart/qcandlestickmodelmapper.cpp b/src/charts/candlestickchart/qcandlestickmodelmapper.cpp index c05d9bff..c2f62d46 100644 --- a/src/charts/candlestickchart/qcandlestickmodelmapper.cpp +++ b/src/charts/candlestickchart/qcandlestickmodelmapper.cpp @@ -536,15 +536,15 @@ void QCandlestickModelMapperPrivate::candlestickSetsAdded(const QList<QCandlesti if (firstIndex == -1) return; - m_lastSetSection += sets.count(); + m_lastSetSection += sets.size(); blockModelSignals(); if (q->orientation() == Qt::Vertical) - m_model->insertColumns(firstIndex + m_firstSetSection, sets.count()); + m_model->insertColumns(firstIndex + m_firstSetSection, sets.size()); else - m_model->insertRows(firstIndex + m_firstSetSection, sets.count()); + m_model->insertRows(firstIndex + m_firstSetSection, sets.size()); - for (int i = 0; i < sets.count(); ++i) { + for (int i = 0; i < sets.size(); ++i) { int section = i + firstIndex + m_firstSetSection; m_model->setData(candlestickModelIndex(section, m_timestamp), sets.at(i)->timestamp()); m_model->setData(candlestickModelIndex(section, m_open), sets.at(i)->open()); diff --git a/src/charts/candlestickchart/qcandlestickseries.cpp b/src/charts/candlestickchart/qcandlestickseries.cpp index 8e774718..c7573ff0 100644 --- a/src/charts/candlestickchart/qcandlestickseries.cpp +++ b/src/charts/candlestickchart/qcandlestickseries.cpp @@ -624,7 +624,7 @@ QList<QCandlestickSet *> QCandlestickSeries::sets() const */ int QCandlestickSeries::count() const { - return sets().count(); + return sets().size(); } /*! @@ -915,20 +915,20 @@ void QCandlestickSeriesPrivate::initializeDomain() qreal minY(domain()->minY()); qreal maxY(domain()->maxY()); - if (m_sets.count()) { + if (m_sets.size()) { QCandlestickSet *set = m_sets.first(); minX = set->timestamp(); maxX = set->timestamp(); minY = set->low(); maxY = set->high(); - for (int i = 1; i < m_sets.count(); ++i) { + for (int i = 1; i < m_sets.size(); ++i) { set = m_sets.at(i); minX = qMin(minX, qreal(set->timestamp())); maxX = qMax(maxX, qreal(set->timestamp())); minY = qMin(minY, set->low()); maxY = qMax(maxY, set->high()); } - qreal extra = (maxX - minX) / m_sets.count() / 2; + qreal extra = (maxX - minX) / m_sets.size() / 2; minX = minX - extra; maxX = maxX + extra; } @@ -1054,7 +1054,7 @@ bool QCandlestickSeriesPrivate::append(const QList<QCandlestickSet *> &sets) bool QCandlestickSeriesPrivate::remove(const QList<QCandlestickSet *> &sets) { - if (sets.count() == 0) + if (sets.size() == 0) return false; foreach (QCandlestickSet *set, sets) { @@ -1120,7 +1120,7 @@ void QCandlestickSeriesPrivate::populateBarCategories(QBarCategoryAxis *axis) { if (axis->categories().isEmpty()) { QStringList categories; - for (int i = 0; i < m_sets.count(); ++i) { + for (int i = 0; i < m_sets.size(); ++i) { const qint64 timestamp = qRound64(m_sets.at(i)->timestamp()); const QString timestampFormat = m_chart->locale().dateTimeFormat(QLocale::ShortFormat); categories << QDateTime::fromMSecsSinceEpoch(timestamp).toString(timestampFormat); diff --git a/src/charts/chartdataset.cpp b/src/charts/chartdataset.cpp index a02f3c9a..02c5191a 100644 --- a/src/charts/chartdataset.cpp +++ b/src/charts/chartdataset.cpp @@ -402,7 +402,7 @@ void ChartDataSet::deleteAllSeries() removeSeries(s); delete s; } - Q_ASSERT(m_seriesList.count() == 0); + Q_ASSERT(m_seriesList.size() == 0); } void ChartDataSet::deleteAllAxes() @@ -411,7 +411,7 @@ void ChartDataSet::deleteAllAxes() removeAxis(a); delete a; } - Q_ASSERT(m_axisList.count() == 0); + Q_ASSERT(m_axisList.size() == 0); } void ChartDataSet::zoomInDomain(const QRectF &rect) diff --git a/src/charts/chartpresenter.cpp b/src/charts/chartpresenter.cpp index fbf89d10..dd156a02 100644 --- a/src/charts/chartpresenter.cpp +++ b/src/charts/chartpresenter.cpp @@ -529,16 +529,16 @@ QString ChartPresenter::truncatedText(const QFont &font, const QString &text, qr // to try. static QRegularExpression truncateMatcher(QStringLiteral("&#?[0-9a-zA-Z]*;$")); - QList<QString> testStrings(text.length()); + QList<QString> testStrings(text.size()); int count(0); static QLatin1Char closeTag('>'); static QLatin1Char openTag('<'); static QLatin1Char semiColon(';'); static QLatin1String ellipsis("..."); - while (truncatedString.length() > 1) { + while (truncatedString.size() > 1) { int chopIndex(-1); int chopCount(1); - QChar lastChar(truncatedString.at(truncatedString.length() - 1)); + QChar lastChar(truncatedString.at(truncatedString.size() - 1)); if (lastChar == closeTag) chopIndex = truncatedString.lastIndexOf(openTag); @@ -546,7 +546,7 @@ QString ChartPresenter::truncatedText(const QFont &font, const QString &text, qr chopIndex = truncatedString.indexOf(truncateMatcher); if (chopIndex != -1) - chopCount = truncatedString.length() - chopIndex; + chopCount = truncatedString.size() - chopIndex; truncatedString.chop(chopCount); testStrings[count] = truncatedString + ellipsis; count++; diff --git a/src/charts/chartthememanager.cpp b/src/charts/chartthememanager.cpp index 24d03c96..f8d5c9dc 100644 --- a/src/charts/chartthememanager.cpp +++ b/src/charts/chartthememanager.cpp @@ -186,7 +186,7 @@ QColor ChartThemeManager::colorAt(const QGradient &gradient, qreal pos) Q_ASSERT(pos >= 0 && pos <= 1.0); QGradientStops stops = gradient.stops(); - int count = stops.count(); + int count = stops.size(); // find previous stop relative to position QGradientStop prev = stops.first(); diff --git a/src/charts/domain/logxlogydomain.cpp b/src/charts/domain/logxlogydomain.cpp index bd3a6cf1..db060e3f 100644 --- a/src/charts/domain/logxlogydomain.cpp +++ b/src/charts/domain/logxlogydomain.cpp @@ -168,9 +168,9 @@ QList<QPointF> LogXLogYDomain::calculateGeometryPoints(const QList<QPointF> &lis const qreal deltaY = m_size.height() / qAbs(m_logRightY - m_logLeftY); QList<QPointF> result; - result.resize(list.count()); + result.resize(list.size()); - for (int i = 0; i < list.count(); ++i) { + for (int i = 0; i < list.size(); ++i) { if (list[i].x() > 0 && list[i].y() > 0) { qreal x = ((qLn(list[i].x()) / qLn(m_logBaseX)) - m_logLeftX) * deltaX; if (m_reverseX) diff --git a/src/charts/domain/logxydomain.cpp b/src/charts/domain/logxydomain.cpp index 50fb0840..c814392c 100644 --- a/src/charts/domain/logxydomain.cpp +++ b/src/charts/domain/logxydomain.cpp @@ -154,9 +154,9 @@ QList<QPointF> LogXYDomain::calculateGeometryPoints(const QList<QPointF> &list) const qreal deltaY = m_size.height() / (m_maxY - m_minY); QList<QPointF> result; - result.resize(list.count()); + result.resize(list.size()); - for (int i = 0; i < list.count(); ++i) { + for (int i = 0; i < list.size(); ++i) { if (list[i].x() > 0) { qreal x = ((qLn(list[i].x()) / qLn(m_logBaseX)) - m_logLeftX) * deltaX; if (m_reverseX) diff --git a/src/charts/domain/polardomain.cpp b/src/charts/domain/polardomain.cpp index 5afa5f7a..97f04d65 100644 --- a/src/charts/domain/polardomain.cpp +++ b/src/charts/domain/polardomain.cpp @@ -41,12 +41,12 @@ QPointF PolarDomain::calculateGeometryPoint(const QPointF &point, bool &ok) cons QList<QPointF> PolarDomain::calculateGeometryPoints(const QList<QPointF> &list) const { QList<QPointF> result; - result.resize(list.count()); + result.resize(list.size()); bool ok; qreal r = 0.0; qreal a = 0.0; - for (int i = 0; i < list.count(); ++i) { + for (int i = 0; i < list.size(); ++i) { a = toAngularCoordinate(list[i].x(), ok); if (ok) r = toRadialCoordinate(list[i].y(), ok); diff --git a/src/charts/domain/xlogydomain.cpp b/src/charts/domain/xlogydomain.cpp index 7581b274..64077fac 100644 --- a/src/charts/domain/xlogydomain.cpp +++ b/src/charts/domain/xlogydomain.cpp @@ -154,9 +154,9 @@ QList<QPointF> XLogYDomain::calculateGeometryPoints(const QList<QPointF> &list) const qreal deltaY = m_size.height() / qAbs(m_logRightY - m_logLeftY); QList<QPointF> result; - result.resize(list.count()); + result.resize(list.size()); - for (int i = 0; i < list.count(); ++i) { + for (int i = 0; i < list.size(); ++i) { if (list[i].y() > 0) { qreal x = (list[i].x() - m_minX) * deltaX; if (m_reverseX) diff --git a/src/charts/domain/xydomain.cpp b/src/charts/domain/xydomain.cpp index ba70c999..8ecef597 100644 --- a/src/charts/domain/xydomain.cpp +++ b/src/charts/domain/xydomain.cpp @@ -154,9 +154,9 @@ QList<QPointF> XYDomain::calculateGeometryPoints(const QList<QPointF> &list) con const qreal deltaY = m_size.height() / yd; QList<QPointF> result; - result.resize(list.count()); + result.resize(list.size()); - for (int i = 0; i < list.count(); ++i) { + for (int i = 0; i < list.size(); ++i) { qreal x = (list[i].x() - m_minX) * deltaX; if (m_reverseX) x = m_size.width() - x; diff --git a/src/charts/glwidget.cpp b/src/charts/glwidget.cpp index e89c072e..93659a0e 100644 --- a/src/charts/glwidget.cpp +++ b/src/charts/glwidget.cpp @@ -329,7 +329,7 @@ void GLWidget::render(bool selection) } vbo->bind(); if (dirty) { - vbo->allocate(data->array.constData(), int(data->array.count() * sizeof(GLfloat))); + vbo->allocate(data->array.constData(), int(data->array.size() * sizeof(GLfloat))); dirty = false; m_selectionRenderNeeded = true; } diff --git a/src/charts/legend/legendlayout.cpp b/src/charts/legend/legendlayout.cpp index 85167ed0..51d08052 100644 --- a/src/charts/legend/legendlayout.cpp +++ b/src/charts/legend/legendlayout.cpp @@ -141,9 +141,9 @@ void LegendLayout::setAttachedGeometry(const QRectF &rect) // If the items would occupy more space than is available, start truncating them // from the longest one. qreal availableGeometry = geometry.width() - itemMargins; - if (markerItemsWidth >= availableGeometry && legendWidthList.count() > 0) { + if (markerItemsWidth >= availableGeometry && legendWidthList.size() > 0) { bool truncated(false); - int count = legendWidthList.count(); + int count = legendWidthList.size(); for (int i = 1; i < count; i++) { int truncateIndex = i - 1; @@ -188,7 +188,7 @@ void LegendLayout::setAttachedGeometry(const QRectF &rect) QPointF point(0,0); - int markerCount = m_legend->d_ptr->markers().count(); + int markerCount = m_legend->d_ptr->markers().size(); for (int i = 0; i < markerCount; i++) { QLegendMarker *marker; if (m_legend->d_ptr->m_reverseMarkers) @@ -231,7 +231,7 @@ void LegendLayout::setAttachedGeometry(const QRectF &rect) case Qt::AlignLeft: case Qt::AlignRight: { QPointF point(0,0); - int markerCount = m_legend->d_ptr->markers().count(); + int markerCount = m_legend->d_ptr->markers().size(); for (int i = 0; i < markerCount; i++) { QLegendMarker *marker; if (m_legend->d_ptr->m_reverseMarkers) @@ -301,7 +301,7 @@ void LegendLayout::setDettachedGeometry(const QRectF &rect) QPointF point(0, (align == Qt::AlignTop) ? 0 : geometry.height()); m_width = 0; m_height = 0; - for (int i = 0; i < markers.count(); i++) { + for (int i = 0; i < markers.size(); i++) { LegendMarkerItem *item = markers.at(i)->d_ptr->item(); if (item->isVisible()) { item->setGeometry(geometry); @@ -316,7 +316,7 @@ void LegendLayout::setDettachedGeometry(const QRectF &rect) // Next item would go off rect. point.setX(0); point.setY(point.y() + ((align == Qt::AlignTop) ? h : -h)); - if (i+1 < markers.count()) { + if (i+1 < markers.size()) { m_height += h; } } @@ -341,7 +341,7 @@ void LegendLayout::setDettachedGeometry(const QRectF &rect) m_width = 0; m_height = 0; qreal maxWidth = 0; - for (int i = 0; i < markers.count(); i++) { + for (int i = 0; i < markers.size(); i++) { LegendMarkerItem *item = markers.at(i)->d_ptr->item(); if (item->isVisible()) { item->setGeometry(geometry); @@ -356,7 +356,7 @@ void LegendLayout::setDettachedGeometry(const QRectF &rect) // Next item would go off rect. point.setX(point.x() + ((align == Qt::AlignLeft) ? maxWidth : -maxWidth)); point.setY(0); - if (i+1 < markers.count()) { + if (i+1 < markers.size()) { m_width += maxWidth; maxWidth = 0; } diff --git a/src/charts/piechart/qpiemodelmapper.cpp b/src/charts/piechart/qpiemodelmapper.cpp index ceaa2688..260a51fa 100644 --- a/src/charts/piechart/qpiemodelmapper.cpp +++ b/src/charts/piechart/qpiemodelmapper.cpp @@ -270,7 +270,7 @@ void QPieModelMapperPrivate::slicesAdded(const QList<QPieSlice *> &slices) if (m_seriesSignalsBlock) return; - if (slices.count() == 0) + if (slices.size() == 0) return; int firstIndex = m_series->slices().indexOf(slices.at(0)); @@ -278,9 +278,9 @@ void QPieModelMapperPrivate::slicesAdded(const QList<QPieSlice *> &slices) return; if (m_count != -1) - m_count += slices.count(); + m_count += slices.size(); - for (int i = firstIndex; i < firstIndex + slices.count(); i++) { + for (int i = firstIndex; i < firstIndex + slices.size(); i++) { m_slices.insert(i, slices.at(i - firstIndex)); connect(slices.at(i - firstIndex), SIGNAL(labelChanged()), this, SLOT(sliceLabelChanged())); connect(slices.at(i - firstIndex), SIGNAL(valueChanged()), this, SLOT(sliceValueChanged())); @@ -288,11 +288,11 @@ void QPieModelMapperPrivate::slicesAdded(const QList<QPieSlice *> &slices) blockModelSignals(); if (m_orientation == Qt::Vertical) - m_model->insertRows(firstIndex + m_first, slices.count()); + m_model->insertRows(firstIndex + m_first, slices.size()); else - m_model->insertColumns(firstIndex + m_first, slices.count()); + m_model->insertColumns(firstIndex + m_first, slices.size()); - for (int i = firstIndex; i < firstIndex + slices.count(); i++) { + for (int i = firstIndex; i < firstIndex + slices.size(); i++) { m_model->setData(valueModelIndex(i), slices.at(i - firstIndex)->value()); m_model->setData(labelModelIndex(i), slices.at(i - firstIndex)->label()); } @@ -304,7 +304,7 @@ void QPieModelMapperPrivate::slicesRemoved(const QList<QPieSlice *> &slices) if (m_seriesSignalsBlock) return; - if (slices.count() == 0) + if (slices.size() == 0) return; int firstIndex = m_slices.indexOf(slices.at(0)); @@ -312,16 +312,16 @@ void QPieModelMapperPrivate::slicesRemoved(const QList<QPieSlice *> &slices) return; if (m_count != -1) - m_count -= slices.count(); + m_count -= slices.size(); - for (int i = firstIndex + slices.count() - 1; i >= firstIndex; i--) + for (int i = firstIndex + slices.size() - 1; i >= firstIndex; i--) m_slices.removeAt(i); blockModelSignals(); if (m_orientation == Qt::Vertical) - m_model->removeRows(firstIndex + m_first, slices.count()); + m_model->removeRows(firstIndex + m_first, slices.size()); else - m_model->removeColumns(firstIndex + m_first, slices.count()); + m_model->removeColumns(firstIndex + m_first, slices.size()); blockModelSignals(false); } diff --git a/src/charts/piechart/qpieseries.cpp b/src/charts/piechart/qpieseries.cpp index f4311c20..ceb511b3 100644 --- a/src/charts/piechart/qpieseries.cpp +++ b/src/charts/piechart/qpieseries.cpp @@ -466,7 +466,7 @@ bool QPieSeries::append(const QList<QPieSlice *> &slices) { Q_D(QPieSeries); - if (slices.count() == 0) + if (slices.size() == 0) return false; for (auto *s : slices) { @@ -540,7 +540,7 @@ bool QPieSeries::insert(int index, QPieSlice *slice) { Q_D(QPieSeries); - if (index < 0 || index > d->m_slices.count()) + if (index < 0 || index > d->m_slices.size()) return false; if (!slice || d->m_slices.contains(slice)) @@ -630,7 +630,7 @@ bool QPieSeries::take(QPieSlice *slice) void QPieSeries::clear() { Q_D(QPieSeries); - if (d->m_slices.count() == 0) + if (d->m_slices.size() == 0) return; QList<QPieSlice *> slices = d->m_slices; @@ -661,7 +661,7 @@ QList<QPieSlice *> QPieSeries::slices() const int QPieSeries::count() const { Q_D(const QPieSeries); - return d->m_slices.count(); + return d->m_slices.size(); } /*! @@ -1016,12 +1016,12 @@ void QPieSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool force //const QList<QColor>& colors = theme->seriesColors(); const QList<QGradient>& gradients = theme->seriesGradients(); - for (int i(0); i < m_slices.count(); i++) { + for (int i(0); i < m_slices.size(); i++) { QColor penColor = ChartThemeManager::colorAt(gradients.at(index % gradients.size()), 0.0); // Get color for a slice from a gradient linearly, beginning from the start of the gradient - qreal pos = (qreal)(i + 1) / (qreal) m_slices.count(); + qreal pos = (qreal)(i + 1) / (qreal) m_slices.size(); QColor brushColor = ChartThemeManager::colorAt(gradients.at(index % gradients.size()), pos); QPieSlice *s = m_slices.at(i); diff --git a/src/charts/qchart.cpp b/src/charts/qchart.cpp index 0a6ce404..2d125fa5 100644 --- a/src/charts/qchart.cpp +++ b/src/charts/qchart.cpp @@ -451,7 +451,7 @@ bool QChart::isZoomed() QAbstractAxis *QChart::axisX(QAbstractSeries *series) const { QList<QAbstractAxis *> axisList = axes(Qt::Horizontal, series); - if (axisList.count()) + if (axisList.size()) return axisList[0]; return 0; } @@ -468,7 +468,7 @@ QAbstractAxis *QChart::axisX(QAbstractSeries *series) const QAbstractAxis *QChart::axisY(QAbstractSeries *series) const { QList<QAbstractAxis *> axisList = axes(Qt::Vertical, series); - if (axisList.count()) + if (axisList.size()) return axisList[0]; return 0; } diff --git a/src/charts/scatterchart/scatterchartitem.cpp b/src/charts/scatterchart/scatterchartitem.cpp index cf8b49ef..6b0db764 100644 --- a/src/charts/scatterchart/scatterchartitem.cpp +++ b/src/charts/scatterchart/scatterchartitem.cpp @@ -189,8 +189,8 @@ void ScatterChartItem::markerDoubleClicked(QGraphicsItem *marker) void ScatterChartItem::updateGeometry() { if (m_series->useOpenGL()) { - if (m_items.childItems().count()) - deletePoints(m_items.childItems().count()); + if (m_items.childItems().size()) + deletePoints(m_items.childItems().size()); if (!m_rect.isEmpty()) { prepareGeometryChange(); // Changed signal seems to trigger even with empty region @@ -203,7 +203,7 @@ void ScatterChartItem::updateGeometry() const QList<QPointF> &points = geometryPoints(); if (points.size() == 0) { - deletePoints(m_items.childItems().count()); + deletePoints(m_items.childItems().size()); return; } @@ -454,7 +454,7 @@ void ScatterChartItem::handleSeriesUpdated() return; } - int count = m_items.childItems().count(); + int count = m_items.childItems().size(); if (count == 0) return; diff --git a/src/charts/splinechart/splinechartitem.cpp b/src/charts/splinechart/splinechartitem.cpp index 4498d91b..0f1eb959 100644 --- a/src/charts/splinechart/splinechartitem.cpp +++ b/src/charts/splinechart/splinechartitem.cpp @@ -89,7 +89,7 @@ void SplineChartItem::updateChart(const QList<QPointF> &oldPoints, const QList<Q int index) { QList<QPointF> controlPoints; - if (newPoints.count() >= 2) + if (newPoints.size() >= 2) controlPoints = calculateControlPoints(newPoints); if (m_animation) @@ -117,7 +117,7 @@ void SplineChartItem::updateGeometry() return; } - Q_ASSERT(points.count() * 2 - 2 == controlPoints.count()); + Q_ASSERT(points.size() * 2 - 2 == controlPoints.size()); QPainterPath splinePath; QPainterPath fullPath; @@ -328,9 +328,9 @@ void SplineChartItem::updateGeometry() QList<QPointF> SplineChartItem::calculateControlPoints(const QList<QPointF> &points) { QList<QPointF> controlPoints; - controlPoints.resize(points.count() * 2 - 2); + controlPoints.resize(points.size() * 2 - 2); - int n = points.count() - 1; + int n = points.size() - 1; if (n == 1) { //for n==1 @@ -396,7 +396,7 @@ QList<qreal> SplineChartItem::firstControlPoints(const QList<qreal> &list) { QList<qreal> result; - int count = list.count(); + int count = list.size(); result.resize(count); result[0] = list[0] / 2.0; diff --git a/src/charts/xychart/qxyseries.cpp b/src/charts/xychart/qxyseries.cpp index 1dbef8c2..309e199d 100644 --- a/src/charts/xychart/qxyseries.cpp +++ b/src/charts/xychart/qxyseries.cpp @@ -601,7 +601,7 @@ void QXYSeries::append(const QPointF &point) if (isValidValue(point)) { d->m_points << point; - emit pointAdded(d->m_points.count() - 1); + emit pointAdded(d->m_points.size() - 1); } } @@ -1071,7 +1071,7 @@ void QXYSeries::selectAllPoints() Q_D(QXYSeries); bool callSignal = false; - for (int i = 0; i < d->m_points.count(); ++i) + for (int i = 0; i < d->m_points.size(); ++i) d->setPointSelected(i, true, callSignal); if (callSignal) @@ -1089,7 +1089,7 @@ void QXYSeries::deselectAllPoints() Q_D(QXYSeries); bool callSignal = false; - for (int i = 0; i < d->m_points.count(); ++i) + for (int i = 0; i < d->m_points.size(); ++i) d->setPointSelected(i, false, callSignal); if (callSignal) @@ -1322,7 +1322,7 @@ const QPointF &QXYSeries::at(int index) const int QXYSeries::count() const { Q_D(const QXYSeries); - return d->m_points.count(); + return d->m_points.size(); } @@ -1743,7 +1743,7 @@ void QXYSeriesPrivate::initializeDomain() maxX = minX; maxY = minY; - for (int i = 0; i < points.count(); i++) { + for (int i = 0; i < points.size(); i++) { qreal x = points[i].x(); qreal y = points[i].y(); minX = qMin(minX, x); @@ -1918,7 +1918,7 @@ QColor QXYSeries::bestFitLineColor() const QPair<qreal, qreal> QXYSeriesPrivate::bestFitLineEquation(bool &ok) const { - if (m_points.count() <= 1) { + if (m_points.size() <= 1) { ok = false; return { 0, 0 }; } @@ -1932,14 +1932,14 @@ QPair<qreal, qreal> QXYSeriesPrivate::bestFitLineEquation(bool &ok) const xySum += point.x() * point.y(); } - const qreal divisor = m_points.count() * x2Sum - xSum * xSum; + const qreal divisor = m_points.size() * x2Sum - xSum * xSum; // To prevent crashes in unusual cases if (divisor == 0.0) { ok = false; return { 0, 0 }; } - qreal a = (m_points.count() * xySum - xSum * ySum) / divisor; + qreal a = (m_points.size() * xySum - xSum * ySum) / divisor; qreal b = (x2Sum * ySum - xSum * xySum) / divisor; return { a, b }; @@ -1947,7 +1947,7 @@ QPair<qreal, qreal> QXYSeriesPrivate::bestFitLineEquation(bool &ok) const void QXYSeriesPrivate::setPointSelected(int index, bool selected, bool &callSignal) { - if (index < 0 || index > m_points.count() - 1) + if (index < 0 || index > m_points.size() - 1) return; if (selected) { diff --git a/src/chartsqml2/declarativebarseries.cpp b/src/chartsqml2/declarativebarseries.cpp index faadf0d8..05504aa8 100644 --- a/src/chartsqml2/declarativebarseries.cpp +++ b/src/chartsqml2/declarativebarseries.cpp @@ -50,10 +50,10 @@ void DeclarativeBarSet::setValues(QVariantList values) while (count()) remove(count() - 1); - if (values.count() > 0 && values.at(0).canConvert<QPoint>()) { + if (values.size() > 0 && values.at(0).canConvert<QPoint>()) { // Create list of values for appending if the first item is Qt.point int maxValue = 0; - for (int i = 0; i < values.count(); i++) { + for (int i = 0; i < values.size(); i++) { if (values.at(i).canConvert<QPoint>() && values.at(i).toPoint().x() > maxValue) { maxValue = values.at(i).toPoint().x(); @@ -63,17 +63,17 @@ void DeclarativeBarSet::setValues(QVariantList values) QList<qreal> indexValueList; indexValueList.resize(maxValue + 1); - for (int i = 0; i < values.count(); i++) { + for (int i = 0; i < values.size(); i++) { if (values.at(i).canConvert<QPoint>()) { indexValueList.replace(values.at(i).toPoint().x(), values.at(i).toPointF().y()); } } - for (int i = 0; i < indexValueList.count(); i++) + for (int i = 0; i < indexValueList.size(); i++) QBarSet::append(indexValueList.at(i)); } else { - for (int i(0); i < values.count(); i++) { + for (int i(0); i < values.size(); i++) { if (values.at(i).canConvert<double>()) QBarSet::append(values[i].toDouble()); } @@ -153,7 +153,7 @@ void DeclarativeBarSeries::appendSeriesChildren(QQmlListProperty<QObject> *list, DeclarativeBarSet *DeclarativeBarSeries::at(int index) { QList<QBarSet *> setList = barSets(); - if (index >= 0 && index < setList.count()) + if (index >= 0 && index < setList.size()) return qobject_cast<DeclarativeBarSet *>(setList[index]); return 0; @@ -217,7 +217,7 @@ void DeclarativeStackedBarSeries::appendSeriesChildren(QQmlListProperty<QObject> DeclarativeBarSet *DeclarativeStackedBarSeries::at(int index) { QList<QBarSet *> setList = barSets(); - if (index >= 0 && index < setList.count()) + if (index >= 0 && index < setList.size()) return qobject_cast<DeclarativeBarSet *>(setList[index]); return 0; @@ -280,7 +280,7 @@ void DeclarativePercentBarSeries::appendSeriesChildren(QQmlListProperty<QObject> DeclarativeBarSet *DeclarativePercentBarSeries::at(int index) { QList<QBarSet *> setList = barSets(); - if (index >= 0 && index < setList.count()) + if (index >= 0 && index < setList.size()) return qobject_cast<DeclarativeBarSet *>(setList[index]); return 0; @@ -343,7 +343,7 @@ void DeclarativeHorizontalBarSeries::appendSeriesChildren(QQmlListProperty<QObje DeclarativeBarSet *DeclarativeHorizontalBarSeries::at(int index) { QList<QBarSet *> setList = barSets(); - if (index >= 0 && index < setList.count()) + if (index >= 0 && index < setList.size()) return qobject_cast<DeclarativeBarSet *>(setList[index]); return 0; @@ -406,7 +406,7 @@ void DeclarativeHorizontalStackedBarSeries::appendSeriesChildren(QQmlListPropert DeclarativeBarSet *DeclarativeHorizontalStackedBarSeries::at(int index) { QList<QBarSet *> setList = barSets(); - if (index >= 0 && index < setList.count()) + if (index >= 0 && index < setList.size()) return qobject_cast<DeclarativeBarSet *>(setList[index]); return 0; @@ -469,7 +469,7 @@ void DeclarativeHorizontalPercentBarSeries::appendSeriesChildren(QQmlListPropert DeclarativeBarSet *DeclarativeHorizontalPercentBarSeries::at(int index) { QList<QBarSet *> setList = barSets(); - if (index >= 0 && index < setList.count()) + if (index >= 0 && index < setList.size()) return qobject_cast<DeclarativeBarSet *>(setList[index]); return 0; diff --git a/src/chartsqml2/declarativeboxplotseries.cpp b/src/chartsqml2/declarativeboxplotseries.cpp index 0265aa0d..79516733 100644 --- a/src/chartsqml2/declarativeboxplotseries.cpp +++ b/src/chartsqml2/declarativeboxplotseries.cpp @@ -316,7 +316,7 @@ QVariantList DeclarativeBoxSet::values() void DeclarativeBoxSet::setValues(QVariantList values) { - for (int i(0); i < values.count(); i++) { + for (int i(0); i < values.size(); i++) { if (values.at(i).canConvert<double>()) QBoxSet::append(values[i].toDouble()); } @@ -401,7 +401,7 @@ void DeclarativeBoxPlotSeries::appendSeriesChildren(QQmlListProperty<QObject> *l DeclarativeBoxSet *DeclarativeBoxPlotSeries::at(int index) { QList<QBoxSet *> setList = boxSets(); - if (index >= 0 && index < setList.count()) + if (index >= 0 && index < setList.size()) return qobject_cast<DeclarativeBoxSet *>(setList[index]); return 0; diff --git a/src/chartsqml2/declarativecandlestickseries.cpp b/src/chartsqml2/declarativecandlestickseries.cpp index 0b488bdf..6577cc72 100644 --- a/src/chartsqml2/declarativecandlestickseries.cpp +++ b/src/chartsqml2/declarativecandlestickseries.cpp @@ -101,7 +101,7 @@ QString DeclarativeCandlestickSeries::brushFilename() const DeclarativeCandlestickSet *DeclarativeCandlestickSeries::at(int index) { QList<QCandlestickSet *> sets = this->sets(); - if (index >= 0 && index < sets.count()) + if (index >= 0 && index < sets.size()) return qobject_cast<DeclarativeCandlestickSet *>(sets[index]); return 0; diff --git a/src/chartsqml2/declarativecategoryaxis.cpp b/src/chartsqml2/declarativecategoryaxis.cpp index 7c608fed..7afb227b 100644 --- a/src/chartsqml2/declarativecategoryaxis.cpp +++ b/src/chartsqml2/declarativecategoryaxis.cpp @@ -68,7 +68,7 @@ void DeclarativeCategoryAxis::componentComplete() // Sort and append the range objects according to end value std::sort(ranges.begin(), ranges.end(), endValueLessThan); - for (int i(0); i < ranges.count(); i++) + for (int i(0); i < ranges.size(); i++) append(ranges.at(i).first, ranges.at(i).second); } diff --git a/src/chartsqml2/declarativechart.cpp b/src/chartsqml2/declarativechart.cpp index 68faee3d..f14d8664 100644 --- a/src/chartsqml2/declarativechart.cpp +++ b/src/chartsqml2/declarativechart.cpp @@ -1018,7 +1018,7 @@ QString DeclarativeChart::title() QAbstractAxis *DeclarativeChart::axisX(QAbstractSeries *series) { QList<QAbstractAxis *> axes = m_chart->axes(Qt::Horizontal, series); - if (axes.count()) + if (axes.size()) return axes[0]; return 0; } @@ -1026,7 +1026,7 @@ QAbstractAxis *DeclarativeChart::axisX(QAbstractSeries *series) QAbstractAxis *DeclarativeChart::axisY(QAbstractSeries *series) { QList<QAbstractAxis *> axes = m_chart->axes(Qt::Vertical, series); - if (axes.count()) + if (axes.size()) return axes[0]; return 0; } @@ -1124,7 +1124,7 @@ QLocale DeclarativeChart::locale() const int DeclarativeChart::count() { - return m_chart->series().count(); + return m_chart->series().size(); } void DeclarativeChart::setDropShadowEnabled(bool enabled) @@ -1225,7 +1225,7 @@ qsizetype DeclarativeChart::axesCountFunc(QQmlListProperty<QAbstractAxis> *list) { if (qobject_cast<DeclarativeChart *>(list->object)) { DeclarativeChart *chart = qobject_cast<DeclarativeChart *>(list->object); - return chart->m_chart->axes(Qt::Horizontal | Qt::Vertical).count(); + return chart->m_chart->axes(Qt::Horizontal | Qt::Vertical).size(); } return 0; } @@ -1249,7 +1249,7 @@ void DeclarativeChart::axesClearFunc(QQmlListProperty<QAbstractAxis> *list) QAbstractSeries *DeclarativeChart::series(int index) { - if (index < m_chart->series().count()) { + if (index < m_chart->series().size()) { return m_chart->series().at(index); } return 0; diff --git a/src/chartsqml2/declarativelineseries.cpp b/src/chartsqml2/declarativelineseries.cpp index a657775b..532d3005 100644 --- a/src/chartsqml2/declarativelineseries.cpp +++ b/src/chartsqml2/declarativelineseries.cpp @@ -23,7 +23,7 @@ DeclarativeLineSeries::DeclarativeLineSeries(QObject *parent) : void DeclarativeLineSeries::handleCountChanged(int index) { Q_UNUSED(index); - emit countChanged(points().count()); + emit countChanged(points().size()); } qreal DeclarativeLineSeries::width() const diff --git a/src/chartsqml2/declarativeopenglrendernode.cpp b/src/chartsqml2/declarativeopenglrendernode.cpp index deddef8e..fb1bebe0 100644 --- a/src/chartsqml2/declarativeopenglrendernode.cpp +++ b/src/chartsqml2/declarativeopenglrendernode.cpp @@ -305,7 +305,7 @@ void DeclarativeOpenGLRenderNode::renderGL(bool selection) } vbo->bind(); if (data->dirty) { - vbo->allocate(data->array.constData(), int(data->array.count() * sizeof(GLfloat))); + vbo->allocate(data->array.constData(), int(data->array.size() * sizeof(GLfloat))); data->dirty = false; } diff --git a/src/chartsqml2/declarativepieseries.cpp b/src/chartsqml2/declarativepieseries.cpp index b8825e11..b875638e 100644 --- a/src/chartsqml2/declarativepieseries.cpp +++ b/src/chartsqml2/declarativepieseries.cpp @@ -84,7 +84,7 @@ void DeclarativePieSeries::appendSeriesChildren(QQmlListProperty<QObject> * list QPieSlice *DeclarativePieSeries::at(int index) { QList<QPieSlice *> sliceList = slices(); - if (index >= 0 && index < sliceList.count()) + if (index >= 0 && index < sliceList.size()) return sliceList[index]; return 0; diff --git a/src/chartsqml2/declarativesplineseries.cpp b/src/chartsqml2/declarativesplineseries.cpp index f8ae334b..d51abf4a 100644 --- a/src/chartsqml2/declarativesplineseries.cpp +++ b/src/chartsqml2/declarativesplineseries.cpp @@ -23,7 +23,7 @@ DeclarativeSplineSeries::DeclarativeSplineSeries(QObject *parent) : void DeclarativeSplineSeries::handleCountChanged(int index) { Q_UNUSED(index); - emit countChanged(points().count()); + emit countChanged(points().size()); } qreal DeclarativeSplineSeries::width() const |