diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-17 08:20:49 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-17 08:22:15 +0200 |
| commit | 01b9609c35227a2398ed2a39ebb1da2265bf3396 (patch) | |
| tree | 7af408b0657e86c2cee140c34be7e051a06a2b19 /src/datavisualization/data/qsurface3dseries.cpp | |
| parent | 2c9963be44c00e7299401e248bc94ef191e0af68 (diff) | |
Reintroduced namespace macros, part 2
Added changes lost in merge
Task-number: QTRD-2594
Change-Id: Ib68b5d9294ad65f69443c475ba771dcfd09926bb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/data/qsurface3dseries.cpp')
| -rw-r--r-- | src/datavisualization/data/qsurface3dseries.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/datavisualization/data/qsurface3dseries.cpp b/src/datavisualization/data/qsurface3dseries.cpp index ec146e22..af53bab4 100644 --- a/src/datavisualization/data/qsurface3dseries.cpp +++ b/src/datavisualization/data/qsurface3dseries.cpp @@ -19,10 +19,10 @@ #include "qsurface3dseries_p.h" #include "surface3dcontroller_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::QSurface3DSeries + * \class QSurface3DSeries * \inmodule QtDataVisualization * \brief Base series class for Q3DSurface. * \since Qt Data Visualization 1.0 @@ -68,7 +68,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QtDataVisualization::QSurface3DSeries + * \instantiates QSurface3DSeries * \inherits Abstract3DSeries * \brief Base series type for Surfaces3D. * @@ -310,10 +310,6 @@ const QSurface3DSeriesPrivate *QSurface3DSeries::dptrc() const // QSurface3DSeriesPrivate -/*! - * \class QtDataVisualization::QSurface3DSeriesPrivate - * \internal - */ QSurface3DSeriesPrivate::QSurface3DSeriesPrivate(QSurface3DSeries *q) : QAbstract3DSeriesPrivate(q, QAbstract3DSeries::SeriesTypeSurface), m_selectedPoint(Surface3DController::invalidSelectionPosition()), @@ -392,4 +388,4 @@ void QSurface3DSeriesPrivate::setDrawMode(QSurface3DSeries::DrawFlags mode) m_controller->markSeriesVisualsDirty(); } -} +QT_END_NAMESPACE_DATAVISUALIZATION |