diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-11-11 15:53:00 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-11-18 22:01:48 +0100 |
| commit | 9cb79cee780b478b26218a8c8f516f5c0a4fa7b6 (patch) | |
| tree | ab4f3cfdb029681024752885645c2d5cc9a43ee6 | |
| parent | 79c8b3494d1df743c1b4ab9535c9cff98764f134 (diff) | |
Port from container::count() and length() to size() - V5
This is a the same semantic patch (qt-port-to-std-compatible-api V5
with config Scope: 'Container') as in dev. I've re-ran it in 6.4 to
avoid cherry-pick conflicts.
Change-Id: I9621dee5ed328b47e78919a34c307105e4311903
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
85 files changed, 1608 insertions, 1608 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 diff --git a/tests/auto/chartdataset/tst_chartdataset.cpp b/tests/auto/chartdataset/tst_chartdataset.cpp index cb81a0c4..7fc25ec3 100644 --- a/tests/auto/chartdataset/tst_chartdataset.cpp +++ b/tests/auto/chartdataset/tst_chartdataset.cpp @@ -146,11 +146,11 @@ void tst_ChartDataSet::addSeries() m_dataset->addSeries(series); - QCOMPARE(m_dataset->series().count(),1); - TRY_COMPARE(spy0.count(), 0); - TRY_COMPARE(spy1.count(), 0); - TRY_COMPARE(spy2.count(), 1); - TRY_COMPARE(spy3.count(), 0); + QCOMPARE(m_dataset->series().size(),1); + TRY_COMPARE(spy0.size(), 0); + TRY_COMPARE(spy1.size(), 0); + TRY_COMPARE(spy2.size(), 1); + TRY_COMPARE(spy3.size(), 0); } void tst_ChartDataSet::removeSeries_data() @@ -171,11 +171,11 @@ void tst_ChartDataSet::removeSeries() m_dataset->removeSeries(series); - QCOMPARE(m_dataset->series().count(),0); - TRY_COMPARE(spy0.count(), 0); - TRY_COMPARE(spy1.count(), 0); - TRY_COMPARE(spy2.count(), 0); - TRY_COMPARE(spy3.count(), 1); + QCOMPARE(m_dataset->series().size(),0); + TRY_COMPARE(spy0.size(), 0); + TRY_COMPARE(spy1.size(), 0); + TRY_COMPARE(spy2.size(), 0); + TRY_COMPARE(spy3.size(), 1); delete series; } @@ -212,11 +212,11 @@ void tst_ChartDataSet::addAxis() m_dataset->addAxis(axis,Qt::AlignBottom); - QCOMPARE(m_dataset->axes().count(),1); - TRY_COMPARE(spy0.count(), 1); - TRY_COMPARE(spy1.count(), 0); - TRY_COMPARE(spy2.count(), 0); - TRY_COMPARE(spy3.count(), 0); + QCOMPARE(m_dataset->axes().size(),1); + TRY_COMPARE(spy0.size(), 1); + TRY_COMPARE(spy1.size(), 0); + TRY_COMPARE(spy2.size(), 0); + TRY_COMPARE(spy3.size(), 0); } void tst_ChartDataSet::removeAxis_data() @@ -237,12 +237,12 @@ void tst_ChartDataSet::removeAxis() m_dataset->removeAxis(axis); - QCOMPARE(m_dataset->axes().count(),0); - QCOMPARE(m_dataset->series().count(),0); - TRY_COMPARE(spy0.count(), 0); - TRY_COMPARE(spy1.count(), 1); - TRY_COMPARE(spy2.count(), 0); - TRY_COMPARE(spy3.count(), 0); + QCOMPARE(m_dataset->axes().size(),0); + QCOMPARE(m_dataset->series().size(),0); + TRY_COMPARE(spy0.size(), 0); + TRY_COMPARE(spy1.size(), 1); + TRY_COMPARE(spy2.size(), 0); + TRY_COMPARE(spy3.size(), 0); delete axis; } @@ -294,13 +294,13 @@ void tst_ChartDataSet::attachAxis() QFETCH(QAbstractAxis*, attachAxis); QFETCH(bool, success); - Q_ASSERT(series.count() == axis.count()); - Q_ASSERT(series.count() == alignment.count()); + Q_ASSERT(series.size() == axis.size()); + Q_ASSERT(series.size() == alignment.size()); QVERIFY(m_dataset->series().isEmpty()); QVERIFY(m_dataset->axes().isEmpty()); - for(int i = 0 ; i < series.count() ; i++){ + for(int i = 0 ; i < series.size() ; i++){ if(series[i]) m_dataset->addSeries(series[i]); if(axis[i]) m_dataset->addAxis(axis[i],alignment[i]); if(series[i] && axis[i]) m_dataset->attachAxis(series[i],axis[i]); @@ -342,12 +342,12 @@ void tst_ChartDataSet::detachAxis() QFETCH(QAbstractAxis*, detachAxis); QFETCH(bool, success); - Q_ASSERT(series.count() == axis.count()); + Q_ASSERT(series.size() == axis.size()); QVERIFY(m_dataset->series().isEmpty()); QVERIFY(m_dataset->axes().isEmpty()); - for(int i = 0; i < series.count(); i++) { + for(int i = 0; i < series.size(); i++) { if(series[i]) m_dataset->addSeries(series[i]); if(axis[i]) m_dataset->addAxis(axis[i],Qt::AlignBottom); if(series[i] && axis[i]) m_dataset->attachAxis(series[i],axis[i]); diff --git a/tests/auto/domain/tst_domain.cpp b/tests/auto/domain/tst_domain.cpp index 6e32adb8..c43ad064 100644 --- a/tests/auto/domain/tst_domain.cpp +++ b/tests/auto/domain/tst_domain.cpp @@ -163,9 +163,9 @@ void tst_Domain::handleHorizontalAxisRangeChanged() QVERIFY(qFuzzyCompare(arg1.at(0).toReal(), min)); QVERIFY(qFuzzyCompare(arg1.at(1).toReal(), max)); - TRY_COMPARE(spy0.count(), 1); - TRY_COMPARE(spy1.count(), 1); - TRY_COMPARE(spy2.count(), 0); + TRY_COMPARE(spy0.size(), 1); + TRY_COMPARE(spy1.size(), 1); + TRY_COMPARE(spy2.size(), 0); } @@ -200,9 +200,9 @@ void tst_Domain::handleVerticalAxisRangeChanged() QVERIFY(qFuzzyCompare(arg1.at(0).toReal(), min)); QVERIFY(qFuzzyCompare(arg1.at(1).toReal(), max)); - TRY_COMPARE(spy0.count(), 1); - TRY_COMPARE(spy1.count(), 0); - TRY_COMPARE(spy2.count(), 1); + TRY_COMPARE(spy0.size(), 1); + TRY_COMPARE(spy1.size(), 0); + TRY_COMPARE(spy2.size(), 1); } void tst_Domain::isEmpty_data() @@ -262,9 +262,9 @@ void tst_Domain::maxX() domain.setMaxX(maxX2); QCOMPARE(domain.maxX(), maxX2); - TRY_COMPARE(spy0.count(), count); - TRY_COMPARE(spy1.count(), count); - TRY_COMPARE(spy2.count(), 0); + TRY_COMPARE(spy0.size(), count); + TRY_COMPARE(spy1.size(), count); + TRY_COMPARE(spy2.size(), 0); } @@ -295,9 +295,9 @@ void tst_Domain::maxY() domain.setMaxY(maxY2); QCOMPARE(domain.maxY(), maxY2); - TRY_COMPARE(spy0.count(), count); - TRY_COMPARE(spy1.count(), 0); - TRY_COMPARE(spy2.count(), count); + TRY_COMPARE(spy0.size(), count); + TRY_COMPARE(spy1.size(), 0); + TRY_COMPARE(spy2.size(), count); } void tst_Domain::minX_data() @@ -327,9 +327,9 @@ void tst_Domain::minX() domain.setMinX(minX2); QCOMPARE(domain.minX(), minX2); - TRY_COMPARE(spy0.count(), count); - TRY_COMPARE(spy1.count(), count); - TRY_COMPARE(spy2.count(), 0); + TRY_COMPARE(spy0.size(), count); + TRY_COMPARE(spy1.size(), count); + TRY_COMPARE(spy2.size(), 0); } void tst_Domain::minY_data() @@ -359,9 +359,9 @@ void tst_Domain::minY() domain.setMinY(minY2); QCOMPARE(domain.minY(), minY2); - TRY_COMPARE(spy0.count(), count); - TRY_COMPARE(spy1.count(), 0); - TRY_COMPARE(spy2.count(), count); + TRY_COMPARE(spy0.size(), count); + TRY_COMPARE(spy1.size(), 0); + TRY_COMPARE(spy2.size(), count); } void tst_Domain::operatorEquals_data() @@ -407,9 +407,9 @@ void tst_Domain::operatorEquals() QCOMPARE(*domain1==*domain2, equals); QCOMPARE(*domain1!=*domain2, notEquals); - TRY_COMPARE(spy0.count(), 0); - TRY_COMPARE(spy1.count(), 0); - TRY_COMPARE(spy2.count(), 0); + TRY_COMPARE(spy0.size(), 0); + TRY_COMPARE(spy1.size(), 0); + TRY_COMPARE(spy2.size(), 0); delete domain1; delete domain2; @@ -446,9 +446,9 @@ void tst_Domain::setRange() QCOMPARE(domain.minY(), minY); QCOMPARE(domain.maxY(), maxY); - TRY_COMPARE(spy0.count(), 1); - TRY_COMPARE(spy1.count(), 1); - TRY_COMPARE(spy2.count(), 1); + TRY_COMPARE(spy0.size(), 1); + TRY_COMPARE(spy1.size(), 1); + TRY_COMPARE(spy2.size(), 1); } @@ -481,9 +481,9 @@ void tst_Domain::setRangeX() QVERIFY(qFuzzyCompare(arg1.at(0).toReal(), min)); QVERIFY(qFuzzyCompare(arg1.at(1).toReal(), max)); - TRY_COMPARE(spy0.count(), 1); - TRY_COMPARE(spy1.count(), 1); - TRY_COMPARE(spy2.count(), 0); + TRY_COMPARE(spy0.size(), 1); + TRY_COMPARE(spy1.size(), 1); + TRY_COMPARE(spy2.size(), 0); } void tst_Domain::setRangeY_data() @@ -515,9 +515,9 @@ void tst_Domain::setRangeY() QVERIFY(qFuzzyCompare(arg1.at(0).toReal(), min)); QVERIFY(qFuzzyCompare(arg1.at(1).toReal(), max)); - TRY_COMPARE(spy0.count(), 1); - TRY_COMPARE(spy1.count(), 0); - TRY_COMPARE(spy2.count(), 1); + TRY_COMPARE(spy0.size(), 1); + TRY_COMPARE(spy1.size(), 0); + TRY_COMPARE(spy2.size(), 1); } void tst_Domain::spanX_data() @@ -545,9 +545,9 @@ void tst_Domain::spanX() QCOMPARE(domain.spanX(), spanX); - TRY_COMPARE(spy0.count(), 0); - TRY_COMPARE(spy1.count(), 0); - TRY_COMPARE(spy2.count(), 0); + TRY_COMPARE(spy0.size(), 0); + TRY_COMPARE(spy1.size(), 0); + TRY_COMPARE(spy2.size(), 0); } void tst_Domain::spanY_data() @@ -575,9 +575,9 @@ void tst_Domain::spanY() QCOMPARE(domain.spanY(), spanY); - TRY_COMPARE(spy0.count(), 0); - TRY_COMPARE(spy1.count(), 0); - TRY_COMPARE(spy2.count(), 0); + TRY_COMPARE(spy0.size(), 0); + TRY_COMPARE(spy1.size(), 0); + TRY_COMPARE(spy2.size(), 0); } void tst_Domain::zoomIn_data() @@ -615,9 +615,9 @@ void tst_Domain::zoomIn() QCOMPARE(domain.minY(),qreal(result.top())); QCOMPARE(domain.maxY(),qreal(result.bottom())); - TRY_COMPARE(spy0.count(), 1); - TRY_COMPARE(spy1.count(), 1); - TRY_COMPARE(spy2.count(), 1); + TRY_COMPARE(spy0.size(), 1); + TRY_COMPARE(spy1.size(), 1); + TRY_COMPARE(spy2.size(), 1); } void tst_Domain::zoomOut_data() @@ -655,9 +655,9 @@ void tst_Domain::zoomOut() QCOMPARE(domain.minY(),qreal(result.top())); QCOMPARE(domain.maxY(),qreal(result.bottom())); - TRY_COMPARE(spy0.count(), 1); - TRY_COMPARE(spy1.count(), 1); - TRY_COMPARE(spy2.count(), 1); + TRY_COMPARE(spy0.size(), 1); + TRY_COMPARE(spy1.size(), 1); + TRY_COMPARE(spy2.size(), 1); } void tst_Domain::move_data() @@ -697,9 +697,9 @@ void tst_Domain::move() QCOMPARE(domain.minY(),qreal(result.top())); QCOMPARE(domain.maxY(),qreal(result.bottom())); - TRY_COMPARE(spy0.count(), 1); - TRY_COMPARE(spy1.count(), (dx != 0 ? 1 : 0)); - TRY_COMPARE(spy2.count(), (dy != 0 ? 1 : 0)); + TRY_COMPARE(spy0.size(), 1); + TRY_COMPARE(spy1.size(), (dx != 0 ? 1 : 0)); + TRY_COMPARE(spy2.size(), (dy != 0 ? 1 : 0)); } QTEST_MAIN(tst_Domain) diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp index cf1cb041..8175087d 100644 --- a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp +++ b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp @@ -105,18 +105,18 @@ void tst_QAbstractAxis::axisPen() m_axis->setLinePen(axisPen); QCOMPARE(m_axis->linePen(), axisPen); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 0); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 0); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 0); m_chart->addAxis(m_axis, Qt::AlignBottom); m_series->attachAxis(m_axis); @@ -165,18 +165,18 @@ void tst_QAbstractAxis::gridLinePen() m_axis->setGridLinePen(gridLinePen); QCOMPARE(m_axis->gridLinePen(), gridLinePen); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 0); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 0); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 0); m_chart->addAxis(m_axis, Qt::AlignBottom); m_series->attachAxis(m_axis); @@ -216,18 +216,18 @@ void tst_QAbstractAxis::minorGridLinePen() m_axis->setMinorGridLinePen(minorGridLinePen); QCOMPARE(m_axis->minorGridLinePen(), minorGridLinePen); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 0); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 0); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 0); m_chart->addAxis(m_axis, Qt::AlignBottom); m_series->attachAxis(m_axis); @@ -265,18 +265,18 @@ void tst_QAbstractAxis::lineVisible() m_axis->setLineVisible(lineVisible); QCOMPARE(m_axis->isLineVisible(), lineVisible); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 0); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 0); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 0); m_chart->addAxis(m_axis, Qt::AlignBottom); m_series->attachAxis(m_axis); @@ -312,16 +312,16 @@ void tst_QAbstractAxis::gridLineVisible() m_axis->setGridLineVisible(gridLineVisible); QCOMPARE(m_axis->isGridLineVisible(), gridLineVisible); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 0); - QCOMPARE(spy9.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 0); + QCOMPARE(spy9.size(), 0); m_chart->addAxis(m_axis, Qt::AlignBottom); m_series->attachAxis(m_axis); @@ -360,18 +360,18 @@ void tst_QAbstractAxis::minorGridLineVisible() m_axis->setMinorGridLineVisible(minorGridLineVisible); QCOMPARE(m_axis->isMinorGridLineVisible(), minorGridLineVisible); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 0); - QCOMPARE(spy9.count(), 1); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 0); + QCOMPARE(spy9.size(), 1); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 0); m_chart->addAxis(m_axis, Qt::AlignBottom); m_series->attachAxis(m_axis); @@ -409,18 +409,18 @@ void tst_QAbstractAxis::gridLineColor() m_axis->setGridLineColor(gridLineColor); QCOMPARE(m_axis->gridLineColor(), gridLineColor); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 0); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 1); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 0); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 1); + QCOMPARE(spy11.size(), 0); m_chart->addAxis(m_axis, Qt::AlignBottom); m_series->attachAxis(m_axis); @@ -457,18 +457,18 @@ void tst_QAbstractAxis::minorGridLineColor() m_axis->setMinorGridLineColor(minorGridLineColor); QCOMPARE(m_axis->minorGridLineColor(), minorGridLineColor); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 0); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 1); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 0); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 1); m_chart->addAxis(m_axis, Qt::AlignBottom); m_series->attachAxis(m_axis); @@ -506,18 +506,18 @@ void tst_QAbstractAxis::visible() m_axis->setVisible(visible); QCOMPARE(m_axis->isVisible(), visible); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 1); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 1); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 0); m_chart->addAxis(m_axis, Qt::AlignBottom); m_series->attachAxis(m_axis); @@ -554,18 +554,18 @@ void tst_QAbstractAxis::labelsAngle() m_axis->setLabelsAngle(labelsAngle); QCOMPARE(m_axis->labelsAngle(), labelsAngle); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 0); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 0); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 0); m_chart->addAxis(m_axis, Qt::AlignBottom); m_series->attachAxis(m_axis); @@ -604,18 +604,18 @@ void tst_QAbstractAxis::labelsBrush() m_axis->setLabelsBrush(labelsBrush); QCOMPARE(m_axis->labelsBrush(), labelsBrush); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); //TODO QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 0); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 0); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 0); m_view->show(); QVERIFY(QTest::qWaitForWindowExposed(m_view)); @@ -661,18 +661,18 @@ void tst_QAbstractAxis::labelsFont() m_axis->setLabelsFont(labelsFont); QCOMPARE(m_axis->labelsFont(), labelsFont); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 0); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 0); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 0); m_view->show(); QVERIFY(QTest::qWaitForWindowExposed(m_view)); @@ -709,18 +709,18 @@ void tst_QAbstractAxis::labelsVisible() m_axis->setLabelsVisible(labelsVisible); QCOMPARE(m_axis->labelsVisible(), labelsVisible); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 1); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 0); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 1); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 0); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 0); m_chart->addAxis(m_axis, Qt::AlignBottom); m_series->attachAxis(m_axis); @@ -762,18 +762,18 @@ void tst_QAbstractAxis::orientation() } QCOMPARE(m_axis->orientation(), orientation); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 0); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 0); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 0); m_view->show(); QVERIFY(QTest::qWaitForWindowExposed(m_view)); @@ -865,18 +865,18 @@ void tst_QAbstractAxis::shadesBrush() m_axis->setShadesBrush(shadesBrush); QCOMPARE(m_axis->shadesBrush(), shadesBrush); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); //TODO QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 0); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 0); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 0); m_view->show(); QVERIFY(QTest::qWaitForWindowExposed(m_view)); @@ -922,18 +922,18 @@ void tst_QAbstractAxis::shadesPen() m_axis->setShadesPen(shadesPen); QCOMPARE(m_axis->shadesPen(), shadesPen); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 0); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 0); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 0); m_chart->addAxis(m_axis, Qt::AlignBottom); m_series->attachAxis(m_axis); @@ -971,18 +971,18 @@ void tst_QAbstractAxis::shadesVisible() m_axis->setShadesVisible(shadesVisible); QCOMPARE(m_axis->shadesVisible(), shadesVisible); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 1); - QCOMPARE(spy8.count(), 0); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 1); + QCOMPARE(spy8.size(), 0); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 0); m_chart->addAxis(m_axis, Qt::AlignBottom); m_series->attachAxis(m_axis); @@ -1016,18 +1016,18 @@ void tst_QAbstractAxis::show() m_axis->show(); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 1); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 1); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 0); QCOMPARE(m_axis->isVisible(), true); } @@ -1056,18 +1056,18 @@ void tst_QAbstractAxis::hide() m_axis->hide(); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); - QCOMPARE(spy5.count(), 0); - QCOMPARE(spy6.count(), 0); - QCOMPARE(spy7.count(), 0); - QCOMPARE(spy8.count(), 1); - QCOMPARE(spy9.count(), 0); - QCOMPARE(spy10.count(), 0); - QCOMPARE(spy11.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); + QCOMPARE(spy5.size(), 0); + QCOMPARE(spy6.size(), 0); + QCOMPARE(spy7.size(), 0); + QCOMPARE(spy8.size(), 1); + QCOMPARE(spy9.size(), 0); + QCOMPARE(spy10.size(), 0); + QCOMPARE(spy11.size(), 0); QCOMPARE(m_axis->isVisible(),false); } diff --git a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp index 85a43782..57c467e3 100644 --- a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp +++ b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp @@ -152,10 +152,10 @@ void tst_QBarCategoriesAxis::append() axis.append(categories); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 1); m_chart->addAxis(&axis, Qt::AlignBottom); m_series->attachAxis(&axis); @@ -163,11 +163,11 @@ void tst_QBarCategoriesAxis::append() QVERIFY(QTest::qWaitForWindowExposed(m_view)); QCOMPARE(axis.categories(), categories); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 1); - QCOMPARE(spy4.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 1); + QCOMPARE(spy4.size(), 1); } void tst_QBarCategoriesAxis::append2_data() @@ -192,10 +192,10 @@ void tst_QBarCategoriesAxis::append2() foreach(QString category, categories) axis.append(category); - QCOMPARE(spy0.count(), categories.count()); - QCOMPARE(spy1.count(), categories.count()); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), categories.count()); + QCOMPARE(spy0.size(), categories.size()); + QCOMPARE(spy1.size(), categories.size()); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), categories.size()); m_chart->addAxis(&axis, Qt::AlignBottom); m_series->attachAxis(&axis); @@ -203,11 +203,11 @@ void tst_QBarCategoriesAxis::append2() QVERIFY(QTest::qWaitForWindowExposed(m_view)); QCOMPARE(axis.categories(), categories); - QCOMPARE(spy0.count(), categories.count()); - QCOMPARE(spy1.count(), categories.count()); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), categories.count()); - QCOMPARE(spy4.count(), categories.count()); + QCOMPARE(spy0.size(), categories.size()); + QCOMPARE(spy1.size(), categories.size()); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), categories.size()); + QCOMPARE(spy4.size(), categories.size()); } void tst_QBarCategoriesAxis::at_data() @@ -237,10 +237,10 @@ void tst_QBarCategoriesAxis::at() QCOMPARE(axis.at(index), string); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); m_chart->addAxis(&axis, Qt::AlignBottom); m_series->attachAxis(&axis); @@ -248,11 +248,11 @@ void tst_QBarCategoriesAxis::at() QVERIFY(QTest::qWaitForWindowExposed(m_view)); QCOMPARE(axis.at(index), string); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); } void tst_QBarCategoriesAxis::categories_data() @@ -276,10 +276,10 @@ void tst_QBarCategoriesAxis::categories() axis.setCategories(categories); QCOMPARE(axis.categories(), categories); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 1); m_chart->addAxis(&axis, Qt::AlignBottom); m_series->attachAxis(&axis); @@ -287,11 +287,11 @@ void tst_QBarCategoriesAxis::categories() QVERIFY(QTest::qWaitForWindowExposed(m_view)); QCOMPARE(axis.categories(), categories); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 1); - QCOMPARE(spy4.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 1); + QCOMPARE(spy4.size(), 1); } void tst_QBarCategoriesAxis::clear_data() @@ -318,28 +318,28 @@ void tst_QBarCategoriesAxis::clear() axis.clear(); QCOMPARE(axis.categories(), QStringList()); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 1); m_chart->addAxis(&axis, Qt::AlignBottom); m_series->attachAxis(&axis); m_view->show(); QVERIFY(QTest::qWaitForWindowExposed(m_view)); - QCOMPARE(spy0.count(), 2); - QCOMPARE(spy1.count(), 2); - QCOMPARE(spy2.count(), 2); - QCOMPARE(spy3.count(), 2); + QCOMPARE(spy0.size(), 2); + QCOMPARE(spy1.size(), 2); + QCOMPARE(spy2.size(), 2); + QCOMPARE(spy3.size(), 2); axis.clear(); - QCOMPARE(axis.categories().count(),0); - QCOMPARE(spy0.count(), 3); - QCOMPARE(spy1.count(), 3); - QCOMPARE(spy2.count(), 3); - QCOMPARE(spy3.count(), 3); - QCOMPARE(spy4.count(), 3); + QCOMPARE(axis.categories().size(),0); + QCOMPARE(spy0.size(), 3); + QCOMPARE(spy1.size(), 3); + QCOMPARE(spy2.size(), 3); + QCOMPARE(spy3.size(), 3); + QCOMPARE(spy4.size(), 3); } void tst_QBarCategoriesAxis::count_data() @@ -366,11 +366,11 @@ void tst_QBarCategoriesAxis::count() QCOMPARE(axis.count(), count); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 0); m_chart->addAxis(&axis, Qt::AlignBottom); m_series->attachAxis(&axis); @@ -406,11 +406,11 @@ void tst_QBarCategoriesAxis::insert() axis.insert(index, category); QCOMPARE(axis.at(index),category); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 0); - QCOMPARE(spy4.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 0); + QCOMPARE(spy4.size(), 1); m_chart->addAxis(&axis, Qt::AlignBottom); m_series->attachAxis(&axis); @@ -449,11 +449,11 @@ void tst_QBarCategoriesAxis::remove() axis.remove(category); QCOMPARE(axis.categories(),result); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), maxCount); - QCOMPARE(spy2.count(), minCount); - QCOMPARE(spy3.count(), rangeCount); - QCOMPARE(spy4.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), maxCount); + QCOMPARE(spy2.size(), minCount); + QCOMPARE(spy3.size(), rangeCount); + QCOMPARE(spy4.size(), 1); } void tst_QBarCategoriesAxis::max_raw_data() @@ -478,11 +478,11 @@ void tst_QBarCategoriesAxis::max_raw() m_baraxis->setMax(max); QCOMPARE(m_baraxis->max(), max); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 0); - QCOMPARE(spy3.count(), 1); - QCOMPARE(spy4.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 0); + QCOMPARE(spy3.size(), 1); + QCOMPARE(spy4.size(), 0); } void tst_QBarCategoriesAxis::max_data() @@ -532,11 +532,11 @@ void tst_QBarCategoriesAxis::min_raw() m_baraxis->setMin(min); QCOMPARE(m_baraxis->min(), min); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 1); - QCOMPARE(spy4.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 1); + QCOMPARE(spy4.size(), 0); } void tst_QBarCategoriesAxis::min_data() @@ -591,11 +591,11 @@ void tst_QBarCategoriesAxis::range_raw() QCOMPARE(m_baraxis->min(), min); QCOMPARE(m_baraxis->max(), max); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 1); - QCOMPARE(spy4.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 1); + QCOMPARE(spy4.size(), 0); } void tst_QBarCategoriesAxis::range_data() @@ -647,9 +647,9 @@ void tst_QBarCategoriesAxis::noautoscale() QCOMPARE(m_baraxis->min(),min); QCOMPARE(m_baraxis->max(),max); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); m_chart->addAxis(m_baraxis, Qt::AlignBottom); m_series->attachAxis(m_baraxis); @@ -678,9 +678,9 @@ void tst_QBarCategoriesAxis::autoscale() m_chart->addAxis(m_baraxis, Qt::AlignBottom); m_series->attachAxis(m_baraxis); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); m_view->show(); QVERIFY(QTest::qWaitForWindowExposed(m_view)); diff --git a/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp b/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp index 988b9cd3..b5e16b99 100644 --- a/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp +++ b/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp @@ -350,7 +350,7 @@ void tst_qbarmodelmapper::seriesUpdated() QList<qreal> newValues; newValues << 15 << 27 << 35 << 49; m_series->barSets().first()->append(newValues); - QCOMPARE(m_model->rowCount(), 1 + newValues.count()); + QCOMPARE(m_model->rowCount(), 1 + newValues.size()); QList<QBarSet* > newBarSets; QBarSet* newBarSet_1 = new QBarSet("New_1"); @@ -366,7 +366,7 @@ void tst_qbarmodelmapper::seriesUpdated() newBarSets.append(newBarSet_2); m_series->append(newBarSets); - QCOMPARE(m_model->columnCount(), m_modelColumnCount + newBarSets.count()); + QCOMPARE(m_model->columnCount(), m_modelColumnCount + newBarSets.size()); } void tst_qbarmodelmapper::verticalModelInsertRows() @@ -621,12 +621,12 @@ void tst_qbarmodelmapper::verticalMapperSignals() mapper->setFirstRow(1); mapper->setRowCount(5); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 1); - QCOMPARE(spy4.count(), 1); - QCOMPARE(spy5.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 1); + QCOMPARE(spy4.size(), 1); + QCOMPARE(spy5.size(), 1); delete mapper; } @@ -649,12 +649,12 @@ void tst_qbarmodelmapper::horizontalMapperSignals() mapper->setFirstColumn(1); mapper->setColumnCount(5); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 1); - QCOMPARE(spy4.count(), 1); - QCOMPARE(spy5.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 1); + QCOMPARE(spy4.size(), 1); + QCOMPARE(spy5.size(), 1); delete mapper; } diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp index cc068d4e..315957da 100644 --- a/tests/auto/qbarseries/tst_qbarseries.cpp +++ b/tests/auto/qbarseries/tst_qbarseries.cpp @@ -165,7 +165,7 @@ void tst_QBarSeries::remove_data() void tst_QBarSeries::remove() { - int count = m_testSets.count(); + int count = m_testSets.size(); QVERIFY(m_barseries_with_sets->count() == count); // Try to remove null pointer (should not remove, should not crash) @@ -211,19 +211,19 @@ void tst_QBarSeries::take_data() void tst_QBarSeries::take() { - int count = m_testSets.count(); + int count = m_testSets.size(); QVERIFY(m_barseries_with_sets->count() == count); QSignalSpy countSpy(m_barseries_with_sets,SIGNAL(countChanged())); QSignalSpy removedSpy(m_barseries_with_sets,SIGNAL(barsetsRemoved(QList<QBarSet*>))); - for (int i=0; i<m_testSets.count(); i++) { + for (int i=0; i<m_testSets.size(); i++) { QBarSet* set = m_testSets.at(i); bool success = m_barseries_with_sets->take(set); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QVERIFY(success); - TRY_COMPARE(countSpy.count(),1); - TRY_COMPARE(removedSpy.count(),1); + TRY_COMPARE(countSpy.size(),1); + TRY_COMPARE(removedSpy.size(),1); QList<QVariant> removedSpyArg = removedSpy.takeFirst(); QList<QBarSet*> removedSets = qvariant_cast<QList<QBarSet*> > (removedSpyArg.at(0)); @@ -291,7 +291,7 @@ void tst_QBarSeries::count_data() void tst_QBarSeries::count() { QVERIFY(m_barseries->count() == 0); - QVERIFY(m_barseries_with_sets->count() == m_testSets.count()); + QVERIFY(m_barseries_with_sets->count() == m_testSets.size()); } void tst_QBarSeries::barSets_data() @@ -301,12 +301,12 @@ void tst_QBarSeries::barSets_data() void tst_QBarSeries::barSets() { - QVERIFY(m_barseries->barSets().count() == 0); + QVERIFY(m_barseries->barSets().size() == 0); QList<QBarSet*> sets = m_barseries_with_sets->barSets(); - QVERIFY(sets.count() == m_testSets.count()); + QVERIFY(sets.size() == m_testSets.size()); - for (int i=0; i<m_testSets.count(); i++) { + for (int i=0; i<m_testSets.size(); i++) { QVERIFY(sets.at(i) == m_testSets.at(i)); } } @@ -345,13 +345,13 @@ void tst_QBarSeries::setLabelsFormat() QString format("(@value)"); m_barseries->setLabelsFormat(format); - TRY_COMPARE(labelsFormatSpy.count(), 1); + TRY_COMPARE(labelsFormatSpy.size(), 1); QList<QVariant> arguments = labelsFormatSpy.takeFirst(); QVERIFY(arguments.at(0).toString() == format); QCOMPARE(m_barseries->labelsFormat(), format); m_barseries->setLabelsFormat(QString()); - TRY_COMPARE(labelsFormatSpy.count(), 1); + TRY_COMPARE(labelsFormatSpy.size(), 1); arguments = labelsFormatSpy.takeFirst(); QVERIFY(arguments.at(0).toString() == QString()); QCOMPARE(m_barseries->labelsFormat(), QString()); @@ -364,28 +364,28 @@ void tst_QBarSeries::setLabelsPosition() QCOMPARE(m_barseries->labelsPosition(), QBarSeries::LabelsCenter); m_barseries->setLabelsPosition(QBarSeries::LabelsInsideEnd); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); QList<QVariant> arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QBarSeries::LabelsInsideEnd); QCOMPARE(m_barseries->labelsPosition(), QBarSeries::LabelsInsideEnd); m_barseries->setLabelsPosition(QBarSeries::LabelsInsideBase); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QBarSeries::LabelsInsideBase); QCOMPARE(m_barseries->labelsPosition(), QBarSeries::LabelsInsideBase); m_barseries->setLabelsPosition(QBarSeries::LabelsOutsideEnd); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QBarSeries::LabelsOutsideEnd); QCOMPARE(m_barseries->labelsPosition(), QBarSeries::LabelsOutsideEnd); m_barseries->setLabelsPosition(QBarSeries::LabelsCenter); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QBarSeries::LabelsCenter); @@ -399,7 +399,7 @@ void tst_QBarSeries::setLabelsAngle() QCOMPARE(m_barseries->labelsAngle(), 0.0); m_barseries->setLabelsAngle(55.0); - TRY_COMPARE(labelsAngleSpy.count(), 1); + TRY_COMPARE(labelsAngleSpy.size(), 1); QList<QVariant> arguments = labelsAngleSpy.takeFirst(); QVERIFY(arguments.at(0).value<qreal>() == 55.0); QCOMPARE(m_barseries->labelsAngle(), 55.0); @@ -412,7 +412,7 @@ void tst_QBarSeries::setLabelsPrecision() QCOMPARE(m_barseries->labelsPrecision(), 6); m_barseries->setLabelsPrecision(9); - TRY_COMPARE(labelsPrecisionSpy.count(), 1); + TRY_COMPARE(labelsPrecisionSpy.size(), 1); QList<QVariant> arguments = labelsPrecisionSpy.takeFirst(); QVERIFY(arguments.at(0).value<int>() == 9); QCOMPARE(m_barseries->labelsPrecision(), 9); @@ -426,15 +426,15 @@ void tst_QBarSeries::opacity() m_barseries->setOpacity(0.5); QCOMPARE(m_barseries->opacity(), 0.5); - QCOMPARE(opacitySpy.count(), 1); + QCOMPARE(opacitySpy.size(), 1); m_barseries->setOpacity(0.0); QCOMPARE(m_barseries->opacity(), 0.0); - QCOMPARE(opacitySpy.count(), 2); + QCOMPARE(opacitySpy.size(), 2); m_barseries->setOpacity(1.0); QCOMPARE(m_barseries->opacity(), 1.0); - QCOMPARE(opacitySpy.count(), 3); + QCOMPARE(opacitySpy.size(), 3); } void tst_QBarSeries::mouseclicked_data() @@ -503,9 +503,9 @@ void tst_QBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -521,9 +521,9 @@ void tst_QBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -539,9 +539,9 @@ void tst_QBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -557,9 +557,9 @@ void tst_QBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -575,9 +575,9 @@ void tst_QBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -593,9 +593,9 @@ void tst_QBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -690,16 +690,16 @@ void tst_QBarSeries::mousehovered() // move mouse to left border QTest::mouseMove(view.viewport(), QPoint(0, layout.at(0).center().y())); QTest::qWait(5000); - QCOMPARE(seriesIndexSpy.count(), 0); - QCOMPARE(setIndexSpy1.count(), 0); - QCOMPARE(setIndexSpy2.count(), 0); + QCOMPARE(seriesIndexSpy.size(), 0); + QCOMPARE(setIndexSpy1.size(), 0); + QCOMPARE(setIndexSpy2.size(), 0); //======================================================================= // move mouse to just inside left border to account for labels QTest::mouseMove(view.viewport(), QPoint(layout.at(0).x() + 1, layout.at(0).y() + 1)); - QTRY_COMPARE(seriesIndexSpy.count(), 1); - QTRY_COMPARE(setIndexSpy1.count(), 1); - QTRY_COMPARE(setIndexSpy2.count(), 0); + QTRY_COMPARE(seriesIndexSpy.size(), 1); + QTRY_COMPARE(setIndexSpy1.size(), 1); + QTRY_COMPARE(setIndexSpy2.size(), 0); QList<QVariant> seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesIndexSpyArg.at(2)), set1); @@ -714,24 +714,24 @@ void tst_QBarSeries::mousehovered() // move mouse to center of set1 QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); QTest::qWait(5000); - QCOMPARE(seriesIndexSpy.count(), 0); - QCOMPARE(setIndexSpy1.count(), 0); - QCOMPARE(setIndexSpy2.count(), 0); + QCOMPARE(seriesIndexSpy.size(), 0); + QCOMPARE(setIndexSpy1.size(), 0); + QCOMPARE(setIndexSpy2.size(), 0); //======================================================================= // move mouse to bottom of set1 QTest::mouseMove(view.viewport(), QPoint(layout.at(0).center().x(), layout.at(0).bottom())); QTest::qWait(5000); - QCOMPARE(seriesIndexSpy.count(), 0); - QCOMPARE(setIndexSpy1.count(), 0); - QCOMPARE(setIndexSpy2.count(), 0); + QCOMPARE(seriesIndexSpy.size(), 0); + QCOMPARE(setIndexSpy1.size(), 0); + QCOMPARE(setIndexSpy2.size(), 0); //======================================================================= // move mouse from top of set1 to top of set2 QTest::mouseMove(view.viewport(), QPoint(layout.at(1).x() + 1, layout.at(1).y() + 1)); - QTRY_COMPARE(seriesIndexSpy.count(), 2); - QTRY_COMPARE(setIndexSpy1.count(), 1); - QTRY_COMPARE(setIndexSpy2.count(), 1); + QTRY_COMPARE(seriesIndexSpy.size(), 2); + QTRY_COMPARE(setIndexSpy1.size(), 1); + QTRY_COMPARE(setIndexSpy2.size(), 1); // should leave set1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -756,9 +756,9 @@ void tst_QBarSeries::mousehovered() //======================================================================= // move mouse from top of set2 to background QTest::mouseMove(view.viewport(), QPoint(layout.at(1).center().x(), 0)); - QTRY_COMPARE(seriesIndexSpy.count(), 1); - QTRY_COMPARE(setIndexSpy1.count(), 0); - QTRY_COMPARE(setIndexSpy2.count(), 1); + QTRY_COMPARE(seriesIndexSpy.size(), 1); + QTRY_COMPARE(setIndexSpy1.size(), 0); + QTRY_COMPARE(setIndexSpy2.size(), 1); // should leave set2 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -774,9 +774,9 @@ void tst_QBarSeries::mousehovered() // move mouse on top of set1, bar0 to check the index (hover into set1) QTest::mouseMove(view.viewport(), QPoint(layout.at(0).x() + 1, layout.at(0).y() + 1)); - QTRY_COMPARE(seriesIndexSpy.count(), 1); - QTRY_COMPARE(setIndexSpy1.count(), 1); - QTRY_COMPARE(setIndexSpy2.count(), 0); + QTRY_COMPARE(seriesIndexSpy.size(), 1); + QTRY_COMPARE(setIndexSpy1.size(), 1); + QTRY_COMPARE(setIndexSpy2.size(), 0); //should enter set1, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -797,9 +797,9 @@ void tst_QBarSeries::mousehovered() // hover in set1) QTest::mouseMove(view.viewport(), QPoint(layout.at(1).x() + 1, layout.at(1).y() + 1)); - QTRY_COMPARE(seriesIndexSpy.count(), 2); - QTRY_COMPARE(setIndexSpy1.count(), 1); - QTRY_COMPARE(setIndexSpy2.count(), 1); + QTRY_COMPARE(seriesIndexSpy.size(), 2); + QTRY_COMPARE(setIndexSpy1.size(), 1); + QTRY_COMPARE(setIndexSpy2.size(), 1); // should leave set1, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -834,9 +834,9 @@ void tst_QBarSeries::mousehovered() // hover in set1) QTest::mouseMove(view.viewport(), QPoint(layout.at(2).x() + 1, layout.at(2).y() + 1)); - QTRY_COMPARE(seriesIndexSpy.count(), 2); - QTRY_COMPARE(setIndexSpy1.count(), 1); - QTRY_COMPARE(setIndexSpy2.count(), 1); + QTRY_COMPARE(seriesIndexSpy.size(), 2); + QTRY_COMPARE(setIndexSpy1.size(), 1); + QTRY_COMPARE(setIndexSpy2.size(), 1); // should leave set2, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -871,9 +871,9 @@ void tst_QBarSeries::mousehovered() // (hover out set1) QTest::mouseMove(view.viewport(), QPoint((layout.at(2).right() + layout.at(3).left()) / 2, 0)); - QTRY_COMPARE(seriesIndexSpy.count(), 1); - QTRY_COMPARE(setIndexSpy1.count(), 1); - QTRY_COMPARE(setIndexSpy2.count(), 0); + QTRY_COMPARE(seriesIndexSpy.size(), 1); + QTRY_COMPARE(setIndexSpy1.size(), 1); + QTRY_COMPARE(setIndexSpy2.size(), 0); // should leave set1, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -893,9 +893,9 @@ void tst_QBarSeries::mousehovered() // move mouse on top of set2, bar1 to check the index (hover in set2) QTest::mouseMove(view.viewport(), QPoint(layout.at(3).x() + 1, layout.at(3).y() + 1)); - QTRY_COMPARE(seriesIndexSpy.count(), 1); - QTRY_COMPARE(setIndexSpy1.count(), 0); - QTRY_COMPARE(setIndexSpy2.count(), 1); + QTRY_COMPARE(seriesIndexSpy.size(), 1); + QTRY_COMPARE(setIndexSpy1.size(), 0); + QTRY_COMPARE(setIndexSpy2.size(), 1); // should enter set2, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -916,9 +916,9 @@ void tst_QBarSeries::mousehovered() //(hover out set2) QTest::mouseMove(view.viewport(), QPoint((layout.at(3).right() + layout.at(3).left()) / 2, 0)); - QTRY_COMPARE(seriesIndexSpy.count(), 1); - QTRY_COMPARE(setIndexSpy1.count(), 0); - QTRY_COMPARE(setIndexSpy2.count(), 1); + QTRY_COMPARE(seriesIndexSpy.size(), 1); + QTRY_COMPARE(setIndexSpy1.size(), 0); + QTRY_COMPARE(setIndexSpy2.size(), 1); // should leave set2, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -968,7 +968,7 @@ void tst_QBarSeries::destruction() delete series; // check that series deletes the set - QCOMPARE(spy1.count(), 1); + QCOMPARE(spy1.size(), 1); } void tst_QBarSeries::mousePressed() @@ -1032,9 +1032,9 @@ void tst_QBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -1050,9 +1050,9 @@ void tst_QBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -1068,9 +1068,9 @@ void tst_QBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -1086,9 +1086,9 @@ void tst_QBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -1104,9 +1104,9 @@ void tst_QBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -1122,9 +1122,9 @@ void tst_QBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -1197,9 +1197,9 @@ void tst_QBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -1215,9 +1215,9 @@ void tst_QBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -1233,9 +1233,9 @@ void tst_QBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -1251,9 +1251,9 @@ void tst_QBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -1269,9 +1269,9 @@ void tst_QBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -1287,9 +1287,9 @@ void tst_QBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -1361,9 +1361,9 @@ void tst_QBarSeries::mouseDoubleClicked() QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); diff --git a/tests/auto/qbarset/tst_qbarset.cpp b/tests/auto/qbarset/tst_qbarset.cpp index e4cdb14c..dc867c8f 100644 --- a/tests/auto/qbarset/tst_qbarset.cpp +++ b/tests/auto/qbarset/tst_qbarset.cpp @@ -96,7 +96,7 @@ void tst_QBarSet::label() QSignalSpy labelSpy(m_barset,SIGNAL(labelChanged())); m_barset->setLabel(label); QCOMPARE(m_barset->label(), result); - QVERIFY(labelSpy.count() == 1); + QVERIFY(labelSpy.size() == 1); } void tst_QBarSet::append_data() @@ -130,7 +130,7 @@ void tst_QBarSet::append() QCOMPARE(m_barset->count(), count); QVERIFY(qFuzzyCompare(m_barset->sum(), sum)); - QCOMPARE(valueSpy.count(), count); + QCOMPARE(valueSpy.size(), count); } void tst_QBarSet::appendOperator_data() @@ -159,7 +159,7 @@ void tst_QBarSet::appendOperator() QCOMPARE(m_barset->count(), count); QVERIFY(qFuzzyCompare(m_barset->sum(), sum)); - QCOMPARE(valueSpy.count(), count); + QCOMPARE(valueSpy.size(), count); } void tst_QBarSet::insert_data() @@ -189,7 +189,7 @@ void tst_QBarSet::insert() QCOMPARE(m_barset->at(2), 1.0); QCOMPARE(m_barset->count(), 3); QVERIFY(qFuzzyCompare(m_barset->sum(), (qreal)6.0)); - QCOMPARE(valueSpy.count(), 3); + QCOMPARE(valueSpy.size(), 3); } void tst_QBarSet::remove_data() @@ -218,7 +218,7 @@ void tst_QBarSet::remove() QCOMPARE(m_barset->at(2), 4.0); QCOMPARE(m_barset->count(), 3); QCOMPARE(m_barset->sum(), 7.0); - QCOMPARE(valueSpy.count(), 1); + QCOMPARE(valueSpy.size(), 1); QList<QVariant> valueSpyArg = valueSpy.takeFirst(); // Verify index of removed signal @@ -235,7 +235,7 @@ void tst_QBarSet::remove() QCOMPARE(m_barset->count(), 2); QCOMPARE(m_barset->sum(), 6.0); - QCOMPARE(valueSpy.count(), 1); + QCOMPARE(valueSpy.size(), 1); valueSpyArg = valueSpy.takeFirst(); // Verify index of removed signal QVERIFY(valueSpyArg.at(0).metaType().id() == QMetaType::Int); @@ -254,14 +254,14 @@ void tst_QBarSet::remove() QCOMPARE(m_barset->sum(), 6.0); // nothing removed, no signals should be emitted - QCOMPARE(valueSpy.count(), 0); + QCOMPARE(valueSpy.size(), 0); // Remove more items than list has m_barset->remove(0,312); QCOMPARE(m_barset->count(), 0); QVERIFY(qFuzzyCompare(m_barset->sum(), 0)); - QCOMPARE(valueSpy.count(), 1); + QCOMPARE(valueSpy.size(), 1); valueSpyArg = valueSpy.takeFirst(); // Verify index of removed signal @@ -320,7 +320,7 @@ void tst_QBarSet::replace() QCOMPARE(m_barset->count(), 4); // 5.0 2.0 3.0 6.0 QCOMPARE(m_barset->sum(), 16.0); - QVERIFY(valueSpy.count() == 2); + QVERIFY(valueSpy.size() == 2); } void tst_QBarSet::at_data() diff --git a/tests/auto/qcandlestickmodelmapper/tst_qcandlestickmodelmapper.cpp b/tests/auto/qcandlestickmodelmapper/tst_qcandlestickmodelmapper.cpp index 9669bd4f..109b0646 100644 --- a/tests/auto/qcandlestickmodelmapper/tst_qcandlestickmodelmapper.cpp +++ b/tests/auto/qcandlestickmodelmapper/tst_qcandlestickmodelmapper.cpp @@ -401,7 +401,7 @@ void tst_qcandlestickmodelmapper::seriesUpdated() newCandlestickSets << new QCandlestickSet(5.0, 7.0, 4.0, 6.0, 5678); newCandlestickSets << new QCandlestickSet(3.0, 8.0, 4.0, 6.0, 6789); m_series->append(newCandlestickSets); - QCOMPARE(m_model->columnCount(), m_modelColumnCount + newCandlestickSets.count()); + QCOMPARE(m_model->columnCount(), m_modelColumnCount + newCandlestickSets.size()); // remove sets newCandlestickSets.clear(); @@ -561,15 +561,15 @@ void tst_qcandlestickmodelmapper::verticalMapperSignals() mapper->setFirstSetColumn(0); mapper->setLastSetColumn(1); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 1); - QCOMPARE(spy4.count(), 1); - QCOMPARE(spy5.count(), 1); - QCOMPARE(spy6.count(), 1); - QCOMPARE(spy7.count(), 1); - QCOMPARE(spy8.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 1); + QCOMPARE(spy4.size(), 1); + QCOMPARE(spy5.size(), 1); + QCOMPARE(spy6.size(), 1); + QCOMPARE(spy7.size(), 1); + QCOMPARE(spy8.size(), 1); delete mapper; } @@ -598,15 +598,15 @@ void tst_qcandlestickmodelmapper::horizontalMapperSignals() mapper->setFirstSetRow(0); mapper->setLastSetRow(1); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 1); - QCOMPARE(spy4.count(), 1); - QCOMPARE(spy5.count(), 1); - QCOMPARE(spy6.count(), 1); - QCOMPARE(spy7.count(), 1); - QCOMPARE(spy8.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 1); + QCOMPARE(spy4.size(), 1); + QCOMPARE(spy5.size(), 1); + QCOMPARE(spy6.size(), 1); + QCOMPARE(spy7.size(), 1); + QCOMPARE(spy8.size(), 1); delete mapper; } diff --git a/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp b/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp index ac7efef9..93c195ea 100644 --- a/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp +++ b/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp @@ -59,7 +59,7 @@ private: struct SetList : QList<QPointer<QCandlestickSet>> { operator QList<QCandlestickSet *> () const { QList<QCandlestickSet *> list; - for (int i = 0; i < count(); ++i) + for (int i = 0; i < size(); ++i) list.append(at(i)); return list; } @@ -141,15 +141,15 @@ void tst_QCandlestickSeries::append() void tst_QCandlestickSeries::remove() { m_series->append(m_sets); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); // Try to remove null pointer (should not remove, should not crash) QVERIFY(!m_series->remove(nullptr)); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); // Try to remove invalid pointer (should not remove, should not crash) QVERIFY(!m_series->remove((QCandlestickSet *)(m_sets.at(0) + 1))); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); // Remove some sets const int removeCount = 3; @@ -157,13 +157,13 @@ void tst_QCandlestickSeries::remove() QVERIFY(m_series->remove(m_sets.at(i))); QVERIFY(!m_sets.at(i)); } - QCOMPARE(m_series->count(), m_sets.count() - removeCount); + QCOMPARE(m_series->count(), m_sets.size() - removeCount); - for (int i = removeCount; i < m_sets.count(); ++i) + for (int i = removeCount; i < m_sets.size(); ++i) QCOMPARE(m_series->sets().at(i - removeCount), m_sets.at(i)); // Try removing all sets again (should be ok, even if some sets have already been removed) - for (int i = 0; i < m_sets.count(); ++i) { + for (int i = 0; i < m_sets.size(); ++i) { m_series->remove(m_sets.at(i)); QVERIFY(!m_sets.at(i)); } @@ -185,13 +185,13 @@ void tst_QCandlestickSeries::appendList() // Try append empty list (should succeed, but count should remain same) QList<QCandlestickSet *> invalidList; QVERIFY(m_series->append(invalidList)); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); // Try append list with one new and one existing set (should fail, count remains same) invalidList.append(new QCandlestickSet()); invalidList.append(m_sets.at(0)); QVERIFY(!m_series->append(invalidList)); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); delete invalidList.at(0); invalidList.clear(); @@ -201,24 +201,24 @@ void tst_QCandlestickSeries::appendList() invalidList.append(nullptr); invalidList.append(nullptr); QVERIFY(!m_series->append(invalidList)); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); } void tst_QCandlestickSeries::removeList() { m_series->append(m_sets); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); // Try remove empty list (should fail, but count should remain same) QList<QCandlestickSet *> invalidList; QVERIFY(!m_series->remove(invalidList)); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); // Try remove list with one new and one existing set (should fail, count remains same) invalidList.append(new QCandlestickSet()); invalidList.append(m_sets.at(0)); QVERIFY(!m_series->remove(invalidList)); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); delete invalidList.at(0); invalidList.clear(); @@ -228,7 +228,7 @@ void tst_QCandlestickSeries::removeList() invalidList.append(nullptr); invalidList.append(nullptr); QVERIFY(!m_series->remove(invalidList)); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); // Remove all sets (should succeed, count should be zero) QVERIFY(m_series->remove(m_sets)); @@ -246,17 +246,17 @@ void tst_QCandlestickSeries::insert() QSignalSpy countSpy(m_series, SIGNAL(countChanged())); QSignalSpy addedSpy(m_series, SIGNAL(candlestickSetsAdded(QList<QCandlestickSet *>))); - for (int i = 0; i < m_sets.count(); ++i) { + for (int i = 0; i < m_sets.size(); ++i) { QCandlestickSet *set = m_sets.at(i); QVERIFY(m_series->insert(0, set)); QCOMPARE(m_series->count(), i + 1); - QTRY_COMPARE(countSpy.count(), i + 1); - QTRY_COMPARE(addedSpy.count(), i + 1); + QTRY_COMPARE(countSpy.size(), i + 1); + QTRY_COMPARE(addedSpy.size(), i + 1); QList<QVariant> args = addedSpy.value(i); - QCOMPARE(args.count(), 1); + QCOMPARE(args.size(), 1); QList<QCandlestickSet *> sets = qvariant_cast<QList<QCandlestickSet *>>(args.at(0)); - QCOMPARE(sets.count(), 1); + QCOMPARE(sets.size(), 1); QCOMPARE(sets.first(), set); } } @@ -264,22 +264,22 @@ void tst_QCandlestickSeries::insert() void tst_QCandlestickSeries::take() { m_series->append(m_sets); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); QSignalSpy countSpy(m_series, SIGNAL(countChanged())); QSignalSpy removedSpy(m_series, SIGNAL(candlestickSetsRemoved(QList<QCandlestickSet *>))); - for (int i = 0; i < m_sets.count(); ++i) { + for (int i = 0; i < m_sets.size(); ++i) { QCandlestickSet *set = m_sets.at(i); QVERIFY(m_series->take(set)); - QCOMPARE(m_series->count(), m_sets.count() - i - 1); - QTRY_COMPARE(countSpy.count(), i + 1); - QTRY_COMPARE(removedSpy.count(), i + 1); + QCOMPARE(m_series->count(), m_sets.size() - i - 1); + QTRY_COMPARE(countSpy.size(), i + 1); + QTRY_COMPARE(removedSpy.size(), i + 1); QList<QVariant> args = removedSpy.value(i); - QCOMPARE(args.count(), 1); + QCOMPARE(args.size(), 1); QList<QCandlestickSet *> sets = qvariant_cast<QList<QCandlestickSet *>>(args.at(0)); - QCOMPARE(sets.count(), 1); + QCOMPARE(sets.size(), 1); QCOMPARE(sets.first(), set); } } @@ -287,7 +287,7 @@ void tst_QCandlestickSeries::take() void tst_QCandlestickSeries::clear() { m_series->append(m_sets); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); m_series->clear(); QCOMPARE(m_series->count(), 0); @@ -298,7 +298,7 @@ void tst_QCandlestickSeries::sets() m_series->append(m_sets); QCOMPARE(m_series->sets(), (QList<QCandlestickSet *>)m_sets); - for (int i = 0; i < m_sets.count(); ++i) + for (int i = 0; i < m_sets.size(); ++i) QCOMPARE(m_series->sets().at(i), m_sets.at(i)); m_series->clear(); @@ -308,8 +308,8 @@ void tst_QCandlestickSeries::sets() void tst_QCandlestickSeries::count() { m_series->append(m_sets); - QCOMPARE(m_series->count(), m_sets.count()); - QCOMPARE(m_series->count(), m_series->sets().count()); + QCOMPARE(m_series->count(), m_sets.size()); + QCOMPARE(m_series->count(), m_series->sets().size()); } void tst_QCandlestickSeries::type() @@ -339,12 +339,12 @@ void tst_QCandlestickSeries::maximumColumnWidth() m_series->setMaximumColumnWidth(maximumColumnWidth); QCOMPARE(m_series->maximumColumnWidth(), expectedMaximumColumnWidth); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same maximum column width m_series->setMaximumColumnWidth(expectedMaximumColumnWidth); QCOMPARE(m_series->maximumColumnWidth(), expectedMaximumColumnWidth); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QCandlestickSeries::minimumColumnWidth_data() @@ -369,12 +369,12 @@ void tst_QCandlestickSeries::minimumColumnWidth() m_series->setMinimumColumnWidth(minimumColumnWidth); QCOMPARE(m_series->minimumColumnWidth(), expectedMinimumColumnWidth); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same minimum column width m_series->setMinimumColumnWidth(expectedMinimumColumnWidth); QCOMPARE(m_series->minimumColumnWidth(), expectedMinimumColumnWidth); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QCandlestickSeries::bodyWidth_data() @@ -398,12 +398,12 @@ void tst_QCandlestickSeries::bodyWidth() m_series->setBodyWidth(bodyWidth); QCOMPARE(m_series->bodyWidth(), expectedBodyWidth); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same body width m_series->setBodyWidth(bodyWidth); QCOMPARE(m_series->bodyWidth(), expectedBodyWidth); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QCandlestickSeries::bodyOutlineVisible() @@ -413,12 +413,12 @@ void tst_QCandlestickSeries::bodyOutlineVisible() bool visible = !m_series->bodyOutlineVisible(); m_series->setBodyOutlineVisible(visible); QCOMPARE(m_series->bodyOutlineVisible(), visible); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same body outline visibility m_series->setBodyOutlineVisible(visible); QCOMPARE(m_series->bodyOutlineVisible(), visible); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QCandlestickSeries::capsWidth_data() @@ -442,12 +442,12 @@ void tst_QCandlestickSeries::capsWidth() m_series->setCapsWidth(capsWidth); QCOMPARE(m_series->capsWidth(), expectedCapsWidth); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same caps width m_series->setCapsWidth(capsWidth); QCOMPARE(m_series->capsWidth(), expectedCapsWidth); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QCandlestickSeries::capsVisible() @@ -457,12 +457,12 @@ void tst_QCandlestickSeries::capsVisible() bool visible = !m_series->capsVisible(); m_series->setCapsVisible(visible); QCOMPARE(m_series->capsVisible(), visible); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same caps visibility m_series->setCapsVisible(visible); QCOMPARE(m_series->capsVisible(), visible); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QCandlestickSeries::increasingColor() @@ -473,19 +473,19 @@ void tst_QCandlestickSeries::increasingColor() QColor newColor(200, 200, 200, 200); m_series->setIncreasingColor(newColor); QCOMPARE(m_series->increasingColor(), newColor); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same increasing color again m_series->setIncreasingColor(newColor); QCOMPARE(m_series->increasingColor(), newColor); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set invalid increasing color (should change to default color) QColor defaultColor = m_series->brush().color(); defaultColor.setAlpha(128); m_series->setIncreasingColor(QColor()); QCOMPARE(m_series->increasingColor(), defaultColor); - QCOMPARE(spy.count(), 2); + QCOMPARE(spy.size(), 2); // Set new brush, increasing color should change accordingly QBrush brush(newColor); @@ -493,7 +493,7 @@ void tst_QCandlestickSeries::increasingColor() defaultColor.setAlpha(128); m_series->setBrush(brush); QCOMPARE(m_series->increasingColor(), defaultColor); - QCOMPARE(spy.count(), 3); + QCOMPARE(spy.size(), 3); } void tst_QCandlestickSeries::decreasingColor() @@ -504,22 +504,22 @@ void tst_QCandlestickSeries::decreasingColor() QColor newColor(200, 200, 200, 200); m_series->setDecreasingColor(newColor); QCOMPARE(m_series->decreasingColor(), newColor); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same decreasing color again m_series->setDecreasingColor(newColor); QCOMPARE(m_series->decreasingColor(), newColor); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set invalid decreasing color (should change to default color) m_series->setDecreasingColor(QColor()); QCOMPARE(m_series->decreasingColor(), m_series->brush().color()); - QCOMPARE(spy.count(), 2); + QCOMPARE(spy.size(), 2); // Set new brush, decreasing color should change accordingly m_series->setBrush(QBrush(newColor)); QCOMPARE(m_series->decreasingColor(), m_series->brush().color()); - QCOMPARE(spy.count(), 3); + QCOMPARE(spy.size(), 3); } void tst_QCandlestickSeries::brush() @@ -534,14 +534,14 @@ void tst_QCandlestickSeries::brush() QCOMPARE(m_series->brush(), brush); QCOMPARE(m_series->increasingColor(), increasingColor); QCOMPARE(m_series->decreasingColor(), decreasingColor); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same brush m_series->setBrush(brush); QCOMPARE(m_series->brush(), brush); QCOMPARE(m_series->increasingColor(), increasingColor); QCOMPARE(m_series->decreasingColor(), decreasingColor); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QCandlestickSeries::pen() @@ -551,12 +551,12 @@ void tst_QCandlestickSeries::pen() QPen pen(QColor(128, 128, 128, 128)); m_series->setPen(pen); QCOMPARE(m_series->pen(), pen); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same pen m_series->setPen(pen); QCOMPARE(m_series->pen(), pen); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QCandlestickSeries::mouseClicked() @@ -564,7 +564,7 @@ void tst_QCandlestickSeries::mouseClicked() SKIP_IF_CANNOT_TEST_MOUSE_EVENTS(); QVERIFY(m_series->append(m_sets)); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); QCandlestickSet *set1 = m_series->sets().at(1); QCandlestickSet *set2 = m_series->sets().at(2); @@ -595,12 +595,12 @@ void tst_QCandlestickSeries::mouseClicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.value(set1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArgs = seriesSpy.takeFirst(); - QCOMPARE(seriesSpyArgs.count(), 1); + QCOMPARE(seriesSpyArgs.size(), 1); QCOMPARE(qvariant_cast<QCandlestickSet *>(seriesSpyArgs.at(0)), set1); seriesSpyArgs.clear(); @@ -610,12 +610,12 @@ void tst_QCandlestickSeries::mouseClicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.value(set2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArgs = seriesSpy.takeFirst(); - QCOMPARE(seriesSpyArgs.count(), 1); + QCOMPARE(seriesSpyArgs.size(), 1); QCOMPARE(qvariant_cast<QCandlestickSet *>(seriesSpyArgs.at(0)), set2); seriesSpyArgs.clear(); @@ -628,7 +628,7 @@ void tst_QCandlestickSeries::mouseHovered() SKIP_IF_FLAKY_MOUSE_MOVE(); QVERIFY(m_series->append(m_sets)); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); QCandlestickSet *set1 = m_series->sets().at(1); QCandlestickSet *set2 = m_series->sets().at(2); @@ -662,17 +662,17 @@ void tst_QCandlestickSeries::mouseHovered() QTest::mouseMove(view.viewport(), QPoint(0, layout.value(set1).center().y())); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 0); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 0); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 0); // Move mouse on top of set 1 QTest::mouseMove(view.viewport(), layout.value(set1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArgs = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QCandlestickSet *>(seriesSpyArgs.at(1)), set1); @@ -689,9 +689,9 @@ void tst_QCandlestickSeries::mouseHovered() QTest::mouseMove(view.viewport(), layout.value(set2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 2); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 2); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 1); // Should leave set 1 seriesSpyArgs = seriesSpy.takeFirst(); @@ -721,9 +721,9 @@ void tst_QCandlestickSeries::mouseHovered() QTest::mouseMove(view.viewport(), QPoint(layout.value(set2).center().x(), 0)); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); // Should leave set 2 seriesSpyArgs = seriesSpy.takeFirst(); @@ -743,7 +743,7 @@ void tst_QCandlestickSeries::mousePressed() SKIP_IF_CANNOT_TEST_MOUSE_EVENTS(); QVERIFY(m_series->append(m_sets)); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); QCandlestickSet *set1 = m_series->sets().at(1); QCandlestickSet *set2 = m_series->sets().at(2); @@ -774,12 +774,12 @@ void tst_QCandlestickSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.value(set1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArgs = seriesSpy.takeFirst(); - QCOMPARE(seriesSpyArgs.count(), 1); + QCOMPARE(seriesSpyArgs.size(), 1); QCOMPARE(qvariant_cast<QCandlestickSet *>(seriesSpyArgs.at(0)), set1); seriesSpyArgs.clear(); @@ -789,12 +789,12 @@ void tst_QCandlestickSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.value(set2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArgs = seriesSpy.takeFirst(); - QCOMPARE(seriesSpyArgs.count(), 1); + QCOMPARE(seriesSpyArgs.size(), 1); QCOMPARE(qvariant_cast<QCandlestickSet *>(seriesSpyArgs.at(0)), set2); seriesSpyArgs.clear(); @@ -806,7 +806,7 @@ void tst_QCandlestickSeries::mouseReleased() SKIP_IF_CANNOT_TEST_MOUSE_EVENTS(); QVERIFY(m_series->append(m_sets)); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); QCandlestickSet *set1 = m_series->sets().at(1); QCandlestickSet *set2 = m_series->sets().at(2); @@ -837,12 +837,12 @@ void tst_QCandlestickSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.value(set1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArgs = seriesSpy.takeFirst(); - QCOMPARE(seriesSpyArgs.count(), 1); + QCOMPARE(seriesSpyArgs.size(), 1); QCOMPARE(qvariant_cast<QCandlestickSet *>(seriesSpyArgs.at(0)), set1); seriesSpyArgs.clear(); @@ -852,12 +852,12 @@ void tst_QCandlestickSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.value(set2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArgs = seriesSpy.takeFirst(); - QCOMPARE(seriesSpyArgs.count(), 1); + QCOMPARE(seriesSpyArgs.size(), 1); QCOMPARE(qvariant_cast<QCandlestickSet *>(seriesSpyArgs.at(0)), set2); seriesSpyArgs.clear(); @@ -869,7 +869,7 @@ void tst_QCandlestickSeries::mouseDoubleClicked() SKIP_IF_CANNOT_TEST_MOUSE_EVENTS(); QVERIFY(m_series->append(m_sets)); - QCOMPARE(m_series->count(), m_sets.count()); + QCOMPARE(m_series->count(), m_sets.size()); QCandlestickSet *set1 = m_series->sets().at(1); QCandlestickSet *set2 = m_series->sets().at(2); @@ -900,12 +900,12 @@ void tst_QCandlestickSeries::mouseDoubleClicked() QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, layout.value(set1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArgs = seriesSpy.takeFirst(); - QCOMPARE(seriesSpyArgs.count(), 1); + QCOMPARE(seriesSpyArgs.size(), 1); QCOMPARE(qvariant_cast<QCandlestickSet *>(seriesSpyArgs.at(0)), set1); seriesSpyArgs.clear(); diff --git a/tests/auto/qcandlestickset/tst_qcandlestickset.cpp b/tests/auto/qcandlestickset/tst_qcandlestickset.cpp index 401c4185..4b25431d 100644 --- a/tests/auto/qcandlestickset/tst_qcandlestickset.cpp +++ b/tests/auto/qcandlestickset/tst_qcandlestickset.cpp @@ -103,12 +103,12 @@ void tst_QCandlestickSet::timestamp() m_candlestickSet->setTimestamp(timestamp); QCOMPARE(m_candlestickSet->timestamp(), expectedTimestamp); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same timestamp value m_candlestickSet->setTimestamp(expectedTimestamp); QCOMPARE(m_candlestickSet->timestamp(), expectedTimestamp); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QCandlestickSet::open_data() @@ -128,12 +128,12 @@ void tst_QCandlestickSet::open() m_candlestickSet->setOpen(open); QCOMPARE(m_candlestickSet->open(), open); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same open value m_candlestickSet->setOpen(open); QCOMPARE(m_candlestickSet->open(), open); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QCandlestickSet::high_data() @@ -153,12 +153,12 @@ void tst_QCandlestickSet::high() m_candlestickSet->setHigh(high); QCOMPARE(m_candlestickSet->high(), high); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same high value m_candlestickSet->setHigh(high); QCOMPARE(m_candlestickSet->high(), high); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QCandlestickSet::low_data() @@ -178,12 +178,12 @@ void tst_QCandlestickSet::low() m_candlestickSet->setLow(low); QCOMPARE(m_candlestickSet->low(), low); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same low value m_candlestickSet->setLow(low); QCOMPARE(m_candlestickSet->low(), low); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QCandlestickSet::close_data() @@ -203,12 +203,12 @@ void tst_QCandlestickSet::close() m_candlestickSet->setClose(close); QCOMPARE(m_candlestickSet->close(), close); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same close value m_candlestickSet->setClose(close); QCOMPARE(m_candlestickSet->close(), close); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QCandlestickSet::brush() @@ -219,17 +219,17 @@ void tst_QCandlestickSet::brush() m_candlestickSet->setBrush(QBrush(Qt::NoBrush)); QCOMPARE(m_candlestickSet->brush(), QBrush(Qt::NoBrush)); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); QBrush brush(QColor(128, 128, 128, 128)); m_candlestickSet->setBrush(brush); QCOMPARE(m_candlestickSet->brush(), brush); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same brush m_candlestickSet->setBrush(brush); QCOMPARE(m_candlestickSet->brush(), brush); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QCandlestickSet::pen() @@ -240,17 +240,17 @@ void tst_QCandlestickSet::pen() m_candlestickSet->setPen(QPen(Qt::NoPen)); QCOMPARE(m_candlestickSet->pen(), QPen(Qt::NoPen)); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); QPen pen(QColor(128, 128, 128, 128)); m_candlestickSet->setPen(pen); QCOMPARE(m_candlestickSet->pen(), pen); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Try set same pen m_candlestickSet->setPen(pen); QCOMPARE(m_candlestickSet->pen(), pen); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } QTEST_GUILESS_MAIN(tst_QCandlestickSet) diff --git a/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp b/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp index 71fbf0d0..a7ccb440 100644 --- a/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp +++ b/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp @@ -120,9 +120,9 @@ void tst_QCategoryAxis::max_raw() m_categoryaxis->setMax(max); QVERIFY2(qFuzzyCompare(m_categoryaxis->max(), max), "Not equal"); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 1); } void tst_QCategoryAxis::max_data() @@ -169,9 +169,9 @@ void tst_QCategoryAxis::min_raw() m_categoryaxis->setMin(min); QVERIFY2(qFuzzyCompare(m_categoryaxis->min(), min), "Not equal"); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); } void tst_QCategoryAxis::min_data() @@ -224,9 +224,9 @@ void tst_QCategoryAxis::range_raw() QVERIFY2(qFuzzyCompare(m_categoryaxis->min(), min), "Min not equal"); QVERIFY2(qFuzzyCompare(m_categoryaxis->max(), max), "Max not equal"); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); } void tst_QCategoryAxis::range_data() @@ -302,7 +302,7 @@ void tst_QCategoryAxis::labels_position() SIGNAL(labelsPositionChanged(QCategoryAxis::AxisLabelsPosition))); m_categoryaxis->setLabelsPosition(QCategoryAxis::AxisLabelsPositionOnValue); QCOMPARE(m_categoryaxis->labelsPosition(), QCategoryAxis::AxisLabelsPositionOnValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QCategoryAxis::reverse() @@ -315,7 +315,7 @@ void tst_QCategoryAxis::reverse() m_chart->addAxis(m_categoryaxis, Qt::AlignBottom); m_series->attachAxis(m_categoryaxis); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); m_view->show(); QVERIFY(QTest::qWaitForWindowExposed(m_view)); diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp index dd2cf1cc..e5281ebf 100644 --- a/tests/auto/qchart/tst_qchart.cpp +++ b/tests/auto/qchart/tst_qchart.cpp @@ -217,9 +217,9 @@ void tst_QChart::addSeries() m_view->show(); QVERIFY(QTest::qWaitForWindowExposed(m_view)); QVERIFY(!series->chart()); - QCOMPARE(m_chart->series().count(), 0); + QCOMPARE(m_chart->series().size(), 0); m_chart->addSeries(series); - QCOMPARE(m_chart->series().count(), 1); + QCOMPARE(m_chart->series().size(), 1); QCOMPARE(m_chart->series().first(), series); QVERIFY(series->chart() == m_chart); m_chart->createDefaultAxes(); @@ -232,7 +232,7 @@ void tst_QChart::addSeries() } m_chart->removeSeries(series); QVERIFY(!series->chart()); - QCOMPARE(m_chart->series().count(), 0); + QCOMPARE(m_chart->series().size(), 0); delete series; } @@ -449,40 +449,40 @@ void tst_QChart::legend() // colorChanged legend->setColor(QColor("aliceblue")); - QCOMPARE(colorSpy.count(), 1); + QCOMPARE(colorSpy.size(), 1); QBrush b = legend->brush(); b.setColor(QColor("aqua")); legend->setBrush(b); - QCOMPARE(colorSpy.count(), 2); + QCOMPARE(colorSpy.size(), 2); // borderColorChanged legend->setBorderColor(QColor("aliceblue")); - QCOMPARE(borderColorSpy.count(), 1); + QCOMPARE(borderColorSpy.size(), 1); QPen p = legend->pen(); p.setColor(QColor("aqua")); legend->setPen(p); - QCOMPARE(borderColorSpy.count(), 2); + QCOMPARE(borderColorSpy.size(), 2); // labelColorChanged legend->setLabelColor(QColor("lightsalmon")); - QCOMPARE(labelColorSpy.count(), 1); + QCOMPARE(labelColorSpy.size(), 1); b = legend->labelBrush(); b.setColor(QColor("lightseagreen")); legend->setLabelBrush(b); - QCOMPARE(labelColorSpy.count(), 2); + QCOMPARE(labelColorSpy.size(), 2); // fontChanged QSignalSpy fontSpy(legend, SIGNAL(fontChanged(QFont))); QFont f = legend->font(); f.setBold(!f.bold()); legend->setFont(f); - QCOMPARE(fontSpy.count(), 1); + QCOMPARE(fontSpy.size(), 1); // reverseMarkersChanged QSignalSpy reverseMarkersSpy(legend, SIGNAL(reverseMarkersChanged(bool))); - QCOMPARE(reverseMarkersSpy.count(), 0); + QCOMPARE(reverseMarkersSpy.size(), 0); legend->setReverseMarkers(); - QCOMPARE(reverseMarkersSpy.count(), 1); + QCOMPARE(reverseMarkersSpy.size(), 1); QVERIFY(legend->reverseMarkers()); } @@ -520,18 +520,18 @@ void tst_QChart::removeAllSeries() m_view->show(); QVERIFY(QTest::qWaitForWindowExposed(m_view)); m_chart->createDefaultAxes(); - QCOMPARE(m_chart->axes().count(), 2); + QCOMPARE(m_chart->axes().size(), 2); QVERIFY(!m_chart->axes(Qt::Vertical, series0).isEmpty()); QVERIFY(!m_chart->axes(Qt::Vertical, series1).isEmpty()); QVERIFY(!m_chart->axes(Qt::Vertical, series2).isEmpty()); m_chart->removeAllSeries(); - QCOMPARE(m_chart->axes().count(), 2); + QCOMPARE(m_chart->axes().size(), 2); QVERIFY(!m_chart->axes(Qt::Horizontal).isEmpty()); QVERIFY(!m_chart->axes(Qt::Vertical).isEmpty()); - QCOMPARE(deleteSpy1.count(), 1); - QCOMPARE(deleteSpy2.count(), 1); - QCOMPARE(deleteSpy3.count(), 1); + QCOMPARE(deleteSpy1.size(), 1); + QCOMPARE(deleteSpy2.size(), 1); + QCOMPARE(deleteSpy3.size(), 1); } void tst_QChart::removeSeries_data() @@ -554,10 +554,10 @@ void tst_QChart::removeSeries() series->attachAxis(axis); QCOMPARE(m_chart->axes(Qt::Vertical, series).value(0), axis); m_chart->removeSeries(series); - QCOMPARE(m_chart->axes().count(), 1); + QCOMPARE(m_chart->axes().size(), 1); QVERIFY(!m_chart->axes(Qt::Vertical).isEmpty()); QVERIFY(m_chart->axes(Qt::Vertical, series).isEmpty()); - QCOMPARE(deleteSpy.count(), 0); + QCOMPARE(deleteSpy.size(), 0); delete series; } diff --git a/tests/auto/qchartview/tst_qchartview.cpp b/tests/auto/qchartview/tst_qchartview.cpp index 802d38ce..d30c7010 100644 --- a/tests/auto/qchartview/tst_qchartview.cpp +++ b/tests/auto/qchartview/tst_qchartview.cpp @@ -170,8 +170,8 @@ void tst_QChartView::rubberBand() QTest::mouseRelease(m_view->viewport(), Qt::LeftButton, {}, plotArea.bottomRight().toPoint() - max, 100); QApplication::processEvents(); - TRY_COMPARE(spy0.count(), Xcount); - TRY_COMPARE(spy1.count(), Ycount); + TRY_COMPARE(spy0.size(), Xcount); + TRY_COMPARE(spy1.size(), Ycount); //this is hack since view does not get events otherwise m_view->setMouseTracking(false); diff --git a/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp b/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp index 438bc041..1265bebb 100644 --- a/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp +++ b/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp @@ -131,14 +131,14 @@ void tst_QDateTimeAxis::max_raw() if (valid) { QVERIFY2(m_dateTimeAxisX->max() == max, "Not equal"); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 1); } else { QVERIFY2(m_dateTimeAxisX->max() != max, "Date is invalid and should not be set"); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); } } @@ -190,14 +190,14 @@ void tst_QDateTimeAxis::min_raw() if (valid) { QVERIFY2(m_dateTimeAxisX->min() == min, "Not equal"); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); } else { QVERIFY2(m_dateTimeAxisX->min() != min, "Date is invalid and should not be set"); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); } } @@ -265,13 +265,13 @@ void tst_QDateTimeAxis::range_raw() m_dateTimeAxisX->setRange(min, max); if (minValid && maxValid && min < max) { - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); } else { - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); } } @@ -306,7 +306,7 @@ void tst_QDateTimeAxis::reverse() m_dateTimeAxisX->setReverse(); QCOMPARE(m_dateTimeAxisX->isReverse(), true); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); m_view->show(); QVERIFY(QTest::qWaitForWindowExposed(m_view)); diff --git a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp index c0c420aa..bcd7bb02 100644 --- a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp +++ b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp @@ -158,7 +158,7 @@ void tst_QHorizontalBarSeries::remove_data() void tst_QHorizontalBarSeries::remove() { - int count = m_testSets.count(); + int count = m_testSets.size(); QVERIFY(m_barseries_with_sets->count() == count); // Try to remove null pointer (should not remove, should not crash) @@ -255,7 +255,7 @@ void tst_QHorizontalBarSeries::count_data() void tst_QHorizontalBarSeries::count() { QVERIFY(m_barseries->count() == 0); - QVERIFY(m_barseries_with_sets->count() == m_testSets.count()); + QVERIFY(m_barseries_with_sets->count() == m_testSets.size()); } void tst_QHorizontalBarSeries::barSets_data() @@ -265,12 +265,12 @@ void tst_QHorizontalBarSeries::barSets_data() void tst_QHorizontalBarSeries::barSets() { - QVERIFY(m_barseries->barSets().count() == 0); + QVERIFY(m_barseries->barSets().size() == 0); QList<QBarSet*> sets = m_barseries_with_sets->barSets(); - QVERIFY(sets.count() == m_testSets.count()); + QVERIFY(sets.size() == m_testSets.size()); - for (int i=0; i<m_testSets.count(); i++) { + for (int i=0; i<m_testSets.size(); i++) { QVERIFY(sets.at(i) == m_testSets.at(i)); } } @@ -309,13 +309,13 @@ void tst_QHorizontalBarSeries::setLabelsFormat() QString format("(@value)"); m_barseries->setLabelsFormat(format); - TRY_COMPARE(labelsFormatSpy.count(), 1); + TRY_COMPARE(labelsFormatSpy.size(), 1); QList<QVariant> arguments = labelsFormatSpy.takeFirst(); QVERIFY(arguments.at(0).toString() == format); QCOMPARE(m_barseries->labelsFormat(), format); m_barseries->setLabelsFormat(QString()); - TRY_COMPARE(labelsFormatSpy.count(), 1); + TRY_COMPARE(labelsFormatSpy.size(), 1); arguments = labelsFormatSpy.takeFirst(); QVERIFY(arguments.at(0).toString() == QString()); QCOMPARE(m_barseries->labelsFormat(), QString()); @@ -328,28 +328,28 @@ void tst_QHorizontalBarSeries::setLabelsPosition() QCOMPARE(m_barseries->labelsPosition(), QHorizontalBarSeries::LabelsCenter); m_barseries->setLabelsPosition(QHorizontalBarSeries::LabelsInsideEnd); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); QList<QVariant> arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QHorizontalBarSeries::LabelsInsideEnd); QCOMPARE(m_barseries->labelsPosition(), QHorizontalBarSeries::LabelsInsideEnd); m_barseries->setLabelsPosition(QHorizontalBarSeries::LabelsInsideBase); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QHorizontalBarSeries::LabelsInsideBase); QCOMPARE(m_barseries->labelsPosition(), QHorizontalBarSeries::LabelsInsideBase); m_barseries->setLabelsPosition(QHorizontalBarSeries::LabelsOutsideEnd); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QHorizontalBarSeries::LabelsOutsideEnd); QCOMPARE(m_barseries->labelsPosition(), QHorizontalBarSeries::LabelsOutsideEnd); m_barseries->setLabelsPosition(QHorizontalBarSeries::LabelsCenter); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QHorizontalBarSeries::LabelsCenter); @@ -363,7 +363,7 @@ void tst_QHorizontalBarSeries::setLabelsAngle() QCOMPARE(m_barseries->labelsAngle(), 0.0); m_barseries->setLabelsAngle(55.0); - TRY_COMPARE(labelsAngleSpy.count(), 1); + TRY_COMPARE(labelsAngleSpy.size(), 1); QList<QVariant> arguments = labelsAngleSpy.takeFirst(); QVERIFY(arguments.at(0).value<qreal>() == 55.0); QCOMPARE(m_barseries->labelsAngle(), 55.0); @@ -436,9 +436,9 @@ void tst_QHorizontalBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -454,9 +454,9 @@ void tst_QHorizontalBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -472,9 +472,9 @@ void tst_QHorizontalBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -490,9 +490,9 @@ void tst_QHorizontalBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -508,9 +508,9 @@ void tst_QHorizontalBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -526,9 +526,9 @@ void tst_QHorizontalBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -610,16 +610,16 @@ void tst_QHorizontalBarSeries::mousehovered() // move mouse to bottom border QTest::mouseMove(view.viewport(), QPoint(layout.at(0).center().x(), 300)); QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); - TRY_COMPARE(seriesIndexSpy.count(), 0); - TRY_COMPARE(setIndexSpy1.count(), 0); - TRY_COMPARE(setIndexSpy2.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 0); + TRY_COMPARE(setIndexSpy1.size(), 0); + TRY_COMPARE(setIndexSpy2.size(), 0); //======================================================================= // move mouse on top of set1 QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 0); QList<QVariant> seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesIndexSpyArg.at(2)), set1); @@ -633,9 +633,9 @@ void tst_QHorizontalBarSeries::mousehovered() //======================================================================= // move mouse from top of set1 to top of set2 QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 2); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 1); // should leave set1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -660,9 +660,9 @@ void tst_QHorizontalBarSeries::mousehovered() //======================================================================= // move mouse from top of set2 to background QTest::mouseMove(view.viewport(), QPoint(0, layout.at(0).center().y())); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 0); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 0); + TRY_COMPARE(setIndexSpy2.size(), 1); // should leave set2 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -678,9 +678,9 @@ void tst_QHorizontalBarSeries::mousehovered() // move mouse on top of set1, bar0 to check the index (hover into set1) QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 0); //should enter set1, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -701,9 +701,9 @@ void tst_QHorizontalBarSeries::mousehovered() // hover in set1) QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 2); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 1); // should leave set1, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -738,9 +738,9 @@ void tst_QHorizontalBarSeries::mousehovered() // hover in set1) QTest::mouseMove(view.viewport(), layout.at(2).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 2); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 1); // should leave set2, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -775,9 +775,9 @@ void tst_QHorizontalBarSeries::mousehovered() // (hover out set1) QTest::mouseMove(view.viewport(), QPoint(0, (layout.at(2).top() + layout.at(3).bottom()) / 2)); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 0); // should leave set1, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -797,9 +797,9 @@ void tst_QHorizontalBarSeries::mousehovered() // move mouse on top of set2, bar1 to check the index (hover in set2) QTest::mouseMove(view.viewport(), layout.at(3).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 0); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 0); + TRY_COMPARE(setIndexSpy2.size(), 1); // should enter set2, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -820,9 +820,9 @@ void tst_QHorizontalBarSeries::mousehovered() //(hover out set2) QTest::mouseMove(view.viewport(), QPoint(0, (layout.at(3).top() + layout.at(3).bottom()) / 2)); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 0); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 0); + TRY_COMPARE(setIndexSpy2.size(), 1); // should leave set2, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -921,9 +921,9 @@ void tst_QHorizontalBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -939,9 +939,9 @@ void tst_QHorizontalBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -957,9 +957,9 @@ void tst_QHorizontalBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -975,9 +975,9 @@ void tst_QHorizontalBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -993,9 +993,9 @@ void tst_QHorizontalBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -1011,9 +1011,9 @@ void tst_QHorizontalBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -1086,9 +1086,9 @@ void tst_QHorizontalBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -1104,9 +1104,9 @@ void tst_QHorizontalBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -1122,9 +1122,9 @@ void tst_QHorizontalBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -1140,9 +1140,9 @@ void tst_QHorizontalBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -1158,9 +1158,9 @@ void tst_QHorizontalBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -1176,9 +1176,9 @@ void tst_QHorizontalBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -1250,9 +1250,9 @@ void tst_QHorizontalBarSeries::mouseDoubleClicked() QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); diff --git a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp index 59886ede..4f674fe3 100644 --- a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp +++ b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp @@ -94,13 +94,13 @@ void tst_QHorizontalPercentBarSeries::setLabelsFormat() QString format("(@value)"); m_barseries->setLabelsFormat(format); - TRY_COMPARE(labelsFormatSpy.count(), 1); + TRY_COMPARE(labelsFormatSpy.size(), 1); QList<QVariant> arguments = labelsFormatSpy.takeFirst(); QVERIFY(arguments.at(0).toString() == format); QCOMPARE(m_barseries->labelsFormat(), format); m_barseries->setLabelsFormat(QString()); - TRY_COMPARE(labelsFormatSpy.count(), 1); + TRY_COMPARE(labelsFormatSpy.size(), 1); arguments = labelsFormatSpy.takeFirst(); QVERIFY(arguments.at(0).toString() == QString()); QCOMPARE(m_barseries->labelsFormat(), QString()); @@ -113,28 +113,28 @@ void tst_QHorizontalPercentBarSeries::setLabelsPosition() QCOMPARE(m_barseries->labelsPosition(), QHorizontalPercentBarSeries::LabelsCenter); m_barseries->setLabelsPosition(QHorizontalPercentBarSeries::LabelsInsideEnd); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); QList<QVariant> arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QHorizontalPercentBarSeries::LabelsInsideEnd); QCOMPARE(m_barseries->labelsPosition(), QHorizontalPercentBarSeries::LabelsInsideEnd); m_barseries->setLabelsPosition(QHorizontalPercentBarSeries::LabelsInsideBase); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QHorizontalPercentBarSeries::LabelsInsideBase); QCOMPARE(m_barseries->labelsPosition(), QHorizontalPercentBarSeries::LabelsInsideBase); m_barseries->setLabelsPosition(QHorizontalPercentBarSeries::LabelsOutsideEnd); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QHorizontalPercentBarSeries::LabelsOutsideEnd); QCOMPARE(m_barseries->labelsPosition(), QHorizontalPercentBarSeries::LabelsOutsideEnd); m_barseries->setLabelsPosition(QHorizontalPercentBarSeries::LabelsCenter); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QHorizontalPercentBarSeries::LabelsCenter); @@ -148,7 +148,7 @@ void tst_QHorizontalPercentBarSeries::setLabelsAngle() QCOMPARE(m_barseries->labelsAngle(), 0.0); m_barseries->setLabelsAngle(55.0); - TRY_COMPARE(labelsAngleSpy.count(), 1); + TRY_COMPARE(labelsAngleSpy.size(), 1); QList<QVariant> arguments = labelsAngleSpy.takeFirst(); QVERIFY(arguments.at(0).value<qreal>() == 55.0); QCOMPARE(m_barseries->labelsAngle(), 55.0); @@ -219,7 +219,7 @@ void tst_QHorizontalPercentBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -231,7 +231,7 @@ void tst_QHorizontalPercentBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -243,7 +243,7 @@ void tst_QHorizontalPercentBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -255,7 +255,7 @@ void tst_QHorizontalPercentBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -267,7 +267,7 @@ void tst_QHorizontalPercentBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -279,7 +279,7 @@ void tst_QHorizontalPercentBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -357,14 +357,14 @@ void tst_QHorizontalPercentBarSeries::mousehovered() // move mouse to left border QTest::mouseMove(view.viewport(), QPoint(0, layout.at(4).center().y())); QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); - TRY_COMPARE(seriesIndexSpy.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 0); //======================================================================= // move mouse on top of set1 QTest::mouseMove(view.viewport(), layout.at(4).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 0); QList<QVariant> seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesIndexSpyArg.at(2)), set1); @@ -378,9 +378,9 @@ void tst_QHorizontalPercentBarSeries::mousehovered() //======================================================================= // move mouse from top of set1 to top of set2 QTest::mouseMove(view.viewport(), layout.at(5).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 2); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 1); // should leave set1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -405,9 +405,9 @@ void tst_QHorizontalPercentBarSeries::mousehovered() //======================================================================= // move mouse from top of set2 to background QTest::mouseMove(view.viewport(), QPoint(layout.at(5).center().x(), 0)); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 0); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 0); + TRY_COMPARE(setIndexSpy2.size(), 1); // should leave set2 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -423,9 +423,9 @@ void tst_QHorizontalPercentBarSeries::mousehovered() // move mouse on top of set1, bar0 to check the index (hover into set1) QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 0); //should enter set1, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -447,9 +447,9 @@ void tst_QHorizontalPercentBarSeries::mousehovered() QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); - TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 2); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 1); //should leave set1, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -484,9 +484,9 @@ void tst_QHorizontalPercentBarSeries::mousehovered() // hover in set1) QTest::mouseMove(view.viewport(), layout.at(2).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 2); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 1); //should leave set2, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -521,9 +521,9 @@ void tst_QHorizontalPercentBarSeries::mousehovered() QTest::mouseMove(view.viewport(), QPoint(layout.at(3).left(), (layout.at(3).top() + layout.at(4).bottom()) / 2)); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 0); //should leave set1, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -543,9 +543,9 @@ void tst_QHorizontalPercentBarSeries::mousehovered() // move mouse on top of set2, bar1 to check the index (hover in set2) QTest::mouseMove(view.viewport(), layout.at(3).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 0); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 0); + TRY_COMPARE(setIndexSpy2.size(), 1); //should enter set2, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -567,9 +567,9 @@ void tst_QHorizontalPercentBarSeries::mousehovered() (layout.at(3).top() + layout.at(4).bottom()) / 2)); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 0); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 0); + TRY_COMPARE(setIndexSpy2.size(), 1); //should leave set1, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -668,9 +668,9 @@ void tst_QHorizontalPercentBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -686,9 +686,9 @@ void tst_QHorizontalPercentBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -704,9 +704,9 @@ void tst_QHorizontalPercentBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -722,9 +722,9 @@ void tst_QHorizontalPercentBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -740,9 +740,9 @@ void tst_QHorizontalPercentBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -758,9 +758,9 @@ void tst_QHorizontalPercentBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -833,9 +833,9 @@ void tst_QHorizontalPercentBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -851,9 +851,9 @@ void tst_QHorizontalPercentBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -869,9 +869,9 @@ void tst_QHorizontalPercentBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -887,9 +887,9 @@ void tst_QHorizontalPercentBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -905,9 +905,9 @@ void tst_QHorizontalPercentBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -923,9 +923,9 @@ void tst_QHorizontalPercentBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -997,9 +997,9 @@ void tst_QHorizontalPercentBarSeries::mouseDoubleClicked() QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); diff --git a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp index 21176bea..fbce9acc 100644 --- a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp +++ b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp @@ -93,13 +93,13 @@ void tst_QHorizontalStackedBarSeries::setLabelsFormat() QString format("(@value)"); m_barseries->setLabelsFormat(format); - TRY_COMPARE(labelsFormatSpy.count(), 1); + TRY_COMPARE(labelsFormatSpy.size(), 1); QList<QVariant> arguments = labelsFormatSpy.takeFirst(); QVERIFY(arguments.at(0).toString() == format); QCOMPARE(m_barseries->labelsFormat(), format); m_barseries->setLabelsFormat(QString()); - TRY_COMPARE(labelsFormatSpy.count(), 1); + TRY_COMPARE(labelsFormatSpy.size(), 1); arguments = labelsFormatSpy.takeFirst(); QVERIFY(arguments.at(0).toString() == QString()); QCOMPARE(m_barseries->labelsFormat(), QString()); @@ -112,28 +112,28 @@ void tst_QHorizontalStackedBarSeries::setLabelsPosition() QCOMPARE(m_barseries->labelsPosition(), QHorizontalStackedBarSeries::LabelsCenter); m_barseries->setLabelsPosition(QHorizontalStackedBarSeries::LabelsInsideEnd); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); QList<QVariant> arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QHorizontalStackedBarSeries::LabelsInsideEnd); QCOMPARE(m_barseries->labelsPosition(), QHorizontalStackedBarSeries::LabelsInsideEnd); m_barseries->setLabelsPosition(QHorizontalStackedBarSeries::LabelsInsideBase); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QHorizontalStackedBarSeries::LabelsInsideBase); QCOMPARE(m_barseries->labelsPosition(), QHorizontalStackedBarSeries::LabelsInsideBase); m_barseries->setLabelsPosition(QHorizontalStackedBarSeries::LabelsOutsideEnd); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QHorizontalStackedBarSeries::LabelsOutsideEnd); QCOMPARE(m_barseries->labelsPosition(), QHorizontalStackedBarSeries::LabelsOutsideEnd); m_barseries->setLabelsPosition(QHorizontalStackedBarSeries::LabelsCenter); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QHorizontalStackedBarSeries::LabelsCenter); @@ -147,7 +147,7 @@ void tst_QHorizontalStackedBarSeries::setLabelsAngle() QCOMPARE(m_barseries->labelsAngle(), 0.0); m_barseries->setLabelsAngle(55.0); - TRY_COMPARE(labelsAngleSpy.count(), 1); + TRY_COMPARE(labelsAngleSpy.size(), 1); QList<QVariant> arguments = labelsAngleSpy.takeFirst(); QVERIFY(arguments.at(0).value<qreal>() == 55.0); QCOMPARE(m_barseries->labelsAngle(), 55.0); @@ -223,7 +223,7 @@ void tst_QHorizontalStackedBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -235,7 +235,7 @@ void tst_QHorizontalStackedBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -247,7 +247,7 @@ void tst_QHorizontalStackedBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -259,7 +259,7 @@ void tst_QHorizontalStackedBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -271,7 +271,7 @@ void tst_QHorizontalStackedBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -283,7 +283,7 @@ void tst_QHorizontalStackedBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -366,14 +366,14 @@ void tst_QHorizontalStackedBarSeries::mousehovered() // move mouse to left border QTest::mouseMove(view.viewport(), QPoint(0, layout.at(4).center().y())); QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); - TRY_COMPARE(seriesIndexSpy.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 0); //======================================================================= // move mouse on top of set1 QTest::mouseMove(view.viewport(), layout.at(4).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 0); QList<QVariant> seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesIndexSpyArg.at(2)), set1); @@ -387,9 +387,9 @@ void tst_QHorizontalStackedBarSeries::mousehovered() //======================================================================= // move mouse from top of set1 to top of set2 QTest::mouseMove(view.viewport(), layout.at(5).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 2); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 1); // should leave set1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -414,9 +414,9 @@ void tst_QHorizontalStackedBarSeries::mousehovered() //======================================================================= // move mouse from top of set2 to background QTest::mouseMove(view.viewport(), QPoint(layout.at(5).center().y(), 0)); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 0); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 0); + TRY_COMPARE(setIndexSpy2.size(), 1); // should leave set2 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -432,9 +432,9 @@ void tst_QHorizontalStackedBarSeries::mousehovered() // move mouse on top of set1, bar0 to check the index (hover into set1) QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 0); //should enter set1, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -456,9 +456,9 @@ void tst_QHorizontalStackedBarSeries::mousehovered() QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); - TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 2); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 1); //should leave set1, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -493,9 +493,9 @@ void tst_QHorizontalStackedBarSeries::mousehovered() // hover in set1) QTest::mouseMove(view.viewport(), layout.at(2).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 2); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 1); //should leave set2, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -530,9 +530,9 @@ void tst_QHorizontalStackedBarSeries::mousehovered() QTest::mouseMove(view.viewport(), QPoint(layout.at(3).left(), (layout.at(3).top() + layout.at(4).bottom()) / 2)); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 0); //should leave set1, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -552,9 +552,9 @@ void tst_QHorizontalStackedBarSeries::mousehovered() // move mouse on top of set2, bar1 to check the index (hover in set2) QTest::mouseMove(view.viewport(), layout.at(3).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 0); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 0); + TRY_COMPARE(setIndexSpy2.size(), 1); //should enter set2, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -576,9 +576,9 @@ void tst_QHorizontalStackedBarSeries::mousehovered() (layout.at(3).top() + layout.at(4).bottom()) / 2)); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 0); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 0); + TRY_COMPARE(setIndexSpy2.size(), 1); //should leave set1, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -661,9 +661,9 @@ void tst_QHorizontalStackedBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -679,9 +679,9 @@ void tst_QHorizontalStackedBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -697,9 +697,9 @@ void tst_QHorizontalStackedBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -715,9 +715,9 @@ void tst_QHorizontalStackedBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -733,9 +733,9 @@ void tst_QHorizontalStackedBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -751,9 +751,9 @@ void tst_QHorizontalStackedBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -831,9 +831,9 @@ void tst_QHorizontalStackedBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -849,9 +849,9 @@ void tst_QHorizontalStackedBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -867,9 +867,9 @@ void tst_QHorizontalStackedBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -885,9 +885,9 @@ void tst_QHorizontalStackedBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -903,9 +903,9 @@ void tst_QHorizontalStackedBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -921,9 +921,9 @@ void tst_QHorizontalStackedBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -1000,9 +1000,9 @@ void tst_QHorizontalStackedBarSeries::mouseDoubleClicked() QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); diff --git a/tests/auto/qlegend/tst_qlegend.cpp b/tests/auto/qlegend/tst_qlegend.cpp index d7209551..1ff28b5b 100644 --- a/tests/auto/qlegend/tst_qlegend.cpp +++ b/tests/auto/qlegend/tst_qlegend.cpp @@ -76,7 +76,7 @@ void tst_QLegend::qlegend() QVERIFY(legend); QList<QLegendMarker*> markers = legend->markers(); - QVERIFY(markers.count() == 0); + QVERIFY(markers.size() == 0); } void tst_QLegend::qpieLegendMarker() @@ -93,7 +93,7 @@ void tst_QLegend::qpieLegendMarker() // Should have one marker QList<QLegendMarker*> markers = legend->markers(); - QVERIFY(markers.count() == 1); + QVERIFY(markers.size() == 1); QLegendMarker *m = markers.at(0); // Should be piemarker @@ -110,7 +110,7 @@ void tst_QLegend::qpieLegendMarker() series->append(s2); markers = legend->markers(); - QVERIFY(markers.count() == 2); + QVERIFY(markers.size() == 2); m = markers.at(1); QVERIFY(m->type() == QLegendMarker::LegendMarkerTypePie); @@ -141,7 +141,7 @@ void tst_QLegend::qareaLegendMarker() // Should have one marker QList<QLegendMarker *> markers = legend->markers(); - QVERIFY(markers.count() == 1); + QVERIFY(markers.size() == 1); QLegendMarker *m = markers.at(0); QVERIFY(m->series() == series); @@ -162,7 +162,7 @@ void tst_QLegend::qxyLegendMarker() // Should have one marker QList<QLegendMarker *> markers = legend->markers(); - QVERIFY(markers.count() == 1); + QVERIFY(markers.size() == 1); QLegendMarker *m = markers.at(0); QVERIFY(m->series() == series); @@ -187,7 +187,7 @@ void tst_QLegend::qbarLegendMarker() // Should have one marker QList<QLegendMarker *> markers = legend->markers(); - QVERIFY(markers.count() == 1); + QVERIFY(markers.size() == 1); QLegendMarker *m = markers.at(0); QVERIFY(m->series() == series); @@ -203,7 +203,7 @@ void tst_QLegend::qbarLegendMarker() series->append(set1); markers = legend->markers(); - QVERIFY(markers.count() == 2); + QVERIFY(markers.size() == 2); m = markers.at(1); QVERIFY(m->series() == series); @@ -250,11 +250,11 @@ void tst_QLegend::markers() m_chart->addSeries(area); - QVERIFY(legend->markers(pie).count() == 3); - QVERIFY(legend->markers(bar).count() == 2); - QVERIFY(legend->markers(line).count() == 1); - QVERIFY(legend->markers(area).count() == 1); - QVERIFY(legend->markers().count() == 3+2+1+1); + QVERIFY(legend->markers(pie).size() == 3); + QVERIFY(legend->markers(bar).size() == 2); + QVERIFY(legend->markers(line).size() == 1); + QVERIFY(legend->markers(area).size() == 1); + QVERIFY(legend->markers().size() == 3+2+1+1); } void tst_QLegend::addAndRemoveSeries() @@ -272,12 +272,12 @@ void tst_QLegend::addAndRemoveSeries() m_chart->addSeries(pie); QList<QLegendMarker *> markers = legend->markers(); - QVERIFY(markers.count() == 3); + QVERIFY(markers.size() == 3); m_chart->removeSeries(pie); markers = legend->markers(); - QVERIFY(markers.count() == 0); + QVERIFY(markers.size() == 0); delete pie; } @@ -538,7 +538,7 @@ void tst_QLegend::markerSignals() QTest::mouseMove(view.viewport(), QPoint(333, i)); foreach (QSignalSpy *spy, spies) - TRY_COMPARE(spy->count(), 2); + TRY_COMPARE(spy->size(), 2); qDeleteAll(spies); } diff --git a/tests/auto/qlineseries/tst_qlineseries.cpp b/tests/auto/qlineseries/tst_qlineseries.cpp index d33359ef..82909aac 100644 --- a/tests/auto/qlineseries/tst_qlineseries.cpp +++ b/tests/auto/qlineseries/tst_qlineseries.cpp @@ -112,7 +112,7 @@ void tst_QLineSeries::pressedSignal() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); // checkPoint is QPointF and for the mouseClick it it's changed to QPoint // this causes small distinction in decimals so we round it before comparing @@ -144,7 +144,7 @@ void tst_QLineSeries::releasedSignal() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); // checkPoint is QPointF and for the mouseClick it it's changed to QPoint // this causes small distinction in decimals so we round it before comparing @@ -158,7 +158,7 @@ void tst_QLineSeries::insert() QLineSeries lineSeries; QSignalSpy insertSpy(&lineSeries, &QXYSeries::pointAdded); lineSeries.insert(0, QPoint(3, 3)); - QCOMPARE(insertSpy.count(), 1); + QCOMPARE(insertSpy.size(), 1); QVariantList arguments = insertSpy.takeFirst(); QCOMPARE(arguments.first().toInt(), 0); lineSeries.insert(0, QPoint(1, 1)); @@ -200,7 +200,7 @@ void tst_QLineSeries::doubleClickedSignal() QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); // checkPoint is QPointF and for the mouseClick it it's changed to QPoint // this causes small distinction in decimals so we round it before comparing diff --git a/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp b/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp index 19bdd515..46aba5ac 100644 --- a/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp +++ b/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp @@ -125,9 +125,9 @@ void tst_QLogValueAxis::max_raw() m_logvaluesaxis->setMax(max); QCOMPARE(m_logvaluesaxis->max(), expected); - QCOMPARE(spy0.count(), (int)maxChanged); - QCOMPARE(spy1.count(), (int)minChanged); - QCOMPARE(spy2.count(), (int)maxChanged); + QCOMPARE(spy0.size(), (int)maxChanged); + QCOMPARE(spy1.size(), (int)minChanged); + QCOMPARE(spy2.size(), (int)maxChanged); } @@ -182,9 +182,9 @@ void tst_QLogValueAxis::min_raw() m_logvaluesaxis->setMin(min); QCOMPARE(m_logvaluesaxis->min(), expected); - QCOMPARE(spy0.count(), (int)maxChanged); - QCOMPARE(spy1.count(), (int)minChanged); - QCOMPARE(spy2.count(), (int)minChanged); + QCOMPARE(spy0.size(), (int)maxChanged); + QCOMPARE(spy1.size(), (int)minChanged); + QCOMPARE(spy2.size(), (int)minChanged); } void tst_QLogValueAxis::min_data() @@ -247,9 +247,9 @@ void tst_QLogValueAxis::range_raw() QCOMPARE(m_logvaluesaxis->min(), expectedMin); QCOMPARE(m_logvaluesaxis->max(), expectedMax); - QCOMPARE(spy0.count(), (int)maxChanged); - QCOMPARE(spy1.count(), (int)minChanged); - QCOMPARE(spy2.count(), (int)(minChanged || maxChanged)); + QCOMPARE(spy0.size(), (int)maxChanged); + QCOMPARE(spy1.size(), (int)minChanged); + QCOMPARE(spy2.size(), (int)(minChanged || maxChanged)); } void tst_QLogValueAxis::range_data() @@ -313,9 +313,9 @@ void tst_QLogValueAxis::noautoscale() QCOMPARE(m_logvaluesaxis->min(), min); QCOMPARE(m_logvaluesaxis->max(), max); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); m_view->show(); QVERIFY(QTest::qWaitForWindowExposed(m_view)); QCOMPARE(m_logvaluesaxis->min(), min); @@ -341,9 +341,9 @@ void tst_QLogValueAxis::autoscale() m_chart->addAxis(m_logvaluesaxis, Qt::AlignBottom); m_series->attachAxis(m_logvaluesaxis); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 1); m_view->show(); QVERIFY(QTest::qWaitForWindowExposed(m_view)); @@ -397,7 +397,7 @@ void tst_QLogValueAxis::reverse() m_logvaluesaxis->setReverse(); QCOMPARE(m_logvaluesaxis->isReverse(), true); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); m_view->show(); QVERIFY(QTest::qWaitForWindowExposed(m_view)); diff --git a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp index 96eb257a..32a1aa6a 100644 --- a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp +++ b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp @@ -99,13 +99,13 @@ void tst_QPercentBarSeries::setLabelsFormat() QString format("(@value)"); m_barseries->setLabelsFormat(format); - TRY_COMPARE(labelsFormatSpy.count(), 1); + TRY_COMPARE(labelsFormatSpy.size(), 1); QList<QVariant> arguments = labelsFormatSpy.takeFirst(); QVERIFY(arguments.at(0).toString() == format); QCOMPARE(m_barseries->labelsFormat(), format); m_barseries->setLabelsFormat(QString()); - TRY_COMPARE(labelsFormatSpy.count(), 1); + TRY_COMPARE(labelsFormatSpy.size(), 1); arguments = labelsFormatSpy.takeFirst(); QVERIFY(arguments.at(0).toString() == QString()); QCOMPARE(m_barseries->labelsFormat(), QString()); @@ -118,28 +118,28 @@ void tst_QPercentBarSeries::setLabelsPosition() QCOMPARE(m_barseries->labelsPosition(), QPercentBarSeries::LabelsCenter); m_barseries->setLabelsPosition(QPercentBarSeries::LabelsInsideEnd); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); QList<QVariant> arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QPercentBarSeries::LabelsInsideEnd); QCOMPARE(m_barseries->labelsPosition(), QPercentBarSeries::LabelsInsideEnd); m_barseries->setLabelsPosition(QPercentBarSeries::LabelsInsideBase); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QPercentBarSeries::LabelsInsideBase); QCOMPARE(m_barseries->labelsPosition(), QPercentBarSeries::LabelsInsideBase); m_barseries->setLabelsPosition(QPercentBarSeries::LabelsOutsideEnd); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QPercentBarSeries::LabelsOutsideEnd); QCOMPARE(m_barseries->labelsPosition(), QPercentBarSeries::LabelsOutsideEnd); m_barseries->setLabelsPosition(QPercentBarSeries::LabelsCenter); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QPercentBarSeries::LabelsCenter); @@ -153,7 +153,7 @@ void tst_QPercentBarSeries::setLabelsAngle() QCOMPARE(m_barseries->labelsAngle(), 0.0); m_barseries->setLabelsAngle(55.0); - TRY_COMPARE(labelsAngleSpy.count(), 1); + TRY_COMPARE(labelsAngleSpy.size(), 1); QList<QVariant> arguments = labelsAngleSpy.takeFirst(); QVERIFY(arguments.at(0).value<qreal>() == 55.0); QCOMPARE(m_barseries->labelsAngle(), 55.0); @@ -221,7 +221,7 @@ void tst_QPercentBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -233,7 +233,7 @@ void tst_QPercentBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -245,7 +245,7 @@ void tst_QPercentBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -257,7 +257,7 @@ void tst_QPercentBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -269,7 +269,7 @@ void tst_QPercentBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -281,7 +281,7 @@ void tst_QPercentBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -361,14 +361,14 @@ void tst_QPercentBarSeries::mousehovered() // move mouse to left border QTest::mouseMove(view.viewport(), QPoint(0, layout.at(0).center().y())); QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); - TRY_COMPARE(seriesIndexSpy.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 0); //======================================================================= // move mouse on top of set1 QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 0); QList<QVariant> seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesIndexSpyArg.at(2)), set1); @@ -382,9 +382,9 @@ void tst_QPercentBarSeries::mousehovered() //======================================================================= // move mouse from top of set1 to top of set2 QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 2); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 1); // should leave set1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -409,9 +409,9 @@ void tst_QPercentBarSeries::mousehovered() //======================================================================= // move mouse from top of set2 to background QTest::mouseMove(view.viewport(), QPoint(layout.at(1).center().x(), 0)); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 0); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 0); + TRY_COMPARE(setIndexSpy2.size(), 1); // should leave set2 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -427,9 +427,9 @@ void tst_QPercentBarSeries::mousehovered() // move mouse on top of set1, bar0 to check the index (hover into set1) QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 0); //should enter set1, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -450,9 +450,9 @@ void tst_QPercentBarSeries::mousehovered() // hover in set2) QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 2); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 1); //should leave set1, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -487,9 +487,9 @@ void tst_QPercentBarSeries::mousehovered() // hover in set1) QTest::mouseMove(view.viewport(), layout.at(2).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 2); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 1); //should leave set2, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -525,9 +525,9 @@ void tst_QPercentBarSeries::mousehovered() layout.at(2).top())); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 0); //should leave set1, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -547,9 +547,9 @@ void tst_QPercentBarSeries::mousehovered() // move mouse on top of set2, bar1 to check the index (hover in set2) QTest::mouseMove(view.viewport(), layout.at(3).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 0); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 0); + TRY_COMPARE(setIndexSpy2.size(), 1); //should enter set2, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -571,9 +571,9 @@ void tst_QPercentBarSeries::mousehovered() layout.at(2).top())); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 0); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 0); + TRY_COMPARE(setIndexSpy2.size(), 1); //should leave set1, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -673,9 +673,9 @@ void tst_QPercentBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -691,9 +691,9 @@ void tst_QPercentBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -709,9 +709,9 @@ void tst_QPercentBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -727,9 +727,9 @@ void tst_QPercentBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -745,9 +745,9 @@ void tst_QPercentBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -763,9 +763,9 @@ void tst_QPercentBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -840,9 +840,9 @@ void tst_QPercentBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -858,9 +858,9 @@ void tst_QPercentBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -876,9 +876,9 @@ void tst_QPercentBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -894,9 +894,9 @@ void tst_QPercentBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -912,9 +912,9 @@ void tst_QPercentBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -930,9 +930,9 @@ void tst_QPercentBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -1006,9 +1006,9 @@ void tst_QPercentBarSeries::mouseDoubleClicked() QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); diff --git a/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp b/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp index e410ba57..714c3537 100644 --- a/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp +++ b/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp @@ -530,12 +530,12 @@ void tst_qpiemodelmapper::verticalMapperSignals() mapper->setFirstRow(1); mapper->setRowCount(5); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 1); - QCOMPARE(spy4.count(), 1); - QCOMPARE(spy5.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 1); + QCOMPARE(spy4.size(), 1); + QCOMPARE(spy5.size(), 1); delete mapper; } @@ -558,12 +558,12 @@ void tst_qpiemodelmapper::horizontalMapperSignals() mapper->setFirstColumn(1); mapper->setColumnCount(5); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 1); - QCOMPARE(spy4.count(), 1); - QCOMPARE(spy5.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 1); + QCOMPARE(spy4.size(), 1); + QCOMPARE(spy5.size(), 1); } QTEST_MAIN(tst_qpiemodelmapper) diff --git a/tests/auto/qpieseries/tst_qpieseries.cpp b/tests/auto/qpieseries/tst_qpieseries.cpp index 8688735b..473e2950 100644 --- a/tests/auto/qpieseries/tst_qpieseries.cpp +++ b/tests/auto/qpieseries/tst_qpieseries.cpp @@ -108,8 +108,8 @@ void tst_qpieseries::properties() m_series->clear(); QCOMPARE(m_series->count(), 0); QCOMPARE(m_series->sum(), 0.0); - QCOMPARE(countSpy.count(), 6); - QCOMPARE(sumSpy.count(), 6); + QCOMPARE(countSpy.size(), 6); + QCOMPARE(sumSpy.size(), 6); m_series->setPieSize(-1.0); QCOMPARE(m_series->pieSize(), 0.0); @@ -160,13 +160,13 @@ void tst_qpieseries::properties() m_series->setOpacity(0.5); QCOMPARE(m_series->opacity(), 0.5); - QCOMPARE(opacitySpy.count(), 1); + QCOMPARE(opacitySpy.size(), 1); m_series->setOpacity(0.0); QCOMPARE(m_series->opacity(), 0.0); - QCOMPARE(opacitySpy.count(), 2); + QCOMPARE(opacitySpy.size(), 2); m_series->setOpacity(1.0); QCOMPARE(m_series->opacity(), 1.0); - QCOMPARE(opacitySpy.count(), 3); + QCOMPARE(opacitySpy.size(), 3); } void tst_qpieseries::append() @@ -181,9 +181,9 @@ void tst_qpieseries::append() QVERIFY(m_series->append(slice1)); QVERIFY(!m_series->append(slice1)); QCOMPARE(m_series->count(), 1); - QCOMPARE(addedSpy.count(), 1); + QCOMPARE(addedSpy.size(), 1); QList<QPieSlice*> added = qvariant_cast<QList<QPieSlice*> >(addedSpy.at(0).at(0)); - QCOMPARE(added.count(), 1); + QCOMPARE(added.size(), 1); QCOMPARE(added.first(), slice1); // try to append same slice to another series @@ -201,9 +201,9 @@ void tst_qpieseries::append() QVERIFY(m_series->append(list)); QVERIFY(!m_series->append(list)); QCOMPARE(m_series->count(), 3); - QCOMPARE(addedSpy.count(), 2); + QCOMPARE(addedSpy.size(), 2); added = qvariant_cast<QList<QPieSlice*> >(addedSpy.at(1).at(0)); - QCOMPARE(added.count(), 2); + QCOMPARE(added.size(), 2); QCOMPARE(added, list); // append operator @@ -211,9 +211,9 @@ void tst_qpieseries::append() *m_series << slice4; *m_series << slice1; // fails because already added QCOMPARE(m_series->count(), 4); - QCOMPARE(addedSpy.count(), 3); + QCOMPARE(addedSpy.size(), 3); added = qvariant_cast<QList<QPieSlice*> >(addedSpy.at(2).at(0)); - QCOMPARE(added.count(), 1); + QCOMPARE(added.size(), 1); QCOMPARE(added.first(), slice4); // append with params @@ -222,9 +222,9 @@ void tst_qpieseries::append() QCOMPARE(slice5->value(), 5.0); QCOMPARE(slice5->label(), QString("slice 5")); QCOMPARE(m_series->count(), 5); - QCOMPARE(addedSpy.count(), 4); + QCOMPARE(addedSpy.size(), 4); added = qvariant_cast<QList<QPieSlice*> >(addedSpy.at(3).at(0)); - QCOMPARE(added.count(), 1); + QCOMPARE(added.size(), 1); QCOMPARE(added.first(), slice5); // check slices @@ -255,9 +255,9 @@ void tst_qpieseries::insert() QVERIFY(m_series->insert(0, slice1)); QVERIFY(!m_series->insert(0, slice1)); QCOMPARE(m_series->count(), 1); - QCOMPARE(addedSpy.count(), 1); + QCOMPARE(addedSpy.size(), 1); QList<QPieSlice*> added = qvariant_cast<QList<QPieSlice*> >(addedSpy.at(0).at(0)); - QCOMPARE(added.count(), 1); + QCOMPARE(added.size(), 1); QCOMPARE(added.first(), slice1); // try to insert same slice to another series @@ -268,21 +268,21 @@ void tst_qpieseries::insert() QPieSlice *slice2 = m_series->append("slice 2", 2); QPieSlice *slice4 = m_series->append("slice 4", 4); QCOMPARE(m_series->count(), 3); - QCOMPARE(addedSpy.count(), 3); + QCOMPARE(addedSpy.size(), 3); added = qvariant_cast<QList<QPieSlice*> >(addedSpy.at(1).at(0)); - QCOMPARE(added.count(), 1); + QCOMPARE(added.size(), 1); QCOMPARE(added.first(), slice2); added = qvariant_cast<QList<QPieSlice*> >(addedSpy.at(2).at(0)); - QCOMPARE(added.count(), 1); + QCOMPARE(added.size(), 1); QCOMPARE(added.first(), slice4); // insert between slices QPieSlice *slice3 = new QPieSlice("slice 3", 3); m_series->insert(2, slice3); QCOMPARE(m_series->count(), 4); - QCOMPARE(addedSpy.count(), 4); + QCOMPARE(addedSpy.size(), 4); added = qvariant_cast<QList<QPieSlice*> >(addedSpy.at(3).at(0)); - QCOMPARE(added.count(), 1); + QCOMPARE(added.size(), 1); QCOMPARE(added.first(), slice3); // check slices @@ -321,9 +321,9 @@ void tst_qpieseries::remove() QVERIFY(!m_series->remove(slice1)); QCOMPARE(m_series->count(), 2); QCOMPARE(m_series->slices().at(0)->label(), slice2->label()); - QCOMPARE(removedSpy.count(), 1); + QCOMPARE(removedSpy.size(), 1); QList<QPieSlice*> removed = qvariant_cast<QList<QPieSlice*> >(removedSpy.at(0).at(0)); - QCOMPARE(removed.count(), 1); + QCOMPARE(removed.size(), 1); QCOMPARE(static_cast<const void *>(removed.first()), static_cast<const void *>(slice1)); // remove all @@ -331,16 +331,16 @@ void tst_qpieseries::remove() QVERIFY(m_series->isEmpty()); QVERIFY(m_series->slices().isEmpty()); QCOMPARE(m_series->count(), 0); - QCOMPARE(removedSpy.count(), 2); + QCOMPARE(removedSpy.size(), 2); removed = qvariant_cast<QList<QPieSlice*> >(removedSpy.at(1).at(0)); - QCOMPARE(removed.count(), 2); + QCOMPARE(removed.size(), 2); QCOMPARE(static_cast<const void *>(removed.first()), static_cast<const void *>(slice2)); QCOMPARE(static_cast<const void *>(removed.last()), static_cast<const void *>(slice3)); // check that slices were actually destroyed - TRY_COMPARE(spy1.count(), 1); - TRY_COMPARE(spy2.count(), 1); - TRY_COMPARE(spy3.count(), 1); + TRY_COMPARE(spy1.size(), 1); + TRY_COMPARE(spy2.size(), 1); + TRY_COMPARE(spy3.size(), 1); } void tst_qpieseries::removeAnimated() @@ -366,14 +366,14 @@ void tst_qpieseries::take() // take first QVERIFY(m_series->take(slice1)); - TRY_COMPARE(spy1.count(), 0); + TRY_COMPARE(spy1.size(), 0); QVERIFY(slice1->parent() == m_series); // series is still the parent object QVERIFY(!m_series->take(slice1)); QCOMPARE(m_series->count(), 2); QCOMPARE(m_series->slices().at(0)->label(), slice2->label()); - QCOMPARE(removedSpy.count(), 1); + QCOMPARE(removedSpy.size(), 1); QList<QPieSlice*> removed = qvariant_cast<QList<QPieSlice*> >(removedSpy.at(0).at(0)); - QCOMPARE(removed.count(), 1); + QCOMPARE(removed.size(), 1); QCOMPARE(removed.first(), slice1); } @@ -398,9 +398,9 @@ void tst_qpieseries::calculatedValues() verifyCalculatedData(*m_series, &ok); if (!ok) return; - QCOMPARE(percentageSpy.count(), 1); - QCOMPARE(startAngleSpy.count(), 0); - QCOMPARE(angleSpanSpy.count(), 1); + QCOMPARE(percentageSpy.size(), 1); + QCOMPARE(startAngleSpy.size(), 0); + QCOMPARE(angleSpanSpy.size(), 1); // add some more slices QList<QPieSlice *> list; @@ -410,27 +410,27 @@ void tst_qpieseries::calculatedValues() verifyCalculatedData(*m_series, &ok); if (!ok) return; - QCOMPARE(percentageSpy.count(), 2); - QCOMPARE(startAngleSpy.count(), 0); - QCOMPARE(angleSpanSpy.count(), 2); + QCOMPARE(percentageSpy.size(), 2); + QCOMPARE(startAngleSpy.size(), 0); + QCOMPARE(angleSpanSpy.size(), 2); // remove a slice m_series->remove(list.first()); // remove slice 2 verifyCalculatedData(*m_series, &ok); if (!ok) return; - QCOMPARE(percentageSpy.count(), 3); - QCOMPARE(startAngleSpy.count(), 0); - QCOMPARE(angleSpanSpy.count(), 3); + QCOMPARE(percentageSpy.size(), 3); + QCOMPARE(startAngleSpy.size(), 0); + QCOMPARE(angleSpanSpy.size(), 3); // insert a slice m_series->insert(0, new QPieSlice("Slice 4", 4)); verifyCalculatedData(*m_series, &ok); if (!ok) return; - QCOMPARE(percentageSpy.count(), 4); - QCOMPARE(startAngleSpy.count(), 1); - QCOMPARE(angleSpanSpy.count(), 4); + QCOMPARE(percentageSpy.size(), 4); + QCOMPARE(startAngleSpy.size(), 1); + QCOMPARE(angleSpanSpy.size(), 4); // modify pie angles m_series->setPieStartAngle(-90); @@ -438,18 +438,18 @@ void tst_qpieseries::calculatedValues() verifyCalculatedData(*m_series, &ok); if (!ok) return; - QCOMPARE(percentageSpy.count(), 4); - QCOMPARE(startAngleSpy.count(), 3); - QCOMPARE(angleSpanSpy.count(), 6); + QCOMPARE(percentageSpy.size(), 4); + QCOMPARE(startAngleSpy.size(), 3); + QCOMPARE(angleSpanSpy.size(), 6); // clear all m_series->clear(); verifyCalculatedData(*m_series, &ok); if (!ok) return; - QCOMPARE(percentageSpy.count(), 4); - QCOMPARE(startAngleSpy.count(), 3); - QCOMPARE(angleSpanSpy.count(), 6); + QCOMPARE(percentageSpy.size(), 4); + QCOMPARE(startAngleSpy.size(), 3); + QCOMPARE(angleSpanSpy.size(), 6); } void tst_qpieseries::verifyCalculatedData(const QPieSeries &series, bool *ok) @@ -507,7 +507,7 @@ void tst_qpieseries::clickedSignal() QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(1)); QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(2)); QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(3)); - TRY_COMPARE(clickSpy.count(), 4); + TRY_COMPARE(clickSpy.size(), 4); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(0).at(0)), s1); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(1).at(0)), s2); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(2).at(0)), s3); @@ -524,7 +524,7 @@ void tst_qpieseries::clickedSignal() QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(1)); QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(2)); QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(3)); - TRY_COMPARE(clickSpy.count(), 4); + TRY_COMPARE(clickSpy.size(), 4); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(0).at(0)), s1); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(1).at(0)), s2); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(2).at(0)), s3); @@ -567,7 +567,7 @@ void tst_qpieseries::hoverSignal() QTest::qWait(100); // check - QCOMPARE(hoverSpy.count(), 8); + QCOMPARE(hoverSpy.size(), 8); int i = 0; foreach (QPieSlice *s, m_series->slices()) { QCOMPARE(qvariant_cast<QPieSlice*>(hoverSpy.at(i).at(0)), s); @@ -614,9 +614,9 @@ void tst_qpieseries::destruction() m_series = 0; // check that series has destroyed its slices - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 1); } QList<QPoint> tst_qpieseries::slicePoints(QRectF rect) @@ -662,7 +662,7 @@ void tst_qpieseries::pressedSignal() QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(1)); QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(2)); QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(3)); - TRY_COMPARE(clickSpy.count(), 4); + TRY_COMPARE(clickSpy.size(), 4); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(0).at(0)), s1); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(1).at(0)), s2); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(2).at(0)), s3); @@ -679,7 +679,7 @@ void tst_qpieseries::pressedSignal() QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(1)); QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(2)); QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(3)); - TRY_COMPARE(clickSpy.count(), 4); + TRY_COMPARE(clickSpy.size(), 4); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(0).at(0)), s1); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(1).at(0)), s2); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(2).at(0)), s3); @@ -715,7 +715,7 @@ void tst_qpieseries::releasedSignal() QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(1)); QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(2)); QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(3)); - TRY_COMPARE(clickSpy.count(), 4); + TRY_COMPARE(clickSpy.size(), 4); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(0).at(0)), s1); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(1).at(0)), s2); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(2).at(0)), s3); @@ -732,7 +732,7 @@ void tst_qpieseries::releasedSignal() QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(1)); QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(2)); QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(3)); - TRY_COMPARE(clickSpy.count(), 4); + TRY_COMPARE(clickSpy.size(), 4); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(0).at(0)), s1); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(1).at(0)), s2); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(2).at(0)), s3); @@ -762,7 +762,7 @@ void tst_qpieseries::doubleClickedSignal() QRectF pieRect = m_view->chart()->plotArea(); QList<QPoint> points = slicePoints(pieRect); QTest::mouseDClick(m_view->viewport(), Qt::LeftButton, {}, points.at(0)); - TRY_COMPARE(clickSpy.count(), 1); + TRY_COMPARE(clickSpy.size(), 1); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(0).at(0)), s1); } diff --git a/tests/auto/qpieslice/tst_qpieslice.cpp b/tests/auto/qpieslice/tst_qpieslice.cpp index 72454cbd..7b38ee18 100644 --- a/tests/auto/qpieslice/tst_qpieslice.cpp +++ b/tests/auto/qpieslice/tst_qpieslice.cpp @@ -135,16 +135,16 @@ void tst_qpieslice::changedSignals() slice.setExplodeDistanceFactor(0.1); slice.setExplodeDistanceFactor(0.1); - TRY_COMPARE(valueSpy.count(), 1); - TRY_COMPARE(labelSpy.count(), 1); - TRY_COMPARE(penSpy.count(), 2); - TRY_COMPARE(brushSpy.count(), 1); - TRY_COMPARE(labelBrushSpy.count(), 1); - TRY_COMPARE(labelFontSpy.count(), 1); - TRY_COMPARE(colorSpy.count(), 1); - TRY_COMPARE(borderColorSpy.count(), 1); - TRY_COMPARE(borderWidthSpy.count(), 1); - TRY_COMPARE(labelColorSpy.count(), 1); + TRY_COMPARE(valueSpy.size(), 1); + TRY_COMPARE(labelSpy.size(), 1); + TRY_COMPARE(penSpy.size(), 2); + TRY_COMPARE(brushSpy.size(), 1); + TRY_COMPARE(labelBrushSpy.size(), 1); + TRY_COMPARE(labelFontSpy.size(), 1); + TRY_COMPARE(colorSpy.size(), 1); + TRY_COMPARE(borderColorSpy.size(), 1); + TRY_COMPARE(borderWidthSpy.size(), 1); + TRY_COMPARE(labelColorSpy.size(), 1); } void tst_qpieslice::customize() @@ -251,10 +251,10 @@ void tst_qpieslice::clickedSignal() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(1)); QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(2)); QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(3)); - QCOMPARE(clickSpy1.count(), 1); - QCOMPARE(clickSpy2.count(), 1); - QCOMPARE(clickSpy3.count(), 1); - QCOMPARE(clickSpy4.count(), 1); + QCOMPARE(clickSpy1.size(), 1); + QCOMPARE(clickSpy2.size(), 1); + QCOMPARE(clickSpy3.size(), 1); + QCOMPARE(clickSpy4.size(), 1); } void tst_qpieslice::hoverSignal() @@ -307,16 +307,16 @@ void tst_qpieslice::hoverSignal() QTest::qWait(100); // check - QCOMPARE(hoverSpy1.count(), 2); + QCOMPARE(hoverSpy1.size(), 2); QCOMPARE(qvariant_cast<bool>(hoverSpy1.at(0).at(0)), true); QCOMPARE(qvariant_cast<bool>(hoverSpy1.at(1).at(0)), false); - QCOMPARE(hoverSpy2.count(), 2); + QCOMPARE(hoverSpy2.size(), 2); QCOMPARE(qvariant_cast<bool>(hoverSpy2.at(0).at(0)), true); QCOMPARE(qvariant_cast<bool>(hoverSpy2.at(1).at(0)), false); - QCOMPARE(hoverSpy3.count(), 2); + QCOMPARE(hoverSpy3.size(), 2); QCOMPARE(qvariant_cast<bool>(hoverSpy3.at(0).at(0)), true); QCOMPARE(qvariant_cast<bool>(hoverSpy3.at(1).at(0)), false); - QCOMPARE(hoverSpy4.count(), 2); + QCOMPARE(hoverSpy4.size(), 2); QCOMPARE(qvariant_cast<bool>(hoverSpy4.at(0).at(0)), true); QCOMPARE(qvariant_cast<bool>(hoverSpy4.at(1).at(0)), false); } @@ -370,10 +370,10 @@ void tst_qpieslice::pressedSignal() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(1)); QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(2)); QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(3)); - QCOMPARE(clickSpy1.count(), 1); - QCOMPARE(clickSpy2.count(), 1); - QCOMPARE(clickSpy3.count(), 1); - QCOMPARE(clickSpy4.count(), 1); + QCOMPARE(clickSpy1.size(), 1); + QCOMPARE(clickSpy2.size(), 1); + QCOMPARE(clickSpy3.size(), 1); + QCOMPARE(clickSpy4.size(), 1); } void tst_qpieslice::releasedSignal() @@ -411,10 +411,10 @@ void tst_qpieslice::releasedSignal() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(1)); QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(2)); QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(3)); - QCOMPARE(clickSpy1.count(), 1); - QCOMPARE(clickSpy2.count(), 1); - QCOMPARE(clickSpy3.count(), 1); - QCOMPARE(clickSpy4.count(), 1); + QCOMPARE(clickSpy1.size(), 1); + QCOMPARE(clickSpy2.size(), 1); + QCOMPARE(clickSpy3.size(), 1); + QCOMPARE(clickSpy4.size(), 1); } void tst_qpieslice::doubleClickedSignal() @@ -443,7 +443,7 @@ void tst_qpieslice::doubleClickedSignal() QRectF pieRect = view.chart()->plotArea(); QList<QPoint> points = slicePoints(pieRect); QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, points.at(0)); - QCOMPARE(clickSpy1.count(), 1); + QCOMPARE(clickSpy1.size(), 1); } QTEST_MAIN(tst_qpieslice) diff --git a/tests/auto/qscatterseries/tst_qscatterseries.cpp b/tests/auto/qscatterseries/tst_qscatterseries.cpp index b29ae8c4..fbcd02d7 100644 --- a/tests/auto/qscatterseries/tst_qscatterseries.cpp +++ b/tests/auto/qscatterseries/tst_qscatterseries.cpp @@ -93,23 +93,23 @@ void tst_QScatterSeries::scatterChangedSignals() // Color series->setColor(QColor("blueviolet")); - TRY_COMPARE(colorSpy.count(), 1); + TRY_COMPARE(colorSpy.size(), 1); // Border color series->setBorderColor(QColor("burlywood")); - TRY_COMPARE(borderColorSpy.count(), 1); + TRY_COMPARE(borderColorSpy.size(), 1); // Pen QPen p = series->pen(); p.setColor("lightpink"); series->setPen(p); - TRY_COMPARE(borderColorSpy.count(), 2); + TRY_COMPARE(borderColorSpy.size(), 2); // Brush QBrush b = series->brush(); b.setColor("lime"); series->setBrush(b); - TRY_COMPARE(colorSpy.count(), 2); + TRY_COMPARE(colorSpy.size(), 2); } void tst_QScatterSeries::pressedSignal() @@ -135,7 +135,7 @@ void tst_QScatterSeries::pressedSignal() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); // checkPoint is QPointF and for the mouseClick it it's changed to QPoint // this causes small distinction in decimals so we round it before comparing @@ -167,7 +167,7 @@ void tst_QScatterSeries::releasedSignal() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); // checkPoint is QPointF and for the mouseClick it it's changed to QPoint // this causes small distinction in decimals so we round it before comparing @@ -199,7 +199,7 @@ void tst_QScatterSeries::doubleClickedSignal() QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); // checkPoint is QPointF and for the mouseClick it it's changed to QPoint // this causes small distinction in decimals so we round it before comparing diff --git a/tests/auto/qsplineseries/tst_qsplineseries.cpp b/tests/auto/qsplineseries/tst_qsplineseries.cpp index 83819efb..565ef4a2 100644 --- a/tests/auto/qsplineseries/tst_qsplineseries.cpp +++ b/tests/auto/qsplineseries/tst_qsplineseries.cpp @@ -104,7 +104,7 @@ void tst_QSplineSeries::pressedSignal() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); // checkPoint is QPointF and for the mouseClick it it's changed to QPoint // this causes small distinction in decimals so we round it before comparing @@ -136,7 +136,7 @@ void tst_QSplineSeries::releasedSignal() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); // checkPoint is QPointF and for the mouseClick it it's changed to QPoint // this causes small distinction in decimals so we round it before comparing @@ -170,7 +170,7 @@ void tst_QSplineSeries::doubleClickedSignal() QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); // checkPoint is QPointF and for the mouseClick it it's changed to QPoint // this causes small distinction in decimals so we round it before comparing diff --git a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp index 7179a462..20ebc394 100644 --- a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp +++ b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp @@ -93,13 +93,13 @@ void tst_QStackedBarSeries::setLabelsFormat() QString format("(@value)"); m_barseries->setLabelsFormat(format); - TRY_COMPARE(labelsFormatSpy.count(), 1); + TRY_COMPARE(labelsFormatSpy.size(), 1); QList<QVariant> arguments = labelsFormatSpy.takeFirst(); QVERIFY(arguments.at(0).toString() == format); QCOMPARE(m_barseries->labelsFormat(), format); m_barseries->setLabelsFormat(QString()); - TRY_COMPARE(labelsFormatSpy.count(), 1); + TRY_COMPARE(labelsFormatSpy.size(), 1); arguments = labelsFormatSpy.takeFirst(); QVERIFY(arguments.at(0).toString() == QString()); QCOMPARE(m_barseries->labelsFormat(), QString()); @@ -112,28 +112,28 @@ void tst_QStackedBarSeries::setLabelsPosition() QCOMPARE(m_barseries->labelsPosition(), QStackedBarSeries::LabelsCenter); m_barseries->setLabelsPosition(QStackedBarSeries::LabelsInsideEnd); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); QList<QVariant> arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QStackedBarSeries::LabelsInsideEnd); QCOMPARE(m_barseries->labelsPosition(), QStackedBarSeries::LabelsInsideEnd); m_barseries->setLabelsPosition(QStackedBarSeries::LabelsInsideBase); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QStackedBarSeries::LabelsInsideBase); QCOMPARE(m_barseries->labelsPosition(), QStackedBarSeries::LabelsInsideBase); m_barseries->setLabelsPosition(QStackedBarSeries::LabelsOutsideEnd); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QStackedBarSeries::LabelsOutsideEnd); QCOMPARE(m_barseries->labelsPosition(), QStackedBarSeries::LabelsOutsideEnd); m_barseries->setLabelsPosition(QStackedBarSeries::LabelsCenter); - TRY_COMPARE(labelsPositionSpy.count(), 1); + TRY_COMPARE(labelsPositionSpy.size(), 1); arguments = labelsPositionSpy.takeFirst(); QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>() == QStackedBarSeries::LabelsCenter); @@ -147,7 +147,7 @@ void tst_QStackedBarSeries::setLabelsAngle() QCOMPARE(m_barseries->labelsAngle(), 0.0); m_barseries->setLabelsAngle(55.0); - TRY_COMPARE(labelsAngleSpy.count(), 1); + TRY_COMPARE(labelsAngleSpy.size(), 1); QList<QVariant> arguments = labelsAngleSpy.takeFirst(); QVERIFY(arguments.at(0).value<qreal>() == 55.0); QCOMPARE(m_barseries->labelsAngle(), 55.0); @@ -223,7 +223,7 @@ void tst_QStackedBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -235,7 +235,7 @@ void tst_QStackedBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -247,7 +247,7 @@ void tst_QStackedBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -259,7 +259,7 @@ void tst_QStackedBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -271,7 +271,7 @@ void tst_QStackedBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -283,7 +283,7 @@ void tst_QStackedBarSeries::mouseclicked() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); + QCOMPARE(seriesSpy.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -367,14 +367,14 @@ void tst_QStackedBarSeries::mousehovered() // move mouse to left border QTest::mouseMove(view.viewport(), QPoint(0, layout.at(0).center().y())); QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); - TRY_COMPARE(seriesIndexSpy.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 0); //======================================================================= // move mouse on top of set1 QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 0); QList<QVariant> seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesIndexSpyArg.at(2)), set1); @@ -388,9 +388,9 @@ void tst_QStackedBarSeries::mousehovered() //======================================================================= // move mouse from top of set1 to top of set2 QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 2); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 1); // should leave set1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -415,9 +415,9 @@ void tst_QStackedBarSeries::mousehovered() //======================================================================= // move mouse from top of set2 to background QTest::mouseMove(view.viewport(), QPoint(layout.at(1).center().x(), 0)); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 0); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 0); + TRY_COMPARE(setIndexSpy2.size(), 1); // should leave set2 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -433,9 +433,9 @@ void tst_QStackedBarSeries::mousehovered() // move mouse on top of set1, bar0 to check the index (hover into set1) QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 0); //should enter set1, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -456,9 +456,9 @@ void tst_QStackedBarSeries::mousehovered() // hover in set2) QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 2); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 1); //should leave set1, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -493,9 +493,9 @@ void tst_QStackedBarSeries::mousehovered() // hover in set1) QTest::mouseMove(view.viewport(), layout.at(2).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 2); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 1); //should leave set2, bar0 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -531,9 +531,9 @@ void tst_QStackedBarSeries::mousehovered() layout.at(2).top())); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 1); - TRY_COMPARE(setIndexSpy2.count(), 0); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 1); + TRY_COMPARE(setIndexSpy2.size(), 0); //should leave set1, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -553,9 +553,9 @@ void tst_QStackedBarSeries::mousehovered() // move mouse on top of set2, bar1 to check the index (hover in set2) QTest::mouseMove(view.viewport(), layout.at(3).center().toPoint()); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 0); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 0); + TRY_COMPARE(setIndexSpy2.size(), 1); //should enter set2, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -577,9 +577,9 @@ void tst_QStackedBarSeries::mousehovered() layout.at(2).top())); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setIndexSpy1.count(), 0); - TRY_COMPARE(setIndexSpy2.count(), 1); + TRY_COMPARE(seriesIndexSpy.size(), 1); + TRY_COMPARE(setIndexSpy1.size(), 0); + TRY_COMPARE(setIndexSpy2.size(), 1); //should leave set1, bar1 seriesIndexSpyArg = seriesIndexSpy.takeFirst(); @@ -662,9 +662,9 @@ void tst_QStackedBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -680,9 +680,9 @@ void tst_QStackedBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -698,9 +698,9 @@ void tst_QStackedBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -716,9 +716,9 @@ void tst_QStackedBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -734,9 +734,9 @@ void tst_QStackedBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -752,9 +752,9 @@ void tst_QStackedBarSeries::mousePressed() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -832,9 +832,9 @@ void tst_QStackedBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -850,9 +850,9 @@ void tst_QStackedBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -868,9 +868,9 @@ void tst_QStackedBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); @@ -886,9 +886,9 @@ void tst_QStackedBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -904,9 +904,9 @@ void tst_QStackedBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -922,9 +922,9 @@ void tst_QStackedBarSeries::mouseReleased() QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 0); - QCOMPARE(setSpy2.count(), 1); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 0); + QCOMPARE(setSpy2.size(), 1); seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2); @@ -1001,9 +1001,9 @@ void tst_QStackedBarSeries::mouseDoubleClicked() QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QCOMPARE(seriesSpy.count(), 1); - QCOMPARE(setSpy1.count(), 1); - QCOMPARE(setSpy2.count(), 0); + QCOMPARE(seriesSpy.size(), 1); + QCOMPARE(setSpy1.size(), 1); + QCOMPARE(setSpy2.size(), 0); QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1); diff --git a/tests/auto/qvalueaxis/tst_qvalueaxis.cpp b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp index 52c9b5c6..f99e3008 100644 --- a/tests/auto/qvalueaxis/tst_qvalueaxis.cpp +++ b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp @@ -124,9 +124,9 @@ void tst_QValueAxis::max_raw() m_valuesaxis->setMax(max); QVERIFY2(qFuzzyCompare(m_valuesaxis->max(), max), "Not equal"); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 1); } @@ -174,9 +174,9 @@ void tst_QValueAxis::min_raw() m_valuesaxis->setMin(min); QVERIFY2(qFuzzyCompare(m_valuesaxis->min(), min), "Not equal"); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); } void tst_QValueAxis::min_data() @@ -244,11 +244,11 @@ void tst_QValueAxis::applyNiceNumbers() if(niceNumbersEnabled) m_valuesaxis->applyNiceNumbers(); if(!qFuzzyCompare(expectedMin, min)) - QCOMPARE(spy1.count(), 1); + QCOMPARE(spy1.size(), 1); if(!qFuzzyCompare(expectedMax, max)) - QCOMPARE(spy0.count(), 1); + QCOMPARE(spy0.size(), 1); if((!qFuzzyCompare(expectedMin, min)) || (!qFuzzyCompare(expectedMax, max))) - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy2.size(), 1); QVERIFY2(qFuzzyCompare(m_valuesaxis->min(), expectedMin), "Min not equal"); QVERIFY2(qFuzzyCompare(m_valuesaxis->max(), expectedMax), "Max not equal"); @@ -279,9 +279,9 @@ void tst_QValueAxis::range_raw() QVERIFY2(qFuzzyCompare(m_valuesaxis->min(), min), "Min not equal"); QVERIFY2(qFuzzyCompare(m_valuesaxis->max(), max), "Max not equal"); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); } void tst_QValueAxis::range_data() @@ -331,9 +331,9 @@ void tst_QValueAxis::ticksCount() m_valuesaxis->setTickCount(ticksCount); QCOMPARE(m_valuesaxis->tickCount(), ticksCount); - QCOMPARE(spy0.count(), 0); - QCOMPARE(spy1.count(), 0); - QCOMPARE(spy2.count(), 0); + QCOMPARE(spy0.size(), 0); + QCOMPARE(spy1.size(), 0); + QCOMPARE(spy2.size(), 0); m_chart->addAxis(m_valuesaxis, Qt::AlignBottom); m_series->attachAxis(m_valuesaxis); @@ -365,9 +365,9 @@ void tst_QValueAxis::noautoscale() QVERIFY2(qFuzzyCompare(m_valuesaxis->min(), min), "Min not equal"); QVERIFY2(qFuzzyCompare(m_valuesaxis->max(), max), "Max not equal"); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); m_chart->addAxis(m_valuesaxis, Qt::AlignBottom); m_series->attachAxis(m_valuesaxis); @@ -393,9 +393,9 @@ void tst_QValueAxis::autoscale() m_chart->addAxis(m_valuesaxis, Qt::AlignBottom); m_series->attachAxis(m_valuesaxis); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); m_view->show(); QVERIFY(QTest::qWaitForWindowExposed(m_view)); @@ -413,7 +413,7 @@ void tst_QValueAxis::reverse() m_chart->addAxis(m_valuesaxis, Qt::AlignBottom); m_series->attachAxis(m_valuesaxis); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); m_view->show(); QVERIFY(QTest::qWaitForWindowExposed(m_view)); diff --git a/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp b/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp index b40a682b..98c1970c 100644 --- a/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp +++ b/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp @@ -536,12 +536,12 @@ void tst_qxymodelmapper::verticalMapperSignals() mapper->setFirstRow(1); mapper->setRowCount(5); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 1); - QCOMPARE(spy4.count(), 1); - QCOMPARE(spy5.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 1); + QCOMPARE(spy4.size(), 1); + QCOMPARE(spy5.size(), 1); delete mapper; } @@ -564,12 +564,12 @@ void tst_qxymodelmapper::horizontalMapperSignals() mapper->setFirstColumn(1); mapper->setColumnCount(5); - QCOMPARE(spy0.count(), 1); - QCOMPARE(spy1.count(), 1); - QCOMPARE(spy2.count(), 1); - QCOMPARE(spy3.count(), 1); - QCOMPARE(spy4.count(), 1); - QCOMPARE(spy5.count(), 1); + QCOMPARE(spy0.size(), 1); + QCOMPARE(spy1.size(), 1); + QCOMPARE(spy2.size(), 1); + QCOMPARE(spy3.size(), 1); + QCOMPARE(spy4.size(), 1); + QCOMPARE(spy5.size(), 1); delete mapper; } diff --git a/tests/auto/qxyseries/tst_qxyseries.cpp b/tests/auto/qxyseries/tst_qxyseries.cpp index 5cc9f9ec..a505615e 100644 --- a/tests/auto/qxyseries/tst_qxyseries.cpp +++ b/tests/auto/qxyseries/tst_qxyseries.cpp @@ -35,7 +35,7 @@ void tst_QXYSeries::seriesName() QCOMPARE(m_series->name(), QString()); m_series->setName("seriesname"); QCOMPARE(m_series->name(), QString("seriesname")); - TRY_COMPARE(nameSpy.count(), 1); + TRY_COMPARE(nameSpy.size(), 1); } void tst_QXYSeries::seriesVisible() @@ -45,7 +45,7 @@ void tst_QXYSeries::seriesVisible() m_series->setVisible(false); QCOMPARE(m_series->isVisible(), false); m_series->setVisible(true); - TRY_COMPARE(visibleSpy.count(), 2); + TRY_COMPARE(visibleSpy.size(), 2); } void tst_QXYSeries::seriesOpacity() @@ -55,15 +55,15 @@ void tst_QXYSeries::seriesOpacity() m_series->setOpacity(0.5); QCOMPARE(m_series->opacity(), 0.5); - QCOMPARE(opacitySpy.count(), 1); + QCOMPARE(opacitySpy.size(), 1); m_series->setOpacity(0.0); QCOMPARE(m_series->opacity(), 0.0); - QCOMPARE(opacitySpy.count(), 2); + QCOMPARE(opacitySpy.size(), 2); m_series->setOpacity(1.0); QCOMPARE(m_series->opacity(), 1.0); - QCOMPARE(opacitySpy.count(), 3); + QCOMPARE(opacitySpy.size(), 3); } void tst_QXYSeries::pointLabelsFormat() @@ -73,12 +73,12 @@ void tst_QXYSeries::pointLabelsFormat() QString format("@yPoint"); m_series->setPointLabelsFormat(format); - TRY_COMPARE(labelsFormatSpy.count(), 1); + TRY_COMPARE(labelsFormatSpy.size(), 1); QList<QVariant> arguments = labelsFormatSpy.takeFirst(); QVERIFY(arguments.at(0).toString() == format); m_series->setPointLabelsFormat(QString()); - TRY_COMPARE(labelsFormatSpy.count(), 1); + TRY_COMPARE(labelsFormatSpy.size(), 1); arguments = labelsFormatSpy.takeFirst(); QVERIFY(arguments.at(0).toString() == QString()); @@ -91,13 +91,13 @@ void tst_QXYSeries::pointLabelsVisible() m_series->setPointLabelsVisible(); QCOMPARE(m_series->pointLabelsVisible(), true); - TRY_COMPARE(labelsVisibleSpy.count(), 1); + TRY_COMPARE(labelsVisibleSpy.size(), 1); QList<QVariant> arguments = labelsVisibleSpy.takeFirst(); QVERIFY(arguments.at(0).toBool() == true); m_series->setPointLabelsVisible(false); QCOMPARE(m_series->pointLabelsVisible(), false); - TRY_COMPARE(labelsVisibleSpy.count(), 1); + TRY_COMPARE(labelsVisibleSpy.size(), 1); arguments = labelsVisibleSpy.takeFirst(); QVERIFY(arguments.at(0).toBool() == false); } @@ -109,12 +109,12 @@ void tst_QXYSeries::pointLabelsFont() QFont font("Times", 10); m_series->setPointLabelsFont(font); - TRY_COMPARE(labelsFontSpy.count(), 1); + TRY_COMPARE(labelsFontSpy.size(), 1); QList<QVariant> arguments = labelsFontSpy.takeFirst(); QVERIFY(arguments.at(0).value<QFont>() == font); m_series->setPointLabelsFont(defaultFont); - TRY_COMPARE(labelsFontSpy.count(), 1); + TRY_COMPARE(labelsFontSpy.size(), 1); arguments = labelsFontSpy.takeFirst(); QVERIFY(arguments.at(0).value<QFont>() == defaultFont); @@ -128,12 +128,12 @@ void tst_QXYSeries::pointLabelsColor() QColor color(Qt::blue); m_series->setPointLabelsColor(color); - TRY_COMPARE(labelsColorSpy.count(), 1); + TRY_COMPARE(labelsColorSpy.size(), 1); QList<QVariant> arguments = labelsColorSpy.takeFirst(); QVERIFY(arguments.at(0).value<QColor>() == color); m_series->setPointLabelsColor(defaultColor); - TRY_COMPARE(labelsColorSpy.count(), 1); + TRY_COMPARE(labelsColorSpy.size(), 1); arguments = labelsColorSpy.takeFirst(); QVERIFY(arguments.at(0).value<QColor>() == defaultColor); } @@ -145,13 +145,13 @@ void tst_QXYSeries::pointLabelsClipping() m_series->setPointLabelsClipping(false); QCOMPARE(m_series->pointLabelsClipping(), false); - TRY_COMPARE(labelsClippingSpy.count(), 1); + TRY_COMPARE(labelsClippingSpy.size(), 1); QList<QVariant> arguments = labelsClippingSpy.takeFirst(); QVERIFY(arguments.at(0).toBool() == false); m_series->setPointLabelsClipping(); QCOMPARE(m_series->pointLabelsClipping(), true); - TRY_COMPARE(labelsClippingSpy.count(), 1); + TRY_COMPARE(labelsClippingSpy.size(), 1); arguments = labelsClippingSpy.takeFirst(); QVERIFY(arguments.at(0).toBool() == true); } @@ -181,8 +181,8 @@ void tst_QXYSeries::append_raw() QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF))); QSignalSpy addedSpy(m_series, SIGNAL(pointAdded(int))); m_series->append(points); - TRY_COMPARE(spy0.count(), 0); - TRY_COMPARE(addedSpy.count(), points.count()); + TRY_COMPARE(spy0.size(), 0); + TRY_COMPARE(addedSpy.size(), points.size()); QCOMPARE(m_series->points(), points); // Process events between appends @@ -252,7 +252,7 @@ void tst_QXYSeries::count_raw() for(int i=0 ; i< count; ++i) m_series->append(i,i); - TRY_COMPARE(spy0.count(), 0); + TRY_COMPARE(spy0.size(), 0); QCOMPARE(m_series->count(), count); } @@ -266,23 +266,23 @@ void tst_QXYSeries::remove_raw() QFETCH(QList<QPointF>, points); QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF))); m_series->append(points); - TRY_COMPARE(spy0.count(), 0); + TRY_COMPARE(spy0.size(), 0); QCOMPARE(m_series->points(), points); foreach (const QPointF& point,points) m_series->remove(point); - QCOMPARE(m_series->points().count(), 0); - TRY_COMPARE(spy0.count(), 0); + QCOMPARE(m_series->points().size(), 0); + TRY_COMPARE(spy0.size(), 0); m_series->append(points); QCOMPARE(m_series->points(), points); //reverse order - for(int i = points.count()-1 ; i>=0; i--){ + for(int i = points.size()-1 ; i>=0; i--){ m_series->remove(points[i]); } - QCOMPARE(m_series->points().count(), 0); + QCOMPARE(m_series->points().size(), 0); QApplication::processEvents(); @@ -302,11 +302,11 @@ void tst_QXYSeries::remove_raw() m_series->replace(bunchOfPoints); QCOMPARE(m_series->points(), bunchOfPoints); QTest::qWait(1500); // Wait for append animations to be over - for (int i = bunchOfPoints.count() - 1; i >= 0; i--) { + for (int i = bunchOfPoints.size() - 1; i >= 0; i--) { m_series->remove(bunchOfPoints.at(i)); QTest::qWait(50); } - QCOMPARE(m_series->points().count(), 0); + QCOMPARE(m_series->points().size(), 0); // Removal using index for (int i = 0; i < 10; i++) @@ -314,12 +314,12 @@ void tst_QXYSeries::remove_raw() m_series->replace(bunchOfPoints); m_series->remove(5); m_series->remove(0); - QCOMPARE(m_series->points().count(), (bunchOfPoints.count() - 2)); - for (int i = bunchOfPoints.count() - 3; i >= 0; i--) { + QCOMPARE(m_series->points().size(), (bunchOfPoints.size() - 2)); + for (int i = bunchOfPoints.size() - 3; i >= 0; i--) { m_series->remove(i); - QCOMPARE(m_series->points().count(), i); + QCOMPARE(m_series->points().size(), i); } - QCOMPARE(m_series->points().count(), 0); + QCOMPARE(m_series->points().size(), 0); // Multiple removal using index for (int i = 0; i < 10; i++) @@ -327,9 +327,9 @@ void tst_QXYSeries::remove_raw() m_series->replace(bunchOfPoints); m_series->removePoints(5, 2); m_series->removePoints(0, 3); - QCOMPARE(m_series->points().count(), (bunchOfPoints.count() - 5)); - m_series->removePoints(0, (bunchOfPoints.count() - 5)); - QCOMPARE(m_series->points().count(), 0); + QCOMPARE(m_series->points().size(), (bunchOfPoints.size() - 5)); + m_series->removePoints(0, (bunchOfPoints.size() - 5)); + QCOMPARE(m_series->points().size(), 0); } void tst_QXYSeries::remove_chart_data() @@ -367,11 +367,11 @@ void tst_QXYSeries::clear_raw() QFETCH(QList<QPointF>, points); QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF))); m_series->append(points); - TRY_COMPARE(spy0.count(), 0); + TRY_COMPARE(spy0.size(), 0); QCOMPARE(m_series->points(), points); m_series->clear(); - TRY_COMPARE(spy0.count(), 0); - QCOMPARE(m_series->points().count(), 0); + TRY_COMPARE(spy0.size(), 0); + QCOMPARE(m_series->points().size(), 0); QApplication::processEvents(); } @@ -412,23 +412,23 @@ void tst_QXYSeries::replace_raw() QSignalSpy pointReplacedSpy(m_series, SIGNAL(pointReplaced(int))); QSignalSpy pointsReplacedSpy(m_series, SIGNAL(pointsReplaced())); m_series->append(points); - TRY_COMPARE(pointReplacedSpy.count(), 0); - TRY_COMPARE(pointsReplacedSpy.count(), 0); + TRY_COMPARE(pointReplacedSpy.size(), 0); + TRY_COMPARE(pointsReplacedSpy.size(), 0); QCOMPARE(m_series->points(), points); foreach (const QPointF& point, points) m_series->replace(point.x(),point.y(),point.x(),0); - TRY_COMPARE(pointReplacedSpy.count(), points.count()); - TRY_COMPARE(pointsReplacedSpy.count(), 0); + TRY_COMPARE(pointReplacedSpy.size(), points.size()); + TRY_COMPARE(pointsReplacedSpy.size(), 0); // Replace a point that does not exist m_series->replace(-123, 999, 0, 0); - TRY_COMPARE(pointReplacedSpy.count(), points.count()); - TRY_COMPARE(pointsReplacedSpy.count(), 0); + TRY_COMPARE(pointReplacedSpy.size(), points.size()); + TRY_COMPARE(pointsReplacedSpy.size(), 0); QList<QPointF> newPoints = m_series->points(); - QCOMPARE(newPoints.count(), points.count()); - for(int i =0 ; i<points.count() ; ++i) { + QCOMPARE(newPoints.size(), points.size()); + for(int i =0 ; i<points.size() ; ++i) { QCOMPARE(points[i].x(), newPoints[i].x()); QCOMPARE(newPoints[i].y(), 0.0); } @@ -438,21 +438,21 @@ void tst_QXYSeries::replace_raw() for (int i = 0; i < 10; i++) allPoints.append(QPointF(i, QRandomGenerator::global()->generateDouble())); m_series->replace(allPoints); - TRY_COMPARE(pointReplacedSpy.count(), points.count()); - TRY_COMPARE(pointsReplacedSpy.count(), 1); + TRY_COMPARE(pointReplacedSpy.size(), points.size()); + TRY_COMPARE(pointsReplacedSpy.size(), 1); m_series->replace(points); QApplication::processEvents(); // Process events between replaces - for (int i = 0; i < points.count(); ++i) { + for (int i = 0; i < points.size(); ++i) { m_series->replace(points.at(i), otherPoints.at(i)); QApplication::processEvents(); } newPoints = m_series->points(); - QCOMPARE(newPoints.count(), points.count()); - for (int i = 0; i < points.count(); ++i) { + QCOMPARE(newPoints.size(), points.size()); + for (int i = 0; i < points.size(); ++i) { QCOMPARE(otherPoints.at(i).x(), newPoints.at(i).x()); QCOMPARE(otherPoints.at(i).y(), newPoints.at(i).y()); } @@ -514,12 +514,12 @@ void tst_QXYSeries::insert() QSignalSpy addedSpy(m_series, SIGNAL(pointAdded(int))); m_series->insert(0, QPointF(5, 5)); - TRY_COMPARE(addedSpy.count(), 1); - QCOMPARE(m_series->points().count(), points.count() + 1); + TRY_COMPARE(addedSpy.size(), 1); + QCOMPARE(m_series->points().size(), points.size() + 1); m_series->insert(m_series->count(), QPointF(6, 6)); - TRY_COMPARE(addedSpy.count(), 2); - QCOMPARE(m_series->points().count(), points.count() + 2); + TRY_COMPARE(addedSpy.size(), 2); + QCOMPARE(m_series->points().size(), points.size() + 2); } void tst_QXYSeries::oper_data() @@ -539,7 +539,7 @@ void tst_QXYSeries::oper() } QCOMPARE(m_series->points(), points); - TRY_COMPARE(spy0.count(), 0); + TRY_COMPARE(spy0.size(), 0); } @@ -559,7 +559,7 @@ void tst_QXYSeries::pen() QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF))); m_series->setPen(pen); - TRY_COMPARE(spy0.count(), 0); + TRY_COMPARE(spy0.size(), 0); QCOMPARE(m_series->pen(), pen); m_chart->addSeries(m_series); @@ -591,7 +591,7 @@ void tst_QXYSeries::pointsVisible_raw() QFETCH(bool, pointsVisible); QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF))); m_series->setPointsVisible(pointsVisible); - TRY_COMPARE(spy0.count(), 0); + TRY_COMPARE(spy0.size(), 0); QCOMPARE(m_series->pointsVisible(), pointsVisible); } @@ -604,13 +604,13 @@ void tst_QXYSeries::changedSignals() // Visibility m_series->setVisible(false); m_series->setVisible(false); - TRY_COMPARE(visibleSpy.count(), 1); + TRY_COMPARE(visibleSpy.size(), 1); m_series->setVisible(true); - TRY_COMPARE(visibleSpy.count(), 2); + TRY_COMPARE(visibleSpy.size(), 2); // Color m_series->setColor(QColor("aliceblue")); - TRY_COMPARE(colorSpy.count(), 1); + TRY_COMPARE(colorSpy.size(), 1); // Pen and Brush QPen p = m_series->pen(); @@ -619,10 +619,10 @@ void tst_QXYSeries::changedSignals() QBrush b = m_series->brush(); b.setColor("beige"); m_series->setBrush(b); - TRY_COMPARE(colorSpy.count(), 2); + TRY_COMPARE(colorSpy.size(), 2); // Verify all the signals again, to make sure no extra signals were emitted - TRY_COMPARE(visibleSpy.count(), 2); - TRY_COMPARE(nameSpy.count(), 0); - TRY_COMPARE(colorSpy.count(), 2); + TRY_COMPARE(visibleSpy.size(), 2); + TRY_COMPARE(nameSpy.size(), 0); + TRY_COMPARE(colorSpy.size(), 2); } |