summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2/declarativescatter.cpp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-06-05 12:00:24 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-06-05 12:03:16 +0300
commitcfbfbea7d932f98c3f541bb4fc3e975ffb7a5658 (patch)
treebed376368e9611c751cf1dd75b85de2827d67325 /src/datavisualizationqml2/declarativescatter.cpp
parent8435c15d224a4e9db0920ecd33c4bea3e70d83bf (diff)
parentc51e0f83ef6dd9e85db6953995585ba0cafb35d7 (diff)
Merge branch 'develop'
Diffstat (limited to 'src/datavisualizationqml2/declarativescatter.cpp')
-rw-r--r--src/datavisualizationqml2/declarativescatter.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp
index dcc52a3d..96af6df6 100644
--- a/src/datavisualizationqml2/declarativescatter.cpp
+++ b/src/datavisualizationqml2/declarativescatter.cpp
@@ -17,8 +17,6 @@
****************************************************************************/
#include "declarativescatter_p.h"
-#include "qitemmodelscatterdataproxy.h"
-#include "declarativescene_p.h"
QT_BEGIN_NAMESPACE_DATAVISUALIZATION
@@ -79,13 +77,14 @@ QScatter3DSeries *DeclarativeScatter::selectedSeries() const
QQmlListProperty<QScatter3DSeries> DeclarativeScatter::seriesList()
{
return QQmlListProperty<QScatter3DSeries>(this, this,
- &DeclarativeScatter::appendSeriesFunc,
- &DeclarativeScatter::countSeriesFunc,
- &DeclarativeScatter::atSeriesFunc,
- &DeclarativeScatter::clearSeriesFunc);
+ &DeclarativeScatter::appendSeriesFunc,
+ &DeclarativeScatter::countSeriesFunc,
+ &DeclarativeScatter::atSeriesFunc,
+ &DeclarativeScatter::clearSeriesFunc);
}
-void DeclarativeScatter::appendSeriesFunc(QQmlListProperty<QScatter3DSeries> *list, QScatter3DSeries *series)
+void DeclarativeScatter::appendSeriesFunc(QQmlListProperty<QScatter3DSeries> *list,
+ QScatter3DSeries *series)
{
reinterpret_cast<DeclarativeScatter *>(list->data)->addSeries(series);
}