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

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

Fix compilation with namespaced Qt....
Christian Kandeler -
r2774:7b74d88b3f3d
parent child
Show More
Side by Side Unified
Context file:
r2774:7b74d88b3f3d Loading diff...:
Show file before | Show file after | Hide comments
@@ -30,7 +30,10 QT_CHARTS_END_NAMESPACE
30 30 QT_CHARTS_USE_NAMESPACE
31 31
32 32 class XYSeriesIODevice;
33
34 QT_BEGIN_NAMESPACE
33 35 class QAudioInput;
36 QT_END_NAMESPACE
34 37
35 38 class Widget : public QWidget
36 39 {
Show file before | Show file after | Hide comments
@@ -22,7 +22,9
22 22 #include <QtWidgets/QGraphicsItem>
23 23 #include <QtGui/QFont>
24 24
25 QT_BEGIN_NAMESPACE
25 26 class QGraphicsSceneMouseEvent;
27 QT_END_NAMESPACE
26 28
27 29 class Callout : public QGraphicsItem
28 30 {
Show file before | Show file after | Hide comments
@@ -21,14 +21,17
21 21 #include <QtWidgets/QGraphicsView>
22 22 #include <QtCharts/QChartGlobal>
23 23
24 QT_BEGIN_NAMESPACE
25 class QGraphicsScene;
26 class QMouseEvent;
27 class QResizeEvent;
28 QT_END_NAMESPACE
29
24 30 QT_CHARTS_BEGIN_NAMESPACE
25 31 class QChart;
26 32 QT_CHARTS_END_NAMESPACE
27 33
28 class QGraphicsScene;
29 class QResizeEvent;
30 34 class Callout;
31 class QMouseEvent;
32 35
33 36 QT_CHARTS_USE_NAMESPACE
34 37
Show file before | Show file after | Hide comments
@@ -22,8 +22,10
22 22 #include <QtWidgets/QWidget>
23 23 #include <QtCharts/QChartGlobal>
24 24
25 QT_BEGIN_NAMESPACE
25 26 class QComboBox;
26 27 class QCheckBox;
28 QT_END_NAMESPACE
27 29
28 30 QT_CHARTS_BEGIN_NAMESPACE
29 31 class QChartView;
Show file before | Show file after | Hide comments
@@ -21,7 +21,9
21 21 #include <QtWidgets/QWidget>
22 22 #include <QtCharts/QPieSeries>
23 23
24 QT_BEGIN_NAMESPACE
24 25 class QTimer;
26 QT_END_NAMESPACE
25 27
26 28 QT_CHARTS_USE_NAMESPACE
27 29
Show file before | Show file after | Hide comments
@@ -21,8 +21,10
21 21 #include <QtWidgets/QWidget>
22 22 #include <QtGui/QBrush>
23 23
24 QT_BEGIN_NAMESPACE
24 25 class QPushButton;
25 26 class QComboBox;
27 QT_END_NAMESPACE
26 28
27 29 class BrushTool : public QWidget
28 30 {
Show file before | Show file after | Hide comments
@@ -21,11 +21,14
21 21 #include <QtWidgets/QWidget>
22 22 #include <QtCharts/QChartGlobal>
23 23
24 QT_BEGIN_NAMESPACE
24 25 class QLineEdit;
25 26 class QPushButton;
26 27 class QCheckBox;
27 28 class QComboBox;
28 29 class QDoubleSpinBox;
30 QT_END_NAMESPACE
31
29 32 class PenTool;
30 33 class BrushTool;
31 34 class CustomSlice;
Show file before | Show file after | Hide comments
@@ -21,9 +21,11
21 21 #include <QtWidgets/QWidget>
22 22 #include <QtGui/QPen>
23 23
24 QT_BEGIN_NAMESPACE
24 25 class QPushButton;
25 26 class QDoubleSpinBox;
26 27 class QComboBox;
28 QT_END_NAMESPACE
27 29
28 30 class PenTool : public QWidget
29 31 {
Show file before | Show file after | Hide comments
@@ -22,7 +22,9
22 22 #include <QtCore/QObject>
23 23 #include <QtCharts/QAbstractSeries>
24 24
25 QT_BEGIN_NAMESPACE
25 26 class QQuickView;
27 QT_END_NAMESPACE
26 28
27 29 QT_CHARTS_USE_NAMESPACE
28 30
Show file before | Show file after | Hide comments
@@ -21,7 +21,9
21 21
22 22 #include <QtCharts/QChart>
23 23
24 QT_BEGIN_NAMESPACE
24 25 class QGestureEvent;
26 QT_END_NAMESPACE
25 27
26 28 QT_CHARTS_USE_NAMESPACE
27 29
Show file before | Show file after | Hide comments
@@ -21,7 +21,9
21 21
22 22 #include <QtCharts/QAbstractAxis>
23 23
24 QT_BEGIN_NAMESPACE
24 25 class QDateTime;
26 QT_END_NAMESPACE
25 27
26 28 QT_CHARTS_BEGIN_NAMESPACE
27 29
Show file before | Show file after | Hide comments
@@ -21,7 +21,9
21 21
22 22 #include <QtCharts/QAbstractAxis>
23 23
24 QT_BEGIN_NAMESPACE
24 25 class QDateTime;
26 QT_END_NAMESPACE
25 27
26 28 QT_CHARTS_BEGIN_NAMESPACE
27 29
Show file before | Show file after | Hide comments
@@ -33,7 +33,9
33 33 #include <QtCharts/QChart>
34 34 #include <QtCore/QDebug>
35 35
36 QT_BEGIN_NAMESPACE
36 37 class QGraphicsItem;
38 QT_END_NAMESPACE
37 39
38 40 QT_CHARTS_BEGIN_NAMESPACE
39 41
Show file before | Show file after | Hide comments
@@ -22,7 +22,9
22 22 #include <QtCharts/QChartGlobal>
23 23 #include <QtCore/QObject>
24 24
25 QT_BEGIN_NAMESPACE
25 26 class QAbstractItemModel;
27 QT_END_NAMESPACE
26 28
27 29 QT_CHARTS_BEGIN_NAMESPACE
28 30
Show file before | Show file after | Hide comments
@@ -31,7 +31,9
31 31 #include <QtCore/QObject>
32 32 #include <QtCharts/QBarModelMapper>
33 33
34 QT_BEGIN_NAMESPACE
34 35 class QModelIndex;
36 QT_END_NAMESPACE
35 37
36 38 QT_CHARTS_BEGIN_NAMESPACE
37 39
Show file before | Show file after | Hide comments
@@ -22,7 +22,9
22 22 #include <QtCharts/QChartGlobal>
23 23 #include <QtCore/QObject>
24 24
25 QT_BEGIN_NAMESPACE
25 26 class QAbstractItemModel;
27 QT_END_NAMESPACE
26 28
27 29 QT_CHARTS_BEGIN_NAMESPACE
28 30
Show file before | Show file after | Hide comments
@@ -31,7 +31,9
31 31 #include <QtCore/QObject>
32 32 #include <QtCharts/QBoxPlotModelMapper>
33 33
34 QT_BEGIN_NAMESPACE
34 35 class QModelIndex;
36 QT_END_NAMESPACE
35 37
36 38 QT_CHARTS_BEGIN_NAMESPACE
37 39
Show file before | Show file after | Hide comments
@@ -31,7 +31,10
31 31 #include <QtCharts/QChartGlobal>
32 32 #include <QtWidgets/QGraphicsRectItem>
33 33
34 QT_BEGIN_NAMESPACE
34 35 class QGraphicsDropShadowEffect;
36 QT_END_NAMESPACE
37
35 38 QT_CHARTS_BEGIN_NAMESPACE
36 39
37 40 class ChartBackground: public QGraphicsRectItem
Show file before | Show file after | Hide comments
@@ -33,7 +33,10
33 33 #include <private/piesliceitem_p.h>
34 34 #include <QtCore/QPointer>
35 35
36 QT_BEGIN_NAMESPACE
36 37 class QGraphicsItem;
38 QT_END_NAMESPACE
39
37 40 QT_CHARTS_BEGIN_NAMESPACE
38 41 class QPieSlice;
39 42 class ChartPresenter;
Show file before | Show file after | Hide comments
@@ -22,7 +22,9
22 22 #include <QtCharts/QChartGlobal>
23 23 #include <QtCore/QObject>
24 24
25 QT_BEGIN_NAMESPACE
25 26 class QAbstractItemModel;
27 QT_END_NAMESPACE
26 28
27 29 QT_CHARTS_BEGIN_NAMESPACE
28 30
Show file before | Show file after | Hide comments
@@ -31,7 +31,9
31 31 #include <QtCore/QObject>
32 32 #include <QtCharts/QPieModelMapper>
33 33
34 QT_BEGIN_NAMESPACE
34 35 class QModelIndex;
36 QT_END_NAMESPACE
35 37
36 38 QT_CHARTS_BEGIN_NAMESPACE
37 39
Show file before | Show file after | Hide comments
@@ -32,7 +32,9
32 32 #include <QtCharts/QChart>
33 33 #include <private/abstractdomain_p.h>
34 34
35 QT_BEGIN_NAMESPACE
35 36 class QGraphicsItem;
37 QT_END_NAMESPACE
36 38
37 39 QT_CHARTS_BEGIN_NAMESPACE
38 40
Show file before | Show file after | Hide comments
@@ -24,7 +24,9
24 24 #include <QtWidgets/QGraphicsWidget>
25 25 #include <QtCore/QMargins>
26 26
27 QT_BEGIN_NAMESPACE
27 28 class QGraphicsSceneResizeEvent;
29 QT_END_NAMESPACE
28 30
29 31 QT_CHARTS_BEGIN_NAMESPACE
30 32
Show file before | Show file after | Hide comments
@@ -24,8 +24,10
24 24 #include <QtCharts/QChart>
25 25 #include <QtWidgets/QGraphicsView>
26 26
27 QT_BEGIN_NAMESPACE
27 28 class QGraphicsScene;
28 29 class QRubberBand;
30 QT_END_NAMESPACE
29 31
30 32 QT_CHARTS_BEGIN_NAMESPACE
31 33
Show file before | Show file after | Hide comments
@@ -30,12 +30,14
30 30
31 31 #include <QtCharts/QChartView>
32 32
33 QT_BEGIN_NAMESPACE
33 34 class QGraphicsScene;
34 class ChartPresenter;
35 QT_END_NAMESPACE
35 36
36 37 QT_CHARTS_BEGIN_NAMESPACE
37 38
38 39 class QChart;
40 class ChartPresenter;
39 41 class QChartView;
40 42
41 43 class QChartViewPrivate
Show file before | Show file after | Hide comments
@@ -34,7 +34,9
34 34 #include <QtCore/QTime>
35 35 #include <QtCore/QPointF>
36 36
37 QT_BEGIN_NAMESPACE
37 38 class QGraphicsSceneMouseEvent;
39 QT_END_NAMESPACE
38 40
39 41 QT_CHARTS_BEGIN_NAMESPACE
40 42
Show file before | Show file after | Hide comments
@@ -22,7 +22,9
22 22 #include <QtCharts/QChartGlobal>
23 23 #include <QtCore/QObject>
24 24
25 QT_BEGIN_NAMESPACE
25 26 class QAbstractItemModel;
27 QT_END_NAMESPACE
26 28
27 29 QT_CHARTS_BEGIN_NAMESPACE
28 30
Show file before | Show file after | Hide comments
@@ -31,9 +31,11
31 31 #include <QtCharts/QXYModelMapper>
32 32 #include <QtCore/QObject>
33 33
34 QT_BEGIN_NAMESPACE
34 35 class QModelIndex;
35 36 class QAbstractItemModel;
36 37 class QPointF;
38 QT_END_NAMESPACE
37 39
38 40 QT_CHARTS_BEGIN_NAMESPACE
39 41
Show file before | Show file after | Hide comments
@@ -24,7 +24,9
24 24 #include <QtGui/QPen>
25 25 #include <QtGui/QBrush>
26 26
27 QT_BEGIN_NAMESPACE
27 28 class QModelIndex;
29 QT_END_NAMESPACE
28 30
29 31 QT_CHARTS_BEGIN_NAMESPACE
30 32
Show file before | Show file after | Hide comments
@@ -23,6 +23,7
23 23 #include <QtTest/QtTest>
24 24 #include <QtWidgets/QPushButton>
25 25
26 QT_BEGIN_NAMESPACE
26 27 namespace QTest
27 28 {
28 29 // This was deprecated in Qt5. This is a small hack for the sake of compatibility.
@@ -31,6 +32,7 namespace QTest
31 32 return QTest::qWaitForWindowExposed(window);
32 33 }
33 34 }
35 QT_END_NAMESPACE
34 36
35 37 #define TRY_COMPARE(actual, expected) { \
36 38 do { \
Show file before | Show file after | Hide comments
@@ -29,7 +29,10
29 29 #include <QtWidgets/QCheckBox>
30 30 #include <QtWidgets/QDoubleSpinBox>
31 31
32 QT_BEGIN_NAMESPACE
32 33 class QGridLayout;
34 QT_END_NAMESPACE
35
33 36 class CustomTableModel;
34 37 class PenTool;
35 38
Show file before | Show file after | Hide comments
@@ -21,9 +21,11
21 21 #include <QtWidgets/QWidget>
22 22 #include <QtGui/QPen>
23 23
24 QT_BEGIN_NAMESPACE
24 25 class QPushButton;
25 26 class QDoubleSpinBox;
26 27 class QComboBox;
28 QT_END_NAMESPACE
27 29
28 30 class PenTool : public QWidget
29 31 {
Show file before | Show file after | Hide comments
@@ -23,7 +23,10
23 23 #include <QtWidgets/QGraphicsWidget>
24 24 #include <QtCharts/QChartGlobal>
25 25
26 QT_BEGIN_NAMESPACE
26 27 class QGraphicsGridLayout;
28 QT_END_NAMESPACE
29
27 30 class Chart;
28 31
29 32 QT_CHARTS_BEGIN_NAMESPACE
Show file before | Show file after | Hide comments
@@ -20,8 +20,10
20 20 #define VIEW_H
21 21 #include <QtWidgets/QGraphicsView>
22 22
23 QT_BEGIN_NAMESPACE
23 24 class QGraphicsScene;
24 25 class QResizeEvent;
26 QT_END_NAMESPACE
25 27
26 28 class View: public QGraphicsView
27 29 {
Show file before | Show file after | Hide comments
@@ -23,15 +23,17
23 23 #include <QtCore/QHash>
24 24 #include <QtWidgets/QComboBox>
25 25
26 QT_BEGIN_NAMESPACE
26 27 class QCheckBox;
28 class QGraphicsLinearLayout;
27 29 class QGraphicsRectItem;
28 30 class QGraphicsScene;
29 31 class QGraphicsWidget;
32 QT_END_NAMESPACE
33
30 34 class View;
31 class QGraphicsLinearLayout;
32 35 class Chart;
33 36 class Grid;
34 class QPushButton;
35 37
36 38 QT_CHARTS_BEGIN_NAMESPACE
37 39 class QChart;
Show file before | Show file after | Hide comments
@@ -21,8 +21,10
21 21
22 22 #include <QtWidgets/QDialog>
23 23
24 QT_BEGIN_NAMESPACE
24 25 class QGroupBox;
25 26 class QCheckBox;
27 QT_END_NAMESPACE
26 28
27 29 class DataSerieDialog : public QDialog
28 30 {
Show file before | Show file after | Hide comments
@@ -24,9 +24,11
24 24 #include <QtCharts/QChartView>
25 25 #include <QtWidgets/QWidget>
26 26
27 QT_BEGIN_NAMESPACE
27 28 class QSpinBox;
28 29 class QCheckBox;
29 30 class QGridLayout;
31 QT_END_NAMESPACE
30 32
31 33 QT_CHARTS_USE_NAMESPACE
32 34
Show file before | Show file after | Hide comments
@@ -28,14 +28,17
28 28 #include <QtCharts/QSplineSeries>
29 29 #include <QtCharts/QAreaSeries>
30 30
31 QT_BEGIN_NAMESPACE
32 class QBrush;
33 class QPen;
34
31 35 namespace Ui {
32 36 class MainWindow;
33 37 }
38 QT_END_NAMESPACE
34 39
35 QT_CHARTS_USE_NAMESPACE
36 40
37 class QBrush;
38 class QPen;
41 QT_CHARTS_USE_NAMESPACE
39 42
40 43 class MainWindow : public QMainWindow
41 44 {
General Comments 0
You need to be logged in to leave comments. Login now