##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

removed many unnecessary includes from declarative files
Marek Rosa -
r1669:c1e1d8755203
parent child
Show More
Side by Side Unified
Context file:
r1669:c1e1d8755203 Loading diff...:
Show file before | Show file after | Hide comments
@@ -19,9 +19,6
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include "declarativeareaseries.h"
21 #include "declarativeareaseries.h"
22 #include "declarativechart.h"
23 #include "qchart.h"
24 #include "qxymodelmapper.h"
25
22
26 QTCOMMERCIALCHART_BEGIN_NAMESPACE
23 QTCOMMERCIALCHART_BEGIN_NAMESPACE
27
24
Show file before | Show file after | Hide comments
@@ -21,10 +21,8
21 #ifndef DECLARATIVEAREASERIES_H
21 #ifndef DECLARATIVEAREASERIES_H
22 #define DECLARATIVEAREASERIES_H
22 #define DECLARATIVEAREASERIES_H
23
23
24 #include "qchartglobal.h"
25 #include "qareaseries.h"
24 #include "qareaseries.h"
26 #include "declarativelineseries.h"
25 #include "declarativelineseries.h"
27 #include "qabstractaxis.h"
28
26
29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
27 QTCOMMERCIALCHART_BEGIN_NAMESPACE
30
28
Show file before | Show file after | Hide comments
@@ -19,11 +19,9
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include "declarativebarseries.h"
21 #include "declarativebarseries.h"
22 #include "declarativechart.h"
23 #include <QBarSet>
22 #include <QBarSet>
24 #include <QVBarModelMapper>
23 #include <QVBarModelMapper>
25 #include <QHBarModelMapper>
24 #include <QHBarModelMapper>
26 #include <QAbstractAxis>
27
25
28 QTCOMMERCIALCHART_BEGIN_NAMESPACE
26 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29
27
Show file before | Show file after | Hide comments
@@ -21,13 +21,10
21 #ifndef DECLARATIVEBARSERIES_H
21 #ifndef DECLARATIVEBARSERIES_H
22 #define DECLARATIVEBARSERIES_H
22 #define DECLARATIVEBARSERIES_H
23
23
24 #include "qchartglobal.h"
25 #include "qabstractbarseries.h"
26 #include "qbarseries.h"
24 #include "qbarseries.h"
27 #include "qstackedbarseries.h"
25 #include "qstackedbarseries.h"
28 #include "qpercentbarseries.h"
26 #include "qpercentbarseries.h"
29 #include "qbarset.h"
27 #include "qbarset.h"
30 #include "qabstractaxis.h"
31 #include <QDeclarativeItem>
28 #include <QDeclarativeItem>
32 #include <QDeclarativeParserStatus>
29 #include <QDeclarativeParserStatus>
33
30
Show file before | Show file after | Hide comments
@@ -19,9 +19,6
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include "declarativelineseries.h"
21 #include "declarativelineseries.h"
22 #include "declarativechart.h"
23 #include "qchart.h"
24 #include "qlineseries.h"
25
22
26 QTCOMMERCIALCHART_BEGIN_NAMESPACE
23 QTCOMMERCIALCHART_BEGIN_NAMESPACE
27
24
Show file before | Show file after | Hide comments
@@ -21,11 +21,8
21 #ifndef DECLARATIVELINESERIES_H
21 #ifndef DECLARATIVELINESERIES_H
22 #define DECLARATIVELINESERIES_H
22 #define DECLARATIVELINESERIES_H
23
23
24 #include "qchartglobal.h"
25 #include "qlineseries.h"
24 #include "qlineseries.h"
26 #include "declarativexyseries.h"
25 #include "declarativexyseries.h"
27 #include "qabstractaxis.h"
28 #include <QDeclarativeParserStatus>
29 #include <QDeclarativeListProperty>
26 #include <QDeclarativeListProperty>
30 #include <QDeclarativeParserStatus>
27 #include <QDeclarativeParserStatus>
31
28
Show file before | Show file after | Hide comments
@@ -19,15 +19,12
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include "declarativepieseries.h"
21 #include "declarativepieseries.h"
22 #include "declarativechart.h"
23 #include "qchart.h"
24 #include <qdeclarativelist.h>
25 #include <QVPieModelMapper>
22 #include <QVPieModelMapper>
26 #include <QHPieModelMapper>
23 #include <QHPieModelMapper>
27
24
28 QTCOMMERCIALCHART_BEGIN_NAMESPACE
25 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29
26
30 DeclarativePieSeries::DeclarativePieSeries(QObject *parent) :
27 DeclarativePieSeries::DeclarativePieSeries(QDeclarativeItem *parent) :
31 QPieSeries(parent)
28 QPieSeries(parent)
32 {
29 {
33 connect(this, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleAdded(QList<QPieSlice*>)));
30 connect(this, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleAdded(QList<QPieSlice*>)));
Show file before | Show file after | Hide comments
@@ -21,17 +21,13
21 #ifndef DECLARATIVEPIESERIES_H
21 #ifndef DECLARATIVEPIESERIES_H
22 #define DECLARATIVEPIESERIES_H
22 #define DECLARATIVEPIESERIES_H
23
23
24 #include "qchartglobal.h"
24 #include "qpieslice.h"
25 #include <QPieSlice>
25 #include "qpieseries.h"
26 #include <QPieSeries>
26 #include <QDeclarativeItem>
27 #include <QDeclarativeParserStatus>
27 #include <QDeclarativeParserStatus>
28 #include <QDeclarativeListProperty>
29 #include <QAbstractItemModel>
30
28
31 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
32
30
33 class QChart;
34
35 class DeclarativePieSeries : public QPieSeries, public QDeclarativeParserStatus
31 class DeclarativePieSeries : public QPieSeries, public QDeclarativeParserStatus
36 {
32 {
37 Q_OBJECT
33 Q_OBJECT
@@ -40,7 +36,7 class DeclarativePieSeries : public QPieSeries, public QDeclarativeParserStatus
40 Q_CLASSINFO("DefaultProperty", "seriesChildren")
36 Q_CLASSINFO("DefaultProperty", "seriesChildren")
41
37
42 public:
38 public:
43 explicit DeclarativePieSeries(QObject *parent = 0);
39 explicit DeclarativePieSeries(QDeclarativeItem *parent = 0);
44 QDeclarativeListProperty<QObject> seriesChildren();
40 QDeclarativeListProperty<QObject> seriesChildren();
45 Q_INVOKABLE QPieSlice *at(int index);
41 Q_INVOKABLE QPieSlice *at(int index);
46 Q_INVOKABLE QPieSlice *find(QString label);
42 Q_INVOKABLE QPieSlice *find(QString label);
Show file before | Show file after | Hide comments
@@ -19,9 +19,6
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include "declarativescatterseries.h"
21 #include "declarativescatterseries.h"
22 #include "declarativechart.h"
23 #include "qchart.h"
24 #include "qscatterseries.h"
25
22
26 QTCOMMERCIALCHART_BEGIN_NAMESPACE
23 QTCOMMERCIALCHART_BEGIN_NAMESPACE
27
24
Show file before | Show file after | Hide comments
@@ -21,10 +21,8
21 #ifndef DECLARATIVESCATTERSERIES_H
21 #ifndef DECLARATIVESCATTERSERIES_H
22 #define DECLARATIVESCATTERSERIES_H
22 #define DECLARATIVESCATTERSERIES_H
23
23
24 #include "qchartglobal.h"
25 #include "qscatterseries.h"
24 #include "qscatterseries.h"
26 #include "declarativexyseries.h"
25 #include "declarativexyseries.h"
27 #include "qabstractaxis.h"
28 #include <QDeclarativeListProperty>
26 #include <QDeclarativeListProperty>
29 #include <QDeclarativeParserStatus>
27 #include <QDeclarativeParserStatus>
30
28
Show file before | Show file after | Hide comments
@@ -19,9 +19,6
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include "declarativesplineseries.h"
21 #include "declarativesplineseries.h"
22 #include "declarativechart.h"
23 #include <QChart>
24 #include "declarativexypoint.h"
25
22
26 QTCOMMERCIALCHART_BEGIN_NAMESPACE
23 QTCOMMERCIALCHART_BEGIN_NAMESPACE
27
24
Show file before | Show file after | Hide comments
@@ -21,13 +21,10
21 #ifndef DECLARATIVESPLINESERIES_H
21 #ifndef DECLARATIVESPLINESERIES_H
22 #define DECLARATIVESPLINESERIES_H
22 #define DECLARATIVESPLINESERIES_H
23
23
24 #include "qchartglobal.h"
25 #include "qsplineseries.h"
24 #include "qsplineseries.h"
26 #include "declarativexyseries.h"
25 #include "declarativexyseries.h"
27 #include "qabstractaxis.h"
28 #include <QDeclarativeParserStatus>
26 #include <QDeclarativeParserStatus>
29 #include <QDeclarativeListProperty>
27 #include <QDeclarativeListProperty>
30 #include <QDeclarativeParserStatus>
31
28
32 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
33
30
Show file before | Show file after | Hide comments
@@ -18,13 +18,10
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 //#include "DeclarativeXySeries.h"
21
22 #include "declarativexyseries.h"
22 #include "declarativexyseries.h"
23 #include "declarativechart.h"
24 #include <QXYSeries>
25 #include <QVXYModelMapper>
23 #include <QVXYModelMapper>
26 #include <QHXYModelMapper>
24 #include <QHXYModelMapper>
27 #include <QDeclarativeListProperty>
28
25
29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
26 QTCOMMERCIALCHART_BEGIN_NAMESPACE
30
27
Show file before | Show file after | Hide comments
@@ -21,9 +21,7
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 "qchartglobal.h"
25 #include "declarativexypoint.h"
24 #include "declarativexypoint.h"
26 #include <QColor>
27 #include <QXYSeries>
25 #include <QXYSeries>
28
26
29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
27 QTCOMMERCIALCHART_BEGIN_NAMESPACE
Show file before | Show file after | Hide comments
@@ -32,12 +32,13
32 #include "declarativescatterseries.h"
32 #include "declarativescatterseries.h"
33 #include "declarativebarseries.h"
33 #include "declarativebarseries.h"
34 #include "declarativepieseries.h"
34 #include "declarativepieseries.h"
35 #include <QVXYModelMapper>
35 #include "qvxymodelmapper.h"
36 #include <QHXYModelMapper>
36 #include "qhxymodelmapper.h"
37 #include <QHPieModelMapper>
37 #include "qhpiemodelmapper.h"
38 #include <QVPieModelMapper>
38 #include "qvpiemodelmapper.h"
39 #include <QHBarModelMapper>
39 #include "qhbarmodelmapper.h"
40 #include <QVBarModelMapper>
40 #include "qvbarmodelmapper.h"
41 #include <QAbstractItemModel>
41
42
42 QTCOMMERCIALCHART_BEGIN_NAMESPACE
43 QTCOMMERCIALCHART_BEGIN_NAMESPACE
43
44
@@ -88,10 +89,6 public:
88 QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
89 QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
89 qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis",
90 qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis",
90 QLatin1String("Trying to create uncreatable: AbstractAxis."));
91 QLatin1String("Trying to create uncreatable: AbstractAxis."));
91 qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
92 QLatin1String("Trying to create uncreatable: PieModelMapper."));
93 qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
94 QLatin1String("Trying to create uncreatable: XYModelMapper."));
95 }
92 }
96 };
93 };
97
94
General Comments 0
You need to be logged in to leave comments. Login now