summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Honkonen <jani.honkonen@digia.com>2012-03-29 14:57:19 +0300
committerJani Honkonen <jani.honkonen@digia.com>2012-03-29 14:57:19 +0300
commit4bbe1f66d4b7e87d8f9cbac76b13857f1c3c4184 (patch)
tree6e0c79dbbd06fe9894a7b04ba2f135c29d405c86
parent5d81932a6b1438d14a58792d223587581569605d (diff)
rename functions add() -> append()
-rw-r--r--demos/chartthemes/themewidget.cpp12
-rw-r--r--examples/chartview/main.cpp10
-rw-r--r--examples/dynamiclinechart/wavegenerator.h4
-rw-r--r--examples/ekgchart/chartview.cpp8
-rw-r--r--examples/linechart/main.cpp10
-rw-r--r--examples/multichart/multichartwidget.cpp4
-rw-r--r--examples/piechart/main.cpp10
-rw-r--r--examples/presenterchart/chartview.cpp6
-rw-r--r--examples/scatterchart/main.cpp10
-rw-r--r--examples/splinechart/splinewidget.cpp42
-rw-r--r--qmlplugin/declarativepieseries.cpp2
-rw-r--r--qmlplugin/declarativexyseries.cpp2
-rw-r--r--src/areachart/qareaseries.cpp4
-rw-r--r--src/linechart/qlineseries.cpp4
-rw-r--r--src/piechart/qpieseries.cpp18
-rw-r--r--src/piechart/qpieseries.h6
-rw-r--r--src/piechart/qpieslice.cpp4
-rw-r--r--src/scatterseries/qscatterseries.cpp4
-rw-r--r--src/xychart/qxyseries.cpp18
-rw-r--r--src/xychart/qxyseries.h6
20 files changed, 92 insertions, 92 deletions
diff --git a/demos/chartthemes/themewidget.cpp b/demos/chartthemes/themewidget.cpp
index 13010ce8..aa5008fc 100644
--- a/demos/chartthemes/themewidget.cpp
+++ b/demos/chartthemes/themewidget.cpp
@@ -184,8 +184,8 @@ QChart* ThemeWidget::createAreaChart() const
QLineSeries *series1 = new QLineSeries(chart);
QLineSeries *series2 = new QLineSeries(chart);
foreach (Data data, m_dataTable[i]) {
- series1->add(data.first);
- series2->add(QPointF(data.first.x(), 0.0));
+ series1->append(data.first);
+ series2->append(QPointF(data.first.x(), 0.0));
}
QAreaSeries *area = new QAreaSeries(series1, series2);
area->setName(name + QString::number(nameIndex));
@@ -230,7 +230,7 @@ QChart* ThemeWidget::createLineChart() const
foreach (DataList list, m_dataTable) {
QLineSeries *series = new QLineSeries(chart);
foreach (Data data, list)
- series->add(data.first);
+ series->append(data.first);
series->setName(name + QString::number(nameIndex));
nameIndex++;
chart->addSeries(series);
@@ -247,7 +247,7 @@ QChart* ThemeWidget::createPieChart() const
for (int i = 0; i < m_dataTable.count(); i++) {
QPieSeries *series = new QPieSeries(chart);
foreach (Data data, m_dataTable[i]) {
- QPieSlice *slice = series->add(data.first.y(), data.second);
+ QPieSlice *slice = series->append(data.first.y(), data.second);
if (data == m_dataTable[i].first()) {
slice->setLabelVisible();
slice->setExploded();
@@ -271,7 +271,7 @@ QChart* ThemeWidget::createSplineChart() const
foreach (DataList list, m_dataTable) {
QSplineSeries *series = new QSplineSeries(chart);
foreach (Data data, list)
- series->add(data.first);
+ series->append(data.first);
series->setName(name + QString::number(nameIndex));
nameIndex++;
chart->addSeries(series);
@@ -288,7 +288,7 @@ QChart* ThemeWidget::createScatterChart() const
foreach (DataList list, m_dataTable) {
QScatterSeries *series = new QScatterSeries(chart);
foreach (Data data, list)
- series->add(data.first);
+ series->append(data.first);
series->setName(name + QString::number(nameIndex));
nameIndex++;
chart->addSeries(series);
diff --git a/examples/chartview/main.cpp b/examples/chartview/main.cpp
index f9e5a801..dc707bae 100644
--- a/examples/chartview/main.cpp
+++ b/examples/chartview/main.cpp
@@ -22,9 +22,9 @@ int main(int argc, char *argv[])
chartView->setChartTitle("Simple Line Chart");
// Add series to the chart
QLineSeries *line = new QLineSeries();
- line->add(0.0, 0.8);
- line->add(1.1, 1.1);
- line->add(2.0, 2.5);
+ line->append(0.0, 0.8);
+ line->append(1.1, 1.1);
+ line->append(2.0, 2.5);
chartView->addSeries(line);
//! [1]
@@ -39,8 +39,8 @@ int main(int argc, char *argv[])
// Add pie series
// ...
QPieSeries *pie = new QPieSeries();
- pie->add(3.4, "slice1");
- pie->add(6.7, "slice2");
+ pie->append(3.4, "slice1");
+ pie->append(6.7, "slice2");
chartView->addSeries(pie);
//! [3]
diff --git a/examples/dynamiclinechart/wavegenerator.h b/examples/dynamiclinechart/wavegenerator.h
index 1bfcdb57..bf4e4472 100644
--- a/examples/dynamiclinechart/wavegenerator.h
+++ b/examples/dynamiclinechart/wavegenerator.h
@@ -27,8 +27,8 @@ public:
int fluctuate = 100;
for (qreal x = 0; x <= 2*PI; x+=m_step) {
- series1->add(x, fabs(sin(x)*fluctuate));
- series2->add(x, fabs(cos(x)*fluctuate));
+ series1->append(x, fabs(sin(x)*fluctuate));
+ series2->append(x, fabs(cos(x)*fluctuate));
}
QObject::connect(&m_timer,SIGNAL(timeout()),this,SLOT(update()));
diff --git a/examples/ekgchart/chartview.cpp b/examples/ekgchart/chartview.cpp
index 0d97a1cd..1add1fed 100644
--- a/examples/ekgchart/chartview.cpp
+++ b/examples/ekgchart/chartview.cpp
@@ -25,8 +25,8 @@ m_y(1)
green.setWidth(3);
m_series1->setPen(green);
- m_series0->add(m_x,m_y);
- m_series1->add(m_x,m_y);
+ m_series0->append(m_x,m_y);
+ m_series1->append(m_x,m_y);
setChartTitle("Simple EKG chart");
addSeries(m_series0);
@@ -46,8 +46,8 @@ void ChartView::handleTimeout()
{
m_x+=m_step;
m_y = qrand() % 5 - 2.5;
- m_series0->add(m_x,m_y);
- m_series1->add(m_x,m_y);
+ m_series0->append(m_x,m_y);
+ m_series1->append(m_x,m_y);
if(m_x>=10)
{
m_series0->remove(m_x-10);
diff --git a/examples/linechart/main.cpp b/examples/linechart/main.cpp
index 39e74b42..6ed21e5a 100644
--- a/examples/linechart/main.cpp
+++ b/examples/linechart/main.cpp
@@ -60,11 +60,11 @@ int main(int argc, char *argv[])
//![1]
//![2]
- series0->add(0, 6);
- series0->add(2, 4);
- series0->add(3, 8);
- series0->add(7, 4);
- series0->add(10, 5);
+ series0->append(0, 6);
+ series0->append(2, 4);
+ series0->append(3, 8);
+ series0->append(7, 4);
+ series0->append(10, 5);
*series1 << QPointF(1, 1) << QPointF(3, 3) << QPointF(7, 6) << QPointF(8, 3) << QPointF(10, 2);
//![2]
diff --git a/examples/multichart/multichartwidget.cpp b/examples/multichart/multichartwidget.cpp
index eeb5bcda..a49a02d8 100644
--- a/examples/multichart/multichartwidget.cpp
+++ b/examples/multichart/multichartwidget.cpp
@@ -16,8 +16,8 @@ MultiChartWidget::MultiChartWidget(QWidget *parent) :
QChartView *chartView1 = new QChartView();
l->addWidget(chartView1);
QPieSeries *pie = new QPieSeries();
- pie->add(1.1, "label1");
- pie->add(1.2, "label2");
+ pie->append(1.1, "label1");
+ pie->append(1.2, "label2");
chartView1->addSeries(pie);
// Create chart 2 and add a simple scatter series onto it
diff --git a/examples/piechart/main.cpp b/examples/piechart/main.cpp
index f94a4a96..a111c828 100644
--- a/examples/piechart/main.cpp
+++ b/examples/piechart/main.cpp
@@ -51,11 +51,11 @@ int main(int argc, char *argv[])
//![1]
QPieSeries *series = new QPieSeries();
- series->add(1, "Slice 1");
- series->add(2, "Slice 2");
- series->add(3, "Slice 3");
- series->add(4, "Slice 4");
- series->add(5, "Slice 5");
+ series->append(1, "Slice 1");
+ series->append(2, "Slice 2");
+ series->append(3, "Slice 3");
+ series->append(4, "Slice 4");
+ series->append(5, "Slice 5");
//![1]
//![2]
diff --git a/examples/presenterchart/chartview.cpp b/examples/presenterchart/chartview.cpp
index 09b9d2bc..aa155e90 100644
--- a/examples/presenterchart/chartview.cpp
+++ b/examples/presenterchart/chartview.cpp
@@ -41,9 +41,9 @@ m_index(0)
for (int x = 0; x <= numPoints; ++x) {
qreal y = qrand() % 100;
- series0->add(x,y);
- series1->add(x,y);
- series2->add(x,y);
+ series0->append(x,y);
+ series1->append(x,y);
+ series2->append(x,y);
}
//![2]
diff --git a/examples/scatterchart/main.cpp b/examples/scatterchart/main.cpp
index 8f2f9991..5606ff32 100644
--- a/examples/scatterchart/main.cpp
+++ b/examples/scatterchart/main.cpp
@@ -67,11 +67,11 @@ int main(int argc, char *argv[])
//![1]
//![2]
- series0->add(0, 6);
- series0->add(2, 4);
- series0->add(3, 8);
- series0->add(7, 4);
- series0->add(10, 5);
+ series0->append(0, 6);
+ series0->append(2, 4);
+ series0->append(3, 8);
+ series0->append(7, 4);
+ series0->append(10, 5);
*series1 << QPointF(1, 1) << QPointF(3, 3) << QPointF(7, 6) << QPointF(8, 3) << QPointF(10, 2);
//![2]
diff --git a/examples/splinechart/splinewidget.cpp b/examples/splinechart/splinewidget.cpp
index 3f92579e..23ef4baa 100644
--- a/examples/splinechart/splinewidget.cpp
+++ b/examples/splinechart/splinewidget.cpp
@@ -28,31 +28,31 @@ SplineWidget::SplineWidget(QWidget *parent)
//! [add points to series]
//add data points to the series
- series->add(QPointF(150, 100));
- series->add(QPointF(200, 130));
- series->add(QPointF(250, 120));
- series->add(QPointF(300, 140));
- series->add(QPointF(350, 160));
+ series->append(QPointF(150, 100));
+ series->append(QPointF(200, 130));
+ series->append(QPointF(250, 120));
+ series->append(QPointF(300, 140));
+ series->append(QPointF(350, 160));
//! [add points to series]
QSplineSeries* series2 = new QSplineSeries;
- series2->add(QPointF(400, 120));
- series2->add(QPointF(450, 150));
- series2->add(QPointF(500, 145));
- series2->add(QPointF(550, 170));
+ series2->append(QPointF(400, 120));
+ series2->append(QPointF(450, 150));
+ series2->append(QPointF(500, 145));
+ series2->append(QPointF(550, 170));
-// series->add(QPointF(600, 190));
-// series->add(QPointF(650, 210));
-// series->add(QPointF(700, 190));
-// series->add(QPointF(750, 180));
-// series->add(QPointF(800, 170));
+// series->append(QPointF(600, 190));
+// series->append(QPointF(650, 210));
+// series->append(QPointF(700, 190));
+// series->append(QPointF(750, 180));
+// series->append(QPointF(800, 170));
QSplineSeries* series3 = new QSplineSeries;
- series3->add(QPointF(600, 190));
- series3->add(QPointF(650, 210));
- series3->add(QPointF(700, 190));
- series3->add(QPointF(750, 180));
- series3->add(QPointF(800, 170));
+ series3->append(QPointF(600, 190));
+ series3->append(QPointF(650, 210));
+ series3->append(QPointF(700, 190));
+ series3->append(QPointF(750, 180));
+ series3->append(QPointF(800, 170));
//! [3]
// create chart view
@@ -96,9 +96,9 @@ SplineWidget::SplineWidget(QWidget *parent)
void SplineWidget::addNewPoint()
{
if (series->count() > 0)
- series->add(QPointF(series->x(series->count() - 1) + 40 + qrand()%40, qAbs(series->y(series->count() - 1) - 50 + qrand()%100)));
+ series->append(QPointF(series->x(series->count() - 1) + 40 + qrand()%40, qAbs(series->y(series->count() - 1) - 50 + qrand()%100)));
else
- series->add(QPointF(50, 50 + qrand()%50));
+ series->append(QPointF(50, 50 + qrand()%50));
}
//! [add point]
diff --git a/qmlplugin/declarativepieseries.cpp b/qmlplugin/declarativepieseries.cpp
index 42926dd1..ea0b8753 100644
--- a/qmlplugin/declarativepieseries.cpp
+++ b/qmlplugin/declarativepieseries.cpp
@@ -35,7 +35,7 @@ void DeclarativePieSeries::appendSlice(QDeclarativeListProperty<QPieSlice> *list
{
DeclarativePieSeries *series = qobject_cast<DeclarativePieSeries *>(list->object);
if (series)
- series->add(slice->value(), slice->label());
+ series->append(slice->value(), slice->label());
}
#include "moc_declarativepieseries.cpp"
diff --git a/qmlplugin/declarativexyseries.cpp b/qmlplugin/declarativexyseries.cpp
index dd9a218f..b49ff63c 100644
--- a/qmlplugin/declarativexyseries.cpp
+++ b/qmlplugin/declarativexyseries.cpp
@@ -21,7 +21,7 @@ void DeclarativeXySeries::appendPoints(QDeclarativeListProperty<DeclarativeXyPoi
{
QXYSeries *series = qobject_cast<QXYSeries *>(list->object);
if (series)
- series->add(QPointF(element->x(), element->y()));
+ series->append(QPointF(element->x(), element->y()));
}
QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/areachart/qareaseries.cpp b/src/areachart/qareaseries.cpp
index 87be5d9f..575ecffc 100644
--- a/src/areachart/qareaseries.cpp
+++ b/src/areachart/qareaseries.cpp
@@ -40,8 +40,8 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
Creating basic area chart is simple:
\code
QLineSeries* lineSeries = new QLineSeries();
- series->add(0, 6);
- series->add(2, 4);
+ series->append(0, 6);
+ series->append(2, 4);
QAreaSeries* areaSeries = new QAreaSeries(lineSeries);
...
chartView->addSeries(areaSeries);
diff --git a/src/linechart/qlineseries.cpp b/src/linechart/qlineseries.cpp
index 3784d7ec..f3bb7a4a 100644
--- a/src/linechart/qlineseries.cpp
+++ b/src/linechart/qlineseries.cpp
@@ -36,8 +36,8 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
Creating basic line chart is simple:
\code
QLineSeries* series = new QLineSeries();
- series->add(0, 6);
- series->add(2, 4);
+ series->append(0, 6);
+ series->append(2, 4);
...
chartView->addSeries(series);
\endcode
diff --git a/src/piechart/qpieseries.cpp b/src/piechart/qpieseries.cpp
index f2228cb3..9b2ae156 100644
--- a/src/piechart/qpieseries.cpp
+++ b/src/piechart/qpieseries.cpp
@@ -228,14 +228,14 @@ QSeries::QSeriesType QPieSeries::type() const
void QPieSeries::replace(QList<QPieSlice*> slices)
{
clear();
- add(slices);
+ append(slices);
}
/*!
Adds an array of \a slices to the series.
Slice ownership is passed to the series.
*/
-void QPieSeries::add(QList<QPieSlice*> slices)
+void QPieSeries::append(QList<QPieSlice*> slices)
{
Q_D(QPieSeries);
@@ -260,9 +260,9 @@ void QPieSeries::add(QList<QPieSlice*> slices)
Adds a single \a slice to the series.
Slice ownership is passed to the series.
*/
-void QPieSeries::add(QPieSlice* slice)
+void QPieSeries::append(QPieSlice* slice)
{
- add(QList<QPieSlice*>() << slice);
+ append(QList<QPieSlice*>() << slice);
}
/*!
@@ -271,7 +271,7 @@ void QPieSeries::add(QPieSlice* slice)
*/
QPieSeries& QPieSeries::operator << (QPieSlice* slice)
{
- add(slice);
+ append(slice);
return *this;
}
@@ -280,10 +280,10 @@ QPieSeries& QPieSeries::operator << (QPieSlice* slice)
Adds a single slice to the series with give \a value and \a name.
Slice ownership is passed to the series.
*/
-QPieSlice* QPieSeries::add(qreal value, QString name)
+QPieSlice* QPieSeries::append(qreal value, QString name)
{
QPieSlice* slice = new QPieSlice(value, name);
- add(slice);
+ append(slice);
return slice;
}
@@ -644,10 +644,10 @@ void QPieSeries::setModelMapping(int modelValuesLine, int modelLabelsLine, Qt::O
// create the initial slices set
if (d->m_mapOrientation == Qt::Vertical) {
for (int i = 0; i < m_model->rowCount(); i++)
- add(m_model->data(m_model->index(i, d->m_mapValues), Qt::DisplayRole).toDouble(), m_model->data(m_model->index(i, d->m_mapLabels), Qt::DisplayRole).toString());
+ append(m_model->data(m_model->index(i, d->m_mapValues), Qt::DisplayRole).toDouble(), m_model->data(m_model->index(i, d->m_mapLabels), Qt::DisplayRole).toString());
} else {
for (int i = 0; i < m_model->columnCount(); i++)
- add(m_model->data(m_model->index(d->m_mapValues, i), Qt::DisplayRole).toDouble(), m_model->data(m_model->index(d->m_mapLabels, i), Qt::DisplayRole).toString());
+ append(m_model->data(m_model->index(d->m_mapValues, i), Qt::DisplayRole).toDouble(), m_model->data(m_model->index(d->m_mapLabels, i), Qt::DisplayRole).toString());
}
}
diff --git a/src/piechart/qpieseries.h b/src/piechart/qpieseries.h
index d5ced548..f0b7eda4 100644
--- a/src/piechart/qpieseries.h
+++ b/src/piechart/qpieseries.h
@@ -41,8 +41,8 @@ public: // from QChartSeries
public:
// slice setters
- void add(QPieSlice* slice);
- void add(QList<QPieSlice*> slices);
+ void append(QPieSlice* slice);
+ void append(QList<QPieSlice*> slices);
void insert(int i, QPieSlice* slice);
void replace(QList<QPieSlice*> slices);
void remove(QPieSlice* slice);
@@ -69,7 +69,7 @@ public:
// convenience function
QPieSeries& operator << (QPieSlice* slice);
- QPieSlice* add(qreal value, QString name);
+ QPieSlice* append(qreal value, QString name);
void setLabelsVisible(bool visible = true);
// data from model
diff --git a/src/piechart/qpieslice.cpp b/src/piechart/qpieslice.cpp
index 7cabcd5a..ef21b4cc 100644
--- a/src/piechart/qpieslice.cpp
+++ b/src/piechart/qpieslice.cpp
@@ -53,7 +53,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
Note that QPieSeries takes ownership of the slice when it is set/added.
- \sa QPieSeries::replace(), QPieSeries::add()
+ \sa QPieSeries::replace(), QPieSeries::append()
*/
QPieSlice::QPieSlice(QObject *parent)
:QObject(parent),
@@ -65,7 +65,7 @@ QPieSlice::QPieSlice(QObject *parent)
/*!
Constructs an empty slice with given \a value, \a label and a \a parent.
Note that QPieSeries takes ownership of the slice when it is set/added.
- \sa QPieSeries::replace(), QPieSeries::add()
+ \sa QPieSeries::replace(), QPieSeries::append()
*/
QPieSlice::QPieSlice(qreal value, QString label, QObject *parent)
:QObject(parent),
diff --git a/src/scatterseries/qscatterseries.cpp b/src/scatterseries/qscatterseries.cpp
index ad2b9e6a..a40982ee 100644
--- a/src/scatterseries/qscatterseries.cpp
+++ b/src/scatterseries/qscatterseries.cpp
@@ -35,8 +35,8 @@
Creating basic scatter chart is simple:
\code
QScatterSeries* series = new QScatterSeries();
- series->add(0, 6);
- series->add(2, 4);
+ series->append(0, 6);
+ series->append(2, 4);
...
chartView->addSeries(series);
\endcode
diff --git a/src/xychart/qxyseries.cpp b/src/xychart/qxyseries.cpp
index 5a3c87a6..9c868265 100644
--- a/src/xychart/qxyseries.cpp
+++ b/src/xychart/qxyseries.cpp
@@ -89,7 +89,7 @@ QXYSeries::~QXYSeries()
/*!
Adds data point \a x \a y to the series. Points are connected with lines on the chart.
*/
-void QXYSeries::add(qreal x,qreal y)
+void QXYSeries::append(qreal x,qreal y)
{
Q_ASSERT(m_x.size() == m_y.size());
m_x<<x;
@@ -101,19 +101,19 @@ void QXYSeries::add(qreal x,qreal y)
This is an overloaded function.
Adds data \a point to the series. Points are connected with lines on the chart.
*/
-void QXYSeries::add(const QPointF &point)
+void QXYSeries::append(const QPointF &point)
{
- add(point.x(),point.y());
+ append(point.x(),point.y());
}
/*!
This is an overloaded function.
Adds list of data \a points to the series. Points are connected with lines on the chart.
*/
-void QXYSeries::add(const QList<QPointF> points)
+void QXYSeries::append(const QList<QPointF> points)
{
foreach(const QPointF& point , points) {
- add(point.x(),point.y());
+ append(point.x(),point.y());
}
}
@@ -293,24 +293,24 @@ void QXYSeries::setBrush(const QBrush &brush)
/*!
Stream operator for adding a data \a point to the series.
- \sa add()
+ \sa append()
*/
QXYSeries& QXYSeries::operator<< (const QPointF &point)
{
- add(point);
+ append(point);
return *this;
}
/*!
Stream operator for adding a list of \a points to the series.
- \sa add()
+ \sa append()
*/
QXYSeries& QXYSeries::operator<< (const QList<QPointF> points)
{
- add(points);
+ append(points);
return *this;
}
diff --git a/src/xychart/qxyseries.h b/src/xychart/qxyseries.h
index d44dbb85..4ce2c38e 100644
--- a/src/xychart/qxyseries.h
+++ b/src/xychart/qxyseries.h
@@ -36,9 +36,9 @@ protected:
virtual ~QXYSeries();
public:
- void add(qreal x, qreal y);
- void add(const QPointF &point);
- void add(const QList<QPointF> points);
+ void append(qreal x, qreal y);
+ void append(const QPointF &point);
+ void append(const QList<QPointF> points);
void replace(qreal x,qreal y);
void replace(const QPointF &point);
void remove(qreal x);