@@ -19,6 +19,7 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "declarativeareaseries.h" |
|
21 | #include "declarativeareaseries.h" | |
|
22 | #include "declarativelineseries.h" | |||
22 |
|
23 | |||
23 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
24 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
24 |
|
25 |
@@ -22,9 +22,9 | |||||
22 | #define DECLARATIVEAREASERIES_H |
|
22 | #define DECLARATIVEAREASERIES_H | |
23 |
|
23 | |||
24 | #include "qareaseries.h" |
|
24 | #include "qareaseries.h" | |
25 | #include "declarativelineseries.h" |
|
|||
26 |
|
25 | |||
27 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
26 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
|
27 | class DeclarativeLineSeries; | |||
28 |
|
28 | |||
29 | class DeclarativeAreaSeries : public QAreaSeries |
|
29 | class DeclarativeAreaSeries : public QAreaSeries | |
30 | { |
|
30 | { |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "declarativebarseries.h" |
|
21 | #include "declarativebarseries.h" | |
22 |
#include |
|
22 | #include "qbarset.h" | |
23 |
#include |
|
23 | #include "qvbarmodelmapper.h" | |
24 |
#include |
|
24 | #include "qhbarmodelmapper.h" | |
25 |
|
25 | |||
26 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
26 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -23,7 +23,7 | |||||
23 |
|
23 | |||
24 | #include <QtCore/QtGlobal> |
|
24 | #include <QtCore/QtGlobal> | |
25 | #include <QDeclarativeItem> |
|
25 | #include <QDeclarativeItem> | |
26 |
#include |
|
26 | #include "qchart.h" | |
27 |
|
27 | |||
28 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
28 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
29 |
|
29 | |||
@@ -48,7 +48,6 class DeclarativeChart : public QDeclarativeItem | |||||
48 | Q_ENUMS(Animation) |
|
48 | Q_ENUMS(Animation) | |
49 | Q_ENUMS(Theme) |
|
49 | Q_ENUMS(Theme) | |
50 | Q_ENUMS(SeriesType) |
|
50 | Q_ENUMS(SeriesType) | |
51 | // Q_ENUMS(AxisType) |
|
|||
52 |
|
51 | |||
53 | public: |
|
52 | public: | |
54 | // duplicating enums from QChart to make the QML api namings 1-to-1 with the C++ api |
|
53 | // duplicating enums from QChart to make the QML api namings 1-to-1 with the C++ api |
@@ -19,8 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "declarativepieseries.h" |
|
21 | #include "declarativepieseries.h" | |
22 | #include <QVPieModelMapper> |
|
22 | #include "qpieslice.h" | |
23 |
#include |
|
23 | #include "qvpiemodelmapper.h" | |
|
24 | #include "qhpiemodelmapper.h" | |||
24 |
|
25 | |||
25 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
26 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
26 |
|
27 |
@@ -21,12 +21,12 | |||||
21 | #ifndef DECLARATIVEPIESERIES_H |
|
21 | #ifndef DECLARATIVEPIESERIES_H | |
22 | #define DECLARATIVEPIESERIES_H |
|
22 | #define DECLARATIVEPIESERIES_H | |
23 |
|
23 | |||
24 | #include "qpieslice.h" |
|
|||
25 | #include "qpieseries.h" |
|
24 | #include "qpieseries.h" | |
26 | #include <QDeclarativeItem> |
|
25 | #include <QDeclarativeItem> | |
27 | #include <QDeclarativeParserStatus> |
|
26 | #include <QDeclarativeParserStatus> | |
28 |
|
27 | |||
29 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
28 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
|
29 | class QPieSlice; | |||
30 |
|
30 | |||
31 | class DeclarativePieSeries : public QPieSeries, public QDeclarativeParserStatus |
|
31 | class DeclarativePieSeries : public QPieSeries, public QDeclarativeParserStatus | |
32 | { |
|
32 | { |
@@ -19,6 +19,7 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "declarativexypoint.h" |
|
21 | #include "declarativexypoint.h" | |
|
22 | #include <QDataStream> | |||
22 |
|
23 | |||
23 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
24 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
24 |
|
25 |
@@ -24,7 +24,6 | |||||
24 | #include "qchartglobal.h" |
|
24 | #include "qchartglobal.h" | |
25 | #include <QObject> |
|
25 | #include <QObject> | |
26 | #include <QPointF> |
|
26 | #include <QPointF> | |
27 | #include <QDataStream> |
|
|||
28 |
|
27 | |||
29 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
28 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
30 |
|
29 |
@@ -20,8 +20,9 | |||||
20 |
|
20 | |||
21 |
|
21 | |||
22 | #include "declarativexyseries.h" |
|
22 | #include "declarativexyseries.h" | |
23 | #include <QVXYModelMapper> |
|
23 | #include "declarativexypoint.h" | |
24 |
#include |
|
24 | #include "qvxymodelmapper.h" | |
|
25 | #include "qhxymodelmapper.h" | |||
25 |
|
26 | |||
26 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
27 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
27 |
|
28 |
@@ -21,7 +21,6 | |||||
21 | #ifndef DECLARATIVE_XY_SERIES_H |
|
21 | #ifndef DECLARATIVE_XY_SERIES_H | |
22 | #define DECLARATIVE_XY_SERIES_H |
|
22 | #define DECLARATIVE_XY_SERIES_H | |
23 |
|
23 | |||
24 | #include "declarativexypoint.h" |
|
|||
25 | #include <QXYSeries> |
|
24 | #include <QXYSeries> | |
26 |
|
25 | |||
27 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
26 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
General Comments 0
You need to be logged in to leave comments.
Login now