summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2018-03-08 14:35:16 +0100
committerTopi Reiniƶ <topi.reinio@qt.io>2018-03-08 14:10:34 +0000
commit8a053119642986f8163b749c3c4f6a81a664509c (patch)
tree8b8944366ea8b0272951d7b4025edf48c58b523c
parent93a4741490aed8e123ebf2b566d99e6d7c35a8d8 (diff)
Remove QDoc-related typedef hacksv5.11.0-beta2
These are now longer required on Qt 5.11 where QDoc uses Clang to parse the documentation. Change-Id: I8a3bd7d935acf4c93fb8a6179cb8d3327697759a Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--src/datavisualization/data/qbardataproxy.cpp4
-rw-r--r--src/datavisualization/data/qbardataproxy.h9
-rw-r--r--src/datavisualization/data/qscatterdataproxy.cpp2
-rw-r--r--src/datavisualization/data/qscatterdataproxy.h7
-rw-r--r--src/datavisualization/data/qsurfacedataproxy.cpp4
-rw-r--r--src/datavisualization/data/qsurfacedataproxy.h9
6 files changed, 13 insertions, 22 deletions
diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp
index 0493543b..14f36253 100644
--- a/src/datavisualization/data/qbardataproxy.cpp
+++ b/src/datavisualization/data/qbardataproxy.cpp
@@ -60,14 +60,14 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
*/
/*!
- * \typedef QtDataVisualization::QBarDataRow
+ * \typedef QBarDataRow
* \relates QBarDataProxy
*
* A vector of \l {QBarDataItem} objects.
*/
/*!
- * \typedef QtDataVisualization::QBarDataArray
+ * \typedef QBarDataArray
* \relates QBarDataProxy
*
* A list of pointers to \l {QBarDataRow} objects.
diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h
index a9311569..2ea9947b 100644
--- a/src/datavisualization/data/qbardataproxy.h
+++ b/src/datavisualization/data/qbardataproxy.h
@@ -35,17 +35,14 @@
#include <QtCore/QVector>
#include <QtCore/QStringList>
-namespace QtDataVisualization {
-// typedefs introduced this way because QDoc doesn't understand namespace macros
-typedef QVector<QBarDataItem> QBarDataRow;
-typedef QList<QBarDataRow *> QBarDataArray;
-}
-
QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QBarDataProxyPrivate;
class QBar3DSeries;
+typedef QVector<QBarDataItem> QBarDataRow;
+typedef QList<QBarDataRow *> QBarDataArray;
+
class QT_DATAVISUALIZATION_EXPORT QBarDataProxy : public QAbstractDataProxy
{
Q_OBJECT
diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp
index 3d81a641..2d0e203a 100644
--- a/src/datavisualization/data/qscatterdataproxy.cpp
+++ b/src/datavisualization/data/qscatterdataproxy.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
*/
/*!
- * \typedef QtDataVisualization::QScatterDataArray
+ * \typedef QScatterDataArray
* \relates QScatterDataProxy
*
* A vector of \l {QScatterDataItem} objects.
diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h
index fd229d1c..ea5a2978 100644
--- a/src/datavisualization/data/qscatterdataproxy.h
+++ b/src/datavisualization/data/qscatterdataproxy.h
@@ -33,16 +33,13 @@
#include <QtDataVisualization/qabstractdataproxy.h>
#include <QtDataVisualization/qscatterdataitem.h>
-namespace QtDataVisualization {
-// typedef introduced this way because QDoc doesn't understand namespace macros
-typedef QVector<QScatterDataItem> QScatterDataArray;
-}
-
QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QScatterDataProxyPrivate;
class QScatter3DSeries;
+typedef QVector<QScatterDataItem> QScatterDataArray;
+
class QT_DATAVISUALIZATION_EXPORT QScatterDataProxy : public QAbstractDataProxy
{
Q_OBJECT
diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp
index a5339e9d..1c61084c 100644
--- a/src/datavisualization/data/qsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qsurfacedataproxy.cpp
@@ -76,14 +76,14 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
*/
/*!
- * \typedef QtDataVisualization::QSurfaceDataRow
+ * \typedef QSurfaceDataRow
* \relates QSurfaceDataProxy
*
* A vector of \l {QSurfaceDataItem} objects.
*/
/*!
- * \typedef QtDataVisualization::QSurfaceDataArray
+ * \typedef QSurfaceDataArray
* \relates QSurfaceDataProxy
*
* A list of pointers to \l {QSurfaceDataRow} objects.
diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h
index 427da55d..ed16af88 100644
--- a/src/datavisualization/data/qsurfacedataproxy.h
+++ b/src/datavisualization/data/qsurfacedataproxy.h
@@ -33,17 +33,14 @@
#include <QtDataVisualization/qabstractdataproxy.h>
#include <QtDataVisualization/qsurfacedataitem.h>
-namespace QtDataVisualization {
-// typedefs introduced this way because QDoc doesn't understand namespace macros
-typedef QVector<QSurfaceDataItem> QSurfaceDataRow;
-typedef QList<QSurfaceDataRow *> QSurfaceDataArray;
-}
-
QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QSurfaceDataProxyPrivate;
class QSurface3DSeries;
+typedef QVector<QSurfaceDataItem> QSurfaceDataRow;
+typedef QList<QSurfaceDataRow *> QSurfaceDataArray;
+
class QT_DATAVISUALIZATION_EXPORT QSurfaceDataProxy : public QAbstractDataProxy
{
Q_OBJECT