diff options
author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-03-11 11:44:28 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-04-01 11:31:55 +0300 |
commit | 7b74d88b3f3df27d3f74e88e2ceed75b65bce2e5 (patch) | |
tree | ff045779a4a4ef4f9a94170e2140b581ae6181e5 /examples | |
parent | 7a4cd1d34c0861cde1ba49e8aca7d30810e2d812 (diff) |
Fix compilation with namespaced Qt.
Change-Id: I359bbf5c89bd23bb1b6db1aeed8a2a4aa2ca12bf
Reviewed-by: Andre Poenitz <andre.poenitz@theqtcompany.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/charts/audio/widget.h | 3 | ||||
-rw-r--r-- | examples/charts/callout/callout.h | 2 | ||||
-rw-r--r-- | examples/charts/callout/view.h | 9 | ||||
-rw-r--r-- | examples/charts/chartthemes/themewidget.h | 2 | ||||
-rw-r--r-- | examples/charts/nesteddonuts/widget.h | 2 | ||||
-rw-r--r-- | examples/charts/piechartcustomization/brushtool.h | 2 | ||||
-rw-r--r-- | examples/charts/piechartcustomization/mainwidget.h | 3 | ||||
-rw-r--r-- | examples/charts/piechartcustomization/pentool.h | 2 | ||||
-rw-r--r-- | examples/charts/qmloscilloscope/datasource.h | 2 | ||||
-rw-r--r-- | examples/charts/zoomlinechart/chart.h | 2 |
10 files changed, 26 insertions, 3 deletions
diff --git a/examples/charts/audio/widget.h b/examples/charts/audio/widget.h index c442e512..edb6c8ac 100644 --- a/examples/charts/audio/widget.h +++ b/examples/charts/audio/widget.h @@ -30,7 +30,10 @@ QT_CHARTS_END_NAMESPACE QT_CHARTS_USE_NAMESPACE class XYSeriesIODevice; + +QT_BEGIN_NAMESPACE class QAudioInput; +QT_END_NAMESPACE class Widget : public QWidget { diff --git a/examples/charts/callout/callout.h b/examples/charts/callout/callout.h index b4a0e351..10988c78 100644 --- a/examples/charts/callout/callout.h +++ b/examples/charts/callout/callout.h @@ -22,7 +22,9 @@ #include <QtWidgets/QGraphicsItem> #include <QtGui/QFont> +QT_BEGIN_NAMESPACE class QGraphicsSceneMouseEvent; +QT_END_NAMESPACE class Callout : public QGraphicsItem { diff --git a/examples/charts/callout/view.h b/examples/charts/callout/view.h index 22fd2b21..c1a6e0d7 100644 --- a/examples/charts/callout/view.h +++ b/examples/charts/callout/view.h @@ -21,14 +21,17 @@ #include <QtWidgets/QGraphicsView> #include <QtCharts/QChartGlobal> +QT_BEGIN_NAMESPACE +class QGraphicsScene; +class QMouseEvent; +class QResizeEvent; +QT_END_NAMESPACE + QT_CHARTS_BEGIN_NAMESPACE class QChart; QT_CHARTS_END_NAMESPACE -class QGraphicsScene; -class QResizeEvent; class Callout; -class QMouseEvent; QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/chartthemes/themewidget.h b/examples/charts/chartthemes/themewidget.h index 3471773e..a863a677 100644 --- a/examples/charts/chartthemes/themewidget.h +++ b/examples/charts/chartthemes/themewidget.h @@ -22,8 +22,10 @@ #include <QtWidgets/QWidget> #include <QtCharts/QChartGlobal> +QT_BEGIN_NAMESPACE class QComboBox; class QCheckBox; +QT_END_NAMESPACE QT_CHARTS_BEGIN_NAMESPACE class QChartView; diff --git a/examples/charts/nesteddonuts/widget.h b/examples/charts/nesteddonuts/widget.h index 997a3651..1f2e0563 100644 --- a/examples/charts/nesteddonuts/widget.h +++ b/examples/charts/nesteddonuts/widget.h @@ -21,7 +21,9 @@ #include <QtWidgets/QWidget> #include <QtCharts/QPieSeries> +QT_BEGIN_NAMESPACE class QTimer; +QT_END_NAMESPACE QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/piechartcustomization/brushtool.h b/examples/charts/piechartcustomization/brushtool.h index 71403f54..07a66bac 100644 --- a/examples/charts/piechartcustomization/brushtool.h +++ b/examples/charts/piechartcustomization/brushtool.h @@ -21,8 +21,10 @@ #include <QtWidgets/QWidget> #include <QtGui/QBrush> +QT_BEGIN_NAMESPACE class QPushButton; class QComboBox; +QT_END_NAMESPACE class BrushTool : public QWidget { diff --git a/examples/charts/piechartcustomization/mainwidget.h b/examples/charts/piechartcustomization/mainwidget.h index 5ca1b09e..3d68bb7c 100644 --- a/examples/charts/piechartcustomization/mainwidget.h +++ b/examples/charts/piechartcustomization/mainwidget.h @@ -21,11 +21,14 @@ #include <QtWidgets/QWidget> #include <QtCharts/QChartGlobal> +QT_BEGIN_NAMESPACE class QLineEdit; class QPushButton; class QCheckBox; class QComboBox; class QDoubleSpinBox; +QT_END_NAMESPACE + class PenTool; class BrushTool; class CustomSlice; diff --git a/examples/charts/piechartcustomization/pentool.h b/examples/charts/piechartcustomization/pentool.h index 009c58d9..62776bca 100644 --- a/examples/charts/piechartcustomization/pentool.h +++ b/examples/charts/piechartcustomization/pentool.h @@ -21,9 +21,11 @@ #include <QtWidgets/QWidget> #include <QtGui/QPen> +QT_BEGIN_NAMESPACE class QPushButton; class QDoubleSpinBox; class QComboBox; +QT_END_NAMESPACE class PenTool : public QWidget { diff --git a/examples/charts/qmloscilloscope/datasource.h b/examples/charts/qmloscilloscope/datasource.h index 60297008..16c17248 100644 --- a/examples/charts/qmloscilloscope/datasource.h +++ b/examples/charts/qmloscilloscope/datasource.h @@ -22,7 +22,9 @@ #include <QtCore/QObject> #include <QtCharts/QAbstractSeries> +QT_BEGIN_NAMESPACE class QQuickView; +QT_END_NAMESPACE QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/zoomlinechart/chart.h b/examples/charts/zoomlinechart/chart.h index b86a31e2..b2941461 100644 --- a/examples/charts/zoomlinechart/chart.h +++ b/examples/charts/zoomlinechart/chart.h @@ -21,7 +21,9 @@ #include <QtCharts/QChart> +QT_BEGIN_NAMESPACE class QGestureEvent; +QT_END_NAMESPACE QT_CHARTS_USE_NAMESPACE |