HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r793:dbc1daf2590a

Refactoring declarative xy series

Tero Ahola -

r793:dbc1daf2590a

parent child

Context file:

r793:dbc1daf2590a

qmlplugin/declarativelineseries.cpp +2 -7

             {
             }
-            void DeclarativeLineSeries::seriesComplete()
+            void DeclarativeLineSeries::componentComplete()
             {
                 DeclarativeChart *declarativeChart = qobject_cast<DeclarativeChart *>(parent());
                 }
             }
-            QObject *DeclarativeLineSeries::seriesObject()
-                return this;
             QDeclarativeListProperty<DeclarativeXyPoint> DeclarativeLineSeries::points()
             {
-                return DeclarativeXySeries::points();
+                return QDeclarativeListProperty<DeclarativeXyPoint>(this, 0, &DeclarativeXySeries::appendPoints);
             }
             void DeclarativeLineSeries::appendPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,

qmlplugin/declarativelineseries.h +2 -5

                 explicit DeclarativeLineSeries(QObject *parent = 0);
             public:
-                void seriesComplete();
+                void componentComplete();
-                QObject *seriesObject();
-            public:
                 QDeclarativeListProperty<DeclarativeXyPoint> points();
-            public slots:
+            public Q_SLOTS:
                 static void appendPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,
                                          DeclarativeXyPoint *element);
             };

qmlplugin/declarativescatterseries.cpp +2 -7

             {
             }
-            void DeclarativeScatterSeries::seriesComplete()
+            void DeclarativeScatterSeries::componentComplete()
             {
                 DeclarativeChart *declarativeChart = qobject_cast<DeclarativeChart *>(parent());
                 }
             }
-            QObject *DeclarativeScatterSeries::seriesObject()
-                return this;
             QDeclarativeListProperty<DeclarativeXyPoint> DeclarativeScatterSeries::points()
             {
-                return DeclarativeXySeries::points();
+                return QDeclarativeListProperty<DeclarativeXyPoint>(this, 0, &DeclarativeXySeries::appendPoints);
             }
             void DeclarativeScatterSeries::appendPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,

qmlplugin/declarativescatterseries.h +2 -5

                 explicit DeclarativeScatterSeries(QObject *parent = 0);
             public:
-                void seriesComplete();
+                void componentComplete();
-                QObject *seriesObject();
-            public:
                 QDeclarativeListProperty<DeclarativeXyPoint> points();
-            public slots:
+            public Q_SLOTS:
                 static void appendPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,
                                          DeclarativeXyPoint *element);
             };

qmlplugin/declarativesplineseries.cpp +2 -7

             {
             }
-            void DeclarativeSplineSeries::seriesComplete()
+            void DeclarativeSplineSeries::componentComplete()
             {
                 DeclarativeChart *declarativeChart = qobject_cast<DeclarativeChart *>(parent());
                 }
             }
-            QObject *DeclarativeSplineSeries::seriesObject()
-                return this;
             QDeclarativeListProperty<DeclarativeXyPoint> DeclarativeSplineSeries::points()
             {
-                return DeclarativeXySeries::points();
+                return QDeclarativeListProperty<DeclarativeXyPoint>(this, 0, &DeclarativeXySeries::appendPoints);
             }
             void DeclarativeSplineSeries::appendPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,

qmlplugin/declarativesplineseries.h +2 -5

                 explicit DeclarativeSplineSeries(QObject *parent = 0);
             public:
-                void seriesComplete();
+                virtual void componentComplete();
-                QObject *seriesObject();
-            public:
                 QDeclarativeListProperty<DeclarativeXyPoint> points();
-            public slots:
+            public Q_SLOTS:
                 static void appendPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,
                                          DeclarativeXyPoint *element);
             };

qmlplugin/declarativexyseries.cpp 0 -10

@@ -16,16 +16,6 void DeclarativeXySeries::classBegin()
16	{	16	{
17	}	17	}
18		18
19	void DeclarativeXySeries::componentComplete()
20	{
21	seriesComplete();
22	}
23
24	QDeclarativeListProperty<DeclarativeXyPoint> DeclarativeXySeries::points()
25	{
26	return QDeclarativeListProperty<DeclarativeXyPoint>(seriesObject(), 0, &DeclarativeXySeries::appendPoints);
27	}
28
29	void DeclarativeXySeries::appendPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,	19	void DeclarativeXySeries::appendPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,
30	DeclarativeXyPoint *element)	20	DeclarativeXyPoint *element)
31	{	21	{

qmlplugin/declarativexyseries.h +3 -7

                 ~DeclarativeXySeries();
             public: // from QDeclarativeParserStatus
-                void classBegin();
+                virtual void classBegin();
-                void componentComplete();
+                virtual void componentComplete() = 0;
             public:
-                QDeclarativeListProperty<DeclarativeXyPoint> points();
+                virtual QDeclarativeListProperty<DeclarativeXyPoint> points() = 0;
             public Q_SLOTS:
                 static void appendPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,
                                          DeclarativeXyPoint *element);
-            protected:
-                virtual void seriesComplete() = 0;
-                virtual QObject *seriesObject() = 0;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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