HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1374:51095cc2cff6

plugins/declarative/declarativelineseries.h +1 -1

             public: // from QLineSeries
                 Q_INVOKABLE void append(qreal x, qreal y) { QLineSeries::append(x, y); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { QLineSeries::remove(x, y); }
-                Q_INVOKABLE void clear() { QLineSeries::removeAll(); }
+                Q_INVOKABLE void clear() { QLineSeries::clear(); }
                 Q_INVOKABLE DeclarativeXyPoint *at(int index) { return DeclarativeXySeries::at(index); }
             public Q_SLOTS:

plugins/declarative/declarativescatterseries.h +1 -1

             public: // from QScatterSeries
                 Q_INVOKABLE void append(qreal x, qreal y) { QScatterSeries::append(x, y); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { QScatterSeries::remove(x, y); }
-                Q_INVOKABLE void clear() { QScatterSeries::removeAll(); }
+                Q_INVOKABLE void clear() { QScatterSeries::clear(); }
                 Q_INVOKABLE DeclarativeXyPoint *at(int index) { return DeclarativeXySeries::at(index); }
             public Q_SLOTS:

plugins/declarative/declarativesplineseries.h +1 -1

             public: // from QSplineSeries
                 Q_INVOKABLE void append(qreal x, qreal y) { QSplineSeries::append(x, y); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { QSplineSeries::remove(x, y); }
-                Q_INVOKABLE void clear() { QSplineSeries::removeAll(); }
+                Q_INVOKABLE void clear() { QSplineSeries::clear(); }
                 Q_INVOKABLE DeclarativeXyPoint *at(int index) { return DeclarativeXySeries::at(index); }
             public Q_SLOTS:

src/xychart/qxyseries.cpp 0 -11

@@ -176,17 +176,6 void QXYSeries::remove(const QPointF &point)
176	}	176	}
177		177
178	/*!	178	/*!
179	Removes all data points from the series.
180	*/
181	void QXYSeries::removeAll()
182	{
183	Q_D(QXYSeries);
184	foreach(const QPointF& point, d->m_points) {
185	remove(point);
186	}
187	}
188
189	/*!
190	Inserts a \a point in the series at \a index position.	179	Inserts a \a point in the series at \a index position.
191	*/	180	*/
192	void QXYSeries::insert(int index, const QPointF &point)	181	void QXYSeries::insert(int index, const QPointF &point)

src/xychart/qxyseries.h 0 -1

                 void replace(const QPointF &oldPoint,const QPointF &newPoint);
                 void remove(qreal x, qreal y);
                 void remove(const QPointF &point);
-                void removeAll();
                 void insert(int index, const QPointF &point);
                 void clear();

tests/auto/qlineseries/tst_qlineseries.cpp +1 -1

                 series.remove(0.0,0.0);
                 series.remove(QPointF());
-                series.removeAll();
+                series.clear();
                 series.replace(QPointF(),QPointF());
                 series.replace(0,0,0,0);

tests/auto/qscatterseries/tst_qscatterseries.cpp +1 -1

                 series.remove(0.0,0.0);
                 series.remove(QPointF());
-                series.removeAll();
+                series.clear();
                 series.replace(QPointF(),QPointF());
                 series.replace(0,0,0,0);

tests/auto/qsplineseries/tst_qsplineseries.cpp +1 -1

                 series.remove(0.0,0.0);
                 series.remove(QPointF());
-                series.removeAll();
+                series.clear();
                 series.replace(QPointF(),QPointF());
                 series.replace(0,0,0,0);

tests/auto/qxyseries/tst_qxyseries.cpp +9 -9

             }
-            void tst_QXYSeries::removeAll_raw_data()
+            void tst_QXYSeries::clear_raw_data()
             {
                 append_data();
             }
-            void tst_QXYSeries::removeAll_raw()
+            void tst_QXYSeries::clear_raw()
             {
                 QFETCH(QList<QPointF>, points);
                 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&)));
                 m_series->append(points);
                 TRY_COMPARE(spy0.count(), 0);
                 QCOMPARE(m_series->points(), points);
-                m_series->removeAll();
+                m_series->clear();
                 TRY_COMPARE(spy0.count(), 0);
                 QCOMPARE(m_series->points().count(), 0);
             }
-            void tst_QXYSeries::removeAll_chart_data()
+            void tst_QXYSeries::clear_chart_data()
             {
                 append_data();
             }
-            void tst_QXYSeries::removeAll_chart()
+            void tst_QXYSeries::clear_chart()
             {
                 m_view->show();
                 m_chart->addSeries(m_series);
                 QTest::qWaitForWindowShown(m_view);
-                removeAll_raw();
+                clear_raw();
             }
-            void tst_QXYSeries::removeAll_chart_animation_data()
+            void tst_QXYSeries::clear_chart_animation_data()
             {
                 append_data();
             }
-            void tst_QXYSeries::removeAll_chart_animation()
+            void tst_QXYSeries::clear_chart_animation()
             {
                 m_chart->setAnimationOptions(QChart::AllAnimations);
-                removeAll_chart();
+                clear_chart();
             }
             void tst_QXYSeries::replace_raw_data()

tests/auto/qxyseries/tst_qxyseries.h +6 -6

                 void remove_chart();
                 void remove_chart_animation_data();
                 void remove_chart_animation();
-                void removeAll_raw_data();
+                void clear_raw_data();
-                void removeAll_raw();
+                void clear_raw();
-                void removeAll_chart_data();
+                void clear_chart_data();
-                void removeAll_chart();
+                void clear_chart();
-                void removeAll_chart_animation_data();
+                void clear_chart_animation_data();
-                void removeAll_chart_animation();
+                void clear_chart_animation();
                 void replace_raw_data();
                 void replace_raw();
                 void replace_chart_data();

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages