##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

removed remove list from barseries public api
sauimone -
r1373:d4a4ed89d426
parent child
Show More
Side by Side Unified
Context file:
r1373:d4a4ed89d426 Loading diff...:
Show file before | Show file after | Hide comments
@@ -212,19 +212,6 bool QBarSeries::append(QList<QBarSet* > sets)
212 }
212 }
213
213
214 /*!
214 /*!
215 Removes a list of barsets from series. Releases ownership of \a sets. Doesn't delete \a sets.
216 */
217 bool QBarSeries::remove(QList<QBarSet* > sets)
218 {
219 Q_D(QBarSeries);
220 bool success = d->remove(sets);
221 if (success) {
222 emit barsetsRemoved(sets);
223 }
224 return success;
225 }
226
227 /*!
228 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.
215 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.
229 Returns true, if inserting succeeded.
216 Returns true, if inserting succeeded.
230
217
Show file before | Show file after | Hide comments
@@ -49,7 +49,6 public:
49 bool append(QBarSet *set);
49 bool append(QBarSet *set);
50 bool remove(QBarSet *set);
50 bool remove(QBarSet *set);
51 bool append(QList<QBarSet* > sets);
51 bool append(QList<QBarSet* > sets);
52 bool remove(QList<QBarSet* > sets);
53 bool insert(int index, QBarSet *set);
52 bool insert(int index, QBarSet *set);
54 int barsetCount() const;
53 int barsetCount() const;
55 QList<QBarSet*> barSets() const;
54 QList<QBarSet*> barSets() const;
Show file before | Show file after | Hide comments
@@ -49,8 +49,6 private slots:
49 void remove();
49 void remove();
50 void appendList_data();
50 void appendList_data();
51 void appendList();
51 void appendList();
52 void removeList_data();
53 void removeList();
54 void barsetCount_data();
52 void barsetCount_data();
55 void barsetCount();
53 void barsetCount();
56 void barSets_data();
54 void barSets_data();
@@ -254,49 +252,6 void tst_QBarSeries::appendList()
254 QVERIFY(m_barseries->barsetCount() == count);
252 QVERIFY(m_barseries->barsetCount() == count);
255 }
253 }
256
254
257 void tst_QBarSeries::removeList_data()
258 {
259
260 }
261
262 void tst_QBarSeries::removeList()
263 {
264 int count = m_testSets.count();
265 QVERIFY(m_barseries_with_sets->barsetCount() == count);
266
267 // Try removing empty list of sets (should return false, since no barsets were removed)
268 bool ret = false;
269 QList<QBarSet*> invalidList;
270 ret = m_barseries_with_sets->remove(invalidList);
271 QVERIFY(ret == false);
272 QVERIFY(m_barseries_with_sets->barsetCount() == count);
273
274 // Add some null pointers to list
275 invalidList.append(0);
276 invalidList.append(0);
277 invalidList.append(0);
278
279 // Try removing null pointers from list (should return false, should not crash, should not remove anything)
280 ret = m_barseries_with_sets->remove(invalidList);
281 QVERIFY(ret == false);
282 QVERIFY(m_barseries_with_sets->barsetCount() == count);
283
284 // remove all sets (should return true, since sets were removed)
285 ret = m_barseries_with_sets->remove(m_testSets);
286 QVERIFY(ret == true);
287 QVERIFY(m_barseries_with_sets->barsetCount() == 0);
288
289 // Try removing invalid list again (should return false, since no barsets were removed)
290 ret = m_barseries_with_sets->remove(invalidList);
291 QVERIFY(ret == false);
292 QVERIFY(m_barseries_with_sets->barsetCount() == 0);
293
294 // remove all sets again (should return false, since barsets were already removed)
295 ret = m_barseries_with_sets->remove(m_testSets);
296 QVERIFY(ret == false);
297 QVERIFY(m_barseries_with_sets->barsetCount() == 0);
298 }
299
300 void tst_QBarSeries::barsetCount_data()
255 void tst_QBarSeries::barsetCount_data()
301 {
256 {
302
257
General Comments 0
You need to be logged in to leave comments. Login now