From 8a053119642986f8163b749c3c4f6a81a664509c Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@qt.io>
Date: Thu, 8 Mar 2018 14:35:16 +0100
Subject: Remove QDoc-related typedef hacks

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>
---
 src/datavisualization/data/qsurfacedataproxy.h | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/datavisualization/data/qsurfacedataproxy.h')

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
-- 
cgit v1.2.3