diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-16 13:33:57 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-16 13:49:43 +0200 |
| commit | 8674307d6bafabfcaedfe175b883313f0e7d88b9 (patch) | |
| tree | 4428b5c4d3dc305d0290b9929a7f703b11fe73f6 /src/datavisualization/engine/q3dcamera.cpp | |
| parent | d2c37e276d17fb91163188878988894df993e69b (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/engine/q3dcamera.cpp')
| -rw-r--r-- | src/datavisualization/engine/q3dcamera.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp index a045d7bb..8a02d3ae 100644 --- a/src/datavisualization/engine/q3dcamera.cpp +++ b/src/datavisualization/engine/q3dcamera.cpp @@ -26,10 +26,10 @@ #include <qmath.h> #include <QVector3D> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::Q3DCamera + * \class Q3DCamera * \inmodule QtDataVisualization * \brief Representation of a camera in 3D space. * \since Qt Data Visualization 1.0 @@ -81,7 +81,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QtDataVisualization::Q3DCamera + * \instantiates Q3DCamera * \brief Representation of a camera in 3D space. * * Camera3D represents a basic orbit around centerpoint 3D camera that is used when rendering the @@ -760,10 +760,6 @@ void Q3DCamera::setCameraPosition(float horizontal, float vertical, float zoom) setYRotation(vertical); } -/*! - * \class QtDataVisualization::Q3DCameraPrivate - * \internal - */ Q3DCameraPrivate::Q3DCameraPrivate(Q3DCamera *q) : q_ptr(q), m_isViewMatrixUpdateActive(true), @@ -871,5 +867,4 @@ void Q3DCameraPrivate::updateViewMatrix(float zoomAdjustment) q_ptr->setViewMatrix(viewMatrix); } - -} +QT_END_NAMESPACE_DATAVISUALIZATION |