summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-01-16 13:33:57 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-01-16 13:49:43 +0200
commit8674307d6bafabfcaedfe175b883313f0e7d88b9 (patch)
tree4428b5c4d3dc305d0290b9929a7f703b11fe73f6 /src/datavisualization/data/qheightmapsurfacedataproxy.cpp
parentd2c37e276d17fb91163188878988894df993e69b (diff)
Reintroduced namespace macros
Task-number: QTRD-2594 Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/data/qheightmapsurfacedataproxy.cpp')
-rw-r--r--src/datavisualization/data/qheightmapsurfacedataproxy.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
index 21f7ae8e..feb6cded 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
@@ -18,14 +18,14 @@
#include "qheightmapsurfacedataproxy_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
// Default ranges correspond value axis defaults
const float defaultMinValue = 0.0f;
const float defaultMaxValue = 10.0f;
/*!
- * \class QtDataVisualization::QHeightMapSurfaceDataProxy
+ * \class QHeightMapSurfaceDataProxy
* \inmodule QtDataVisualization
* \brief Base proxy class for Q3DSurface.
* \since Qt Data Visualization 1.0
@@ -46,7 +46,7 @@ const float defaultMaxValue = 10.0f;
* \inqmlmodule QtDataVisualization
* \since QtDataVisualization 1.0
* \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::QHeightMapSurfaceDataProxy
+ * \instantiates QHeightMapSurfaceDataProxy
* \inherits SurfaceDataProxy
* \brief Base proxy type for Surface3D.
*
@@ -300,10 +300,6 @@ const QHeightMapSurfaceDataProxyPrivate *QHeightMapSurfaceDataProxy::dptrc() con
// QHeightMapSurfaceDataProxyPrivate
//
-/*!
- * \class QtDataVisualization::QHeightMapSurfaceDataProxyPrivate
- * \internal
- */
QHeightMapSurfaceDataProxyPrivate::QHeightMapSurfaceDataProxyPrivate(QHeightMapSurfaceDataProxy *q)
: QSurfaceDataProxyPrivate(q),
m_minXValue(defaultMinValue),
@@ -552,4 +548,4 @@ void QHeightMapSurfaceDataProxyPrivate::handlePendingResolve()
emit qptr()->heightMapChanged(m_heightMap);
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION