diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-27 13:10:44 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-27 13:13:58 +0200 |
| commit | b368e57e59351736f9ad06834a743a7c1b49d368 (patch) | |
| tree | 3b7d42569905d8cde0ca7571cd664428354a50dd /src/datavisualization/data/qsurfacedataproxy.h | |
| parent | eb3d0514ca886db33776522ea00f27b69bc86ad1 (diff) | |
| parent | 05d06fbc61f07e400b519a9b020c2473398627c1 (diff) | |
Merge branch 'develop'v1.0.0-beta1
Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4
Diffstat (limited to 'src/datavisualization/data/qsurfacedataproxy.h')
| -rw-r--r-- | src/datavisualization/data/qsurfacedataproxy.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h index 04c6dbf7..0933faf6 100644 --- a/src/datavisualization/data/qsurfacedataproxy.h +++ b/src/datavisualization/data/qsurfacedataproxy.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -22,10 +22,13 @@ #include <QtDataVisualization/qabstractdataproxy.h> #include <QtDataVisualization/qsurfacedataitem.h> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE - +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; @@ -86,6 +89,6 @@ private: friend class Surface3DController; }; -QT_DATAVISUALIZATION_END_NAMESPACE +QT_END_NAMESPACE_DATAVISUALIZATION -#endif // QSURFACEDATAPROXY_H +#endif |