diff --git a/src/barchart/qbarseries.cpp b/src/barchart/qbarseries.cpp index e5e06f1..8c2ab48 100644 --- a/src/barchart/qbarseries.cpp +++ b/src/barchart/qbarseries.cpp @@ -212,19 +212,6 @@ bool QBarSeries::append(QList sets) } /*! - Removes a list of barsets from series. Releases ownership of \a sets. Doesn't delete \a sets. -*/ -bool QBarSeries::remove(QList sets) -{ - Q_D(QBarSeries); - bool success = d->remove(sets); - if (success) { - emit barsetsRemoved(sets); - } - return success; -} - -/*! Insert a set of bars to series at \a index postion. Takes ownership of \a set. If the set is null or is already in series, it won't be appended. Returns true, if inserting succeeded. diff --git a/src/barchart/qbarseries.h b/src/barchart/qbarseries.h index 6df40fe..c099d1b 100644 --- a/src/barchart/qbarseries.h +++ b/src/barchart/qbarseries.h @@ -49,7 +49,6 @@ public: bool append(QBarSet *set); bool remove(QBarSet *set); bool append(QList sets); - bool remove(QList sets); bool insert(int index, QBarSet *set); int barsetCount() const; QList barSets() const; diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp index 47c41dd..f5dc07f 100644 --- a/tests/auto/qbarseries/tst_qbarseries.cpp +++ b/tests/auto/qbarseries/tst_qbarseries.cpp @@ -49,8 +49,6 @@ private slots: void remove(); void appendList_data(); void appendList(); - void removeList_data(); - void removeList(); void barsetCount_data(); void barsetCount(); void barSets_data(); @@ -254,49 +252,6 @@ void tst_QBarSeries::appendList() QVERIFY(m_barseries->barsetCount() == count); } -void tst_QBarSeries::removeList_data() -{ - -} - -void tst_QBarSeries::removeList() -{ - int count = m_testSets.count(); - QVERIFY(m_barseries_with_sets->barsetCount() == count); - - // Try removing empty list of sets (should return false, since no barsets were removed) - bool ret = false; - QList invalidList; - ret = m_barseries_with_sets->remove(invalidList); - QVERIFY(ret == false); - QVERIFY(m_barseries_with_sets->barsetCount() == count); - - // Add some null pointers to list - invalidList.append(0); - invalidList.append(0); - invalidList.append(0); - - // Try removing null pointers from list (should return false, should not crash, should not remove anything) - 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->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->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->remove(m_testSets); - QVERIFY(ret == false); - QVERIFY(m_barseries_with_sets->barsetCount() == 0); -} - void tst_QBarSeries::barsetCount_data() {