diff --git a/demos/chartthemes/themewidget.cpp b/demos/chartthemes/themewidget.cpp index 205fb14..171dff6 100644 --- a/demos/chartthemes/themewidget.cpp +++ b/demos/chartthemes/themewidget.cpp @@ -222,7 +222,7 @@ QChart* ThemeWidget::createBarChart(int valueCount) const QBarSet *set = new QBarSet("Bar set " + QString::number(i)); foreach (Data data, m_dataTable[i]) *set << data.first.y(); - series->appendBarSet(set); + series->append(set); } chart->addSeries(series); diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp index e1a0154..4c68efc 100644 --- a/examples/barchart/main.cpp +++ b/examples/barchart/main.cpp @@ -53,11 +53,11 @@ int main(int argc, char *argv[]) //![3] QBarSeries* series = new QBarSeries(); series->setCategories(categories); - series->appendBarSet(set0); - series->appendBarSet(set1); - series->appendBarSet(set2); - series->appendBarSet(set3); - series->appendBarSet(set4); + series->append(set0); + series->append(set1); + series->append(set2); + series->append(set3); + series->append(set4); //![3] diff --git a/examples/groupedbarchart/main.cpp b/examples/groupedbarchart/main.cpp index 9f4fcbd..0453789 100644 --- a/examples/groupedbarchart/main.cpp +++ b/examples/groupedbarchart/main.cpp @@ -53,11 +53,11 @@ int main(int argc, char *argv[]) //![3] QGroupedBarSeries* series = new QGroupedBarSeries(); series->setCategories(categories); - series->appendBarSet(set0); - series->appendBarSet(set1); - series->appendBarSet(set2); - series->appendBarSet(set3); - series->appendBarSet(set4); + series->append(set0); + series->append(set1); + series->append(set2); + series->append(set3); + series->append(set4); //![3] diff --git a/examples/percentbarchart/main.cpp b/examples/percentbarchart/main.cpp index c72e751..830cb37 100644 --- a/examples/percentbarchart/main.cpp +++ b/examples/percentbarchart/main.cpp @@ -53,11 +53,11 @@ int main(int argc, char *argv[]) //![3] QPercentBarSeries* series = new QPercentBarSeries(); series->setCategories(categories); - series->appendBarSet(set0); - series->appendBarSet(set1); - series->appendBarSet(set2); - series->appendBarSet(set3); - series->appendBarSet(set4); + series->append(set0); + series->append(set1); + series->append(set2); + series->append(set3); + series->append(set4); //![3] //![4] diff --git a/examples/stackedbarchart/main.cpp b/examples/stackedbarchart/main.cpp index 289171a..a6e265b 100644 --- a/examples/stackedbarchart/main.cpp +++ b/examples/stackedbarchart/main.cpp @@ -53,11 +53,11 @@ int main(int argc, char *argv[]) //![3] QStackedBarSeries* series = new QStackedBarSeries(); series->setCategories(categories); - series->appendBarSet(set0); - series->appendBarSet(set1); - series->appendBarSet(set2); - series->appendBarSet(set3); - series->appendBarSet(set4); + series->append(set0); + series->append(set1); + series->append(set2); + series->append(set3); + series->append(set4); //![3] //![4] diff --git a/examples/stackedbarchartdrilldown/main.cpp b/examples/stackedbarchartdrilldown/main.cpp index 6bcc6ea..1b472f4 100644 --- a/examples/stackedbarchartdrilldown/main.cpp +++ b/examples/stackedbarchartdrilldown/main.cpp @@ -86,10 +86,10 @@ int main(int argc, char *argv[]) foreach (QString week, weeks ) *weeklyCrop << (qrand() % 20); // Get the drilldown series from season series and add crop to it. - seasonSeries->drilldownSeries(month)->appendBarSet(weeklyCrop); + seasonSeries->drilldownSeries(month)->append(weeklyCrop); *monthlyCrop << weeklyCrop->sum(); } - seasonSeries->appendBarSet(monthlyCrop); + seasonSeries->append(monthlyCrop); } //! [5] diff --git a/src/barchart/qbarseries.cpp b/src/barchart/qbarseries.cpp index ef42173..b739b7b 100644 --- a/src/barchart/qbarseries.cpp +++ b/src/barchart/qbarseries.cpp @@ -107,7 +107,7 @@ void QBarSeries::setCategories(QBarCategories categories) /*! Adds a set of bars to series. Takes ownership of \a set. */ -bool QBarSeries::appendBarSet(QBarSet *set) +bool QBarSeries::append(QBarSet *set) { Q_D(QBarSeries); if ((d->m_barSets.contains(set)) || (set == 0)) { @@ -123,7 +123,7 @@ bool QBarSeries::appendBarSet(QBarSet *set) /*! Removes a set of bars from series. Releases ownership of \a set. Doesn't delete \a set. */ -bool QBarSeries::removeBarSet(QBarSet *set) +bool QBarSeries::remove(QBarSet *set) { Q_D(QBarSeries); if (!d->m_barSets.contains(set)) { @@ -139,7 +139,7 @@ bool QBarSeries::removeBarSet(QBarSet *set) /*! Adds a list of barsets to series. Takes ownership of \a sets. */ -bool QBarSeries::appendBarSets(QList sets) +bool QBarSeries::append(QList sets) { Q_D(QBarSeries); foreach (QBarSet* set, sets) { @@ -164,7 +164,7 @@ bool QBarSeries::appendBarSets(QList sets) /*! Removes a list of barsets from series. Releases ownership of \a sets. Doesn't delete \a sets. */ -bool QBarSeries::removeBarSets(QList sets) +bool QBarSeries::remove(QList sets) { Q_D(QBarSeries); @@ -513,7 +513,7 @@ void QBarSeriesPrivate::initializeDataFromModel() QBarSet* barSet = new QBarSet(m_model->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString()); for(int m = m_mapper->first(); m < m_mapper->first() + rowCount; m++) *barSet << m_model->data(m_model->index(m, i), Qt::DisplayRole).toDouble(); - q->appendBarSet(barSet); + q->append(barSet); } } else { if (m_mapCategories >= m_model->rowCount()) @@ -533,7 +533,7 @@ void QBarSeriesPrivate::initializeDataFromModel() QBarSet* barSet = new QBarSet(m_model->headerData(i, Qt::Vertical, Qt::DisplayRole).toString()); for(int m = m_mapper->first(); m < m_mapper->first() + columnCount; m++) *barSet << m_model->data(m_model->index(i, m), Qt::DisplayRole).toDouble(); - q->appendBarSet(barSet); + q->append(barSet); } } emit restructuredBars(); diff --git a/src/barchart/qbarseries.h b/src/barchart/qbarseries.h index 1a37ca1..de81224 100644 --- a/src/barchart/qbarseries.h +++ b/src/barchart/qbarseries.h @@ -46,10 +46,10 @@ public: QAbstractSeries::SeriesType type() const; void setCategories(QBarCategories categories); - bool appendBarSet(QBarSet *set); // Takes ownership of set - bool removeBarSet(QBarSet *set); // Releases ownership, doesn't delete set - bool appendBarSets(QList sets); - bool removeBarSets(QList sets); + bool append(QBarSet *set); // Takes ownership of set + bool remove(QBarSet *set); // Releases ownership, doesn't delete set + bool append(QList sets); + bool remove(QList sets); int barsetCount() const; int categoryCount() const; QList barSets() const; diff --git a/test/auto/qbarseries/tst_qbarseries.cpp b/test/auto/qbarseries/tst_qbarseries.cpp index 6c78b31..edefbd8 100644 --- a/test/auto/qbarseries/tst_qbarseries.cpp +++ b/test/auto/qbarseries/tst_qbarseries.cpp @@ -45,14 +45,14 @@ private slots: void type(); void setCategories_data(); void setCategories(); - void appendBarSet_data(); - void appendBarSet(); - void removeBarSet_data(); - void removeBarSet(); - void appendBarSets_data(); - void appendBarSets(); - void removeBarSets_data(); - void removeBarSets(); + void append_data(); + void append(); + void remove_data(); + void remove(); + void appendList_data(); + void appendList(); + void removeList_data(); + void removeList(); void barsetCount_data(); void barsetCount(); void categoryCount_data(); @@ -96,14 +96,14 @@ void tst_QBarSeries::init() for (int i=0; i<5; i++) { m_testSets.append(new QBarSet("testset")); - m_barseries_with_sets->appendBarSet(m_testSets.at(i)); + m_barseries_with_sets->append(m_testSets.at(i)); } } void tst_QBarSeries::cleanup() { foreach(QBarSet* s, m_testSets) { - m_barseries_with_sets->removeBarSet(s); + m_barseries_with_sets->remove(s); delete s; } m_testSets.clear(); @@ -168,11 +168,11 @@ void tst_QBarSeries::setCategories() } } -void tst_QBarSeries::appendBarSet_data() +void tst_QBarSeries::append_data() { } -void tst_QBarSeries::appendBarSet() +void tst_QBarSeries::append() { QVERIFY(m_barseries->barsetCount() == 0); @@ -180,56 +180,56 @@ void tst_QBarSeries::appendBarSet() // Try adding barset QBarSet *barset = new QBarSet("testset"); - ret = m_barseries->appendBarSet(barset); + ret = m_barseries->append(barset); QVERIFY(ret == true); QVERIFY(m_barseries->barsetCount() == 1); // Try adding another set QBarSet *barset2 = new QBarSet("testset2"); - ret = m_barseries->appendBarSet(barset2); + ret = m_barseries->append(barset2); QVERIFY(ret == true); QVERIFY(m_barseries->barsetCount() == 2); // Try adding same set again - ret = m_barseries->appendBarSet(barset2); + ret = m_barseries->append(barset2); QVERIFY(ret == false); QVERIFY(m_barseries->barsetCount() == 2); // Try adding null set - ret = m_barseries->appendBarSet(0); + ret = m_barseries->append(0); QVERIFY(ret == false); QVERIFY(m_barseries->barsetCount() == 2); } -void tst_QBarSeries::removeBarSet_data() +void tst_QBarSeries::remove_data() { } -void tst_QBarSeries::removeBarSet() +void tst_QBarSeries::remove() { int count = m_testSets.count(); QVERIFY(m_barseries_with_sets->barsetCount() == count); // Try to remove null pointer (should not remove, should not crash) bool ret = false; - ret = m_barseries_with_sets->removeBarSet(0); + ret = m_barseries_with_sets->remove(0); QVERIFY(ret == false); QVERIFY(m_barseries_with_sets->barsetCount() == count); // Try to remove invalid pointer (should not remove, should not crash) - ret = m_barseries_with_sets->removeBarSet((QBarSet*) (m_testSets.at(0) + 1) ); + ret = m_barseries_with_sets->remove((QBarSet*) (m_testSets.at(0) + 1) ); QVERIFY(ret == false); QVERIFY(m_barseries_with_sets->barsetCount() == count); // remove some sets - ret = m_barseries_with_sets->removeBarSet(m_testSets.at(2)); + ret = m_barseries_with_sets->remove(m_testSets.at(2)); QVERIFY(ret == true); - ret = m_barseries_with_sets->removeBarSet(m_testSets.at(3)); + ret = m_barseries_with_sets->remove(m_testSets.at(3)); QVERIFY(ret == true); - ret = m_barseries_with_sets->removeBarSet(m_testSets.at(4)); + ret = m_barseries_with_sets->remove(m_testSets.at(4)); QVERIFY(ret == true); QVERIFY(m_barseries_with_sets->barsetCount() == 2); @@ -242,19 +242,19 @@ void tst_QBarSeries::removeBarSet() // Try removing all sets again (should be ok, even if some sets have already been removed) ret = false; for (int i=0; iremoveBarSet(m_testSets.at(i)); + ret |= m_barseries_with_sets->remove(m_testSets.at(i)); } QVERIFY(ret == true); QVERIFY(m_barseries_with_sets->barsetCount() == 0); } -void tst_QBarSeries::appendBarSets_data() +void tst_QBarSeries::appendList_data() { } -void tst_QBarSeries::appendBarSets() +void tst_QBarSeries::appendList() { int count = 5; QVERIFY(m_barseries->barsetCount() == 0); @@ -266,25 +266,25 @@ void tst_QBarSeries::appendBarSets() // Append new sets (should succeed, count should match the count of sets) bool ret = false; - ret = m_barseries->appendBarSets(sets); + ret = m_barseries->append(sets); QVERIFY(ret == true); QVERIFY(m_barseries->barsetCount() == count); // Append same sets again (should fail, count should remain same) - ret = m_barseries->appendBarSets(sets); + ret = m_barseries->append(sets); QVERIFY(ret == false); QVERIFY(m_barseries->barsetCount() == count); // Try append empty list (should succeed, but count should remain same) QList invalidList; - ret = m_barseries->appendBarSets(invalidList); + ret = m_barseries->append(invalidList); QVERIFY(ret == true); QVERIFY(m_barseries->barsetCount() == count); // Try append list with one new and one existing set (should fail, count remains same) invalidList.append(new QBarSet("ok set")); invalidList.append(sets.at(0)); - ret = m_barseries->appendBarSets(invalidList); + ret = m_barseries->append(invalidList); QVERIFY(ret == false); QVERIFY(m_barseries->barsetCount() == count); @@ -293,17 +293,17 @@ void tst_QBarSeries::appendBarSets() invalidList2.append(0); invalidList2.append(0); invalidList2.append(0); - ret = m_barseries->appendBarSets(invalidList2); + ret = m_barseries->append(invalidList2); QVERIFY(ret == false); QVERIFY(m_barseries->barsetCount() == count); } -void tst_QBarSeries::removeBarSets_data() +void tst_QBarSeries::removeList_data() { } -void tst_QBarSeries::removeBarSets() +void tst_QBarSeries::removeList() { int count = m_testSets.count(); QVERIFY(m_barseries_with_sets->barsetCount() == count); @@ -311,7 +311,7 @@ void tst_QBarSeries::removeBarSets() // Try removing empty list of sets (should return false, since no barsets were removed) bool ret = false; QList invalidList; - ret = m_barseries_with_sets->removeBarSets(invalidList); + ret = m_barseries_with_sets->remove(invalidList); QVERIFY(ret == false); QVERIFY(m_barseries_with_sets->barsetCount() == count); @@ -321,22 +321,22 @@ void tst_QBarSeries::removeBarSets() invalidList.append(0); // Try removing null pointers from list (should return false, should not crash, should not remove anything) - ret = m_barseries_with_sets->removeBarSets(invalidList); + ret = m_barseries_with_sets->remove(invalidList); QVERIFY(ret == false); QVERIFY(m_barseries_with_sets->barsetCount() == count); // remove all sets (should return true, since sets were removed) - ret = m_barseries_with_sets->removeBarSets(m_testSets); + ret = m_barseries_with_sets->remove(m_testSets); QVERIFY(ret == true); QVERIFY(m_barseries_with_sets->barsetCount() == 0); // Try removing invalid list again (should return false, since no barsets were removed) - ret = m_barseries_with_sets->removeBarSets(invalidList); + ret = m_barseries_with_sets->remove(invalidList); QVERIFY(ret == false); QVERIFY(m_barseries_with_sets->barsetCount() == 0); // remove all sets again (should return false, since barsets were already removed) - ret = m_barseries_with_sets->removeBarSets(m_testSets); + ret = m_barseries_with_sets->remove(m_testSets); QVERIFY(ret == false); QVERIFY(m_barseries_with_sets->barsetCount() == 0); } @@ -440,11 +440,11 @@ void tst_QBarSeries::mouseclicked() QBarSet* set1 = new QBarSet(QString("set 1")); *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10); - series->appendBarSet(set1); + series->append(set1); QBarSet* set2 = new QBarSet(QString("set 2")); *set2 << QPointF(0.5,10) << QPointF(1.5,10) << QPointF(2.5,10); - series->appendBarSet(set2); + series->append(set2); QSignalSpy setSpy1(set1, SIGNAL(clicked(QString))); QSignalSpy setSpy2(set2, SIGNAL(clicked(QString))); @@ -577,11 +577,11 @@ void tst_QBarSeries::mousehovered() QBarSet* set1 = new QBarSet(QString("set 1")); *set1 << QPointF(0.1,10) << QPointF(1.1,10) << QPointF(2.1,10); - series->appendBarSet(set1); + series->append(set1); QBarSet* set2 = new QBarSet(QString("set 2")); *set2 << QPointF(0.4,10) << QPointF(1.4,10) << QPointF(2.4,10); - series->appendBarSet(set2); + series->append(set2); QSignalSpy setSpy1(set1, SIGNAL(hovered(bool))); QSignalSpy setSpy2(set2, SIGNAL(hovered(bool))); diff --git a/test/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp b/test/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp index 9757f9b..b8f8913 100644 --- a/test/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp +++ b/test/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp @@ -109,11 +109,11 @@ void tst_QGroupedBarSeries::mouseclicked() QBarSet* set1 = new QBarSet(QString("set 1")); *set1 << 10 << 10 << 10; - series->appendBarSet(set1); + series->append(set1); QBarSet* set2 = new QBarSet(QString("set 2")); *set2 << 10 << 10 << 10; - series->appendBarSet(set2); + series->append(set2); QSignalSpy setSpy1(set1, SIGNAL(clicked(QString))); QSignalSpy setSpy2(set2, SIGNAL(clicked(QString))); @@ -246,11 +246,11 @@ void tst_QGroupedBarSeries::mousehovered() QBarSet* set1 = new QBarSet(QString("set 1")); *set1 << 10 << 10 << 10; - series->appendBarSet(set1); + series->append(set1); QBarSet* set2 = new QBarSet(QString("set 2")); *set2 << 10 << 10 << 10; - series->appendBarSet(set2); + series->append(set2); QSignalSpy setSpy1(set1, SIGNAL(hovered(bool))); QSignalSpy setSpy2(set2, SIGNAL(hovered(bool))); diff --git a/test/auto/qpercentbarseries/tst_qpercentbarseries.cpp b/test/auto/qpercentbarseries/tst_qpercentbarseries.cpp index d3b90b1..7aaf09b 100644 --- a/test/auto/qpercentbarseries/tst_qpercentbarseries.cpp +++ b/test/auto/qpercentbarseries/tst_qpercentbarseries.cpp @@ -106,11 +106,11 @@ void tst_QPercentBarSeries::mouseclicked() QBarSet* set1 = new QBarSet(QString("set 1")); *set1 << 10 << 10 << 10; - series->appendBarSet(set1); + series->append(set1); QBarSet* set2 = new QBarSet(QString("set 2")); *set2 << 10 << 10 << 10; - series->appendBarSet(set2); + series->append(set2); QSignalSpy setSpy1(set1, SIGNAL(clicked(QString))); QSignalSpy setSpy2(set2, SIGNAL(clicked(QString))); @@ -243,11 +243,11 @@ void tst_QPercentBarSeries::mousehovered() QBarSet* set1 = new QBarSet(QString("set 1")); *set1 << 10 << 10 << 10; - series->appendBarSet(set1); + series->append(set1); QBarSet* set2 = new QBarSet(QString("set 2")); *set2 << 10 << 10 << 10; - series->appendBarSet(set2); + series->append(set2); QSignalSpy setSpy1(set1, SIGNAL(hovered(bool))); QSignalSpy setSpy2(set2, SIGNAL(hovered(bool))); diff --git a/test/auto/qstackedbarseries/tst_qstackedbarseries.cpp b/test/auto/qstackedbarseries/tst_qstackedbarseries.cpp index 881a775..5c411c9 100644 --- a/test/auto/qstackedbarseries/tst_qstackedbarseries.cpp +++ b/test/auto/qstackedbarseries/tst_qstackedbarseries.cpp @@ -106,11 +106,11 @@ void tst_QStackedBarSeries::mouseclicked() QBarSet* set1 = new QBarSet(QString("set 1")); *set1 << 10 << 10 << 10; - series->appendBarSet(set1); + series->append(set1); QBarSet* set2 = new QBarSet(QString("set 2")); *set2 << 10 << 10 << 10; - series->appendBarSet(set2); + series->append(set2); QSignalSpy setSpy1(set1, SIGNAL(clicked(QString))); QSignalSpy setSpy2(set2, SIGNAL(clicked(QString))); @@ -243,11 +243,11 @@ void tst_QStackedBarSeries::mousehovered() QBarSet* set1 = new QBarSet(QString("set 1")); *set1 << 10 << 10 << 10; - series->appendBarSet(set1); + series->append(set1); QBarSet* set2 = new QBarSet(QString("set 2")); *set2 << 10 << 10 << 10; - series->appendBarSet(set2); + series->append(set2); QSignalSpy setSpy1(set1, SIGNAL(hovered(bool))); QSignalSpy setSpy2(set2, SIGNAL(hovered(bool))); diff --git a/test/chartwidgettest/mainwidget.cpp b/test/chartwidgettest/mainwidget.cpp index f9c7099..8963887 100644 --- a/test/chartwidgettest/mainwidget.cpp +++ b/test/chartwidgettest/mainwidget.cpp @@ -288,7 +288,7 @@ void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS QBarSet *set = new QBarSet("set" + QString::number(j)); for (int i(0); i < column.count(); i++) *set << column.at(i); - series->appendBarSet(set); + series->append(set); } m_chart->addSeries(series); diff --git a/test/gdpbarchart/widget.cpp b/test/gdpbarchart/widget.cpp index 0cd68ba..f19814f 100644 --- a/test/gdpbarchart/widget.cpp +++ b/test/gdpbarchart/widget.cpp @@ -183,7 +183,7 @@ void Widget::refreshChart() qDebug() << "Putting 0 for the missing data" << " : " << QString("%1").arg(selectedYearsInts[i]); } } - series0->appendBarSet(barSet); + series0->append(barSet); } // add the serie to the chart chartView->chart()->addSeries(series0);