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