diff options
Diffstat (limited to 'src/datavisualization/engine')
10 files changed, 22 insertions, 63 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index 7947bd7d..17c1e1fb 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -42,7 +42,7 @@ class QFont; -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class CameraHelper; class Abstract3DRenderer; @@ -281,6 +281,6 @@ private: friend class Bars3DController; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp index 29262f41..95840b0a 100644 --- a/src/datavisualization/engine/abstract3drenderer.cpp +++ b/src/datavisualization/engine/abstract3drenderer.cpp @@ -27,12 +27,7 @@ #include "q3dtheme_p.h" #include "objecthelper_p.h" -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::Abstract3DRenderer - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller) : QObject(0), @@ -440,4 +435,4 @@ void Abstract3DRenderer::fixGradientAndGenerateTexture(QLinearGradient *gradient *gradientTexture = m_textureHelper->createGradientTexture(*gradient); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp index ae6a1c48..f91a74cc 100644 --- a/src/datavisualization/engine/bars3dcontroller.cpp +++ b/src/datavisualization/engine/bars3dcontroller.cpp @@ -30,17 +30,7 @@ #include <QMatrix4x4> #include <qmath.h> -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::Bars3DController - * \internal - */ - -/*! - * \class QtDataVisualization::Bars3DChangeBitField - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION Bars3DController::Bars3DController(QRect boundRect, Q3DScene *scene) : Abstract3DController(boundRect, scene), @@ -587,4 +577,4 @@ QAbstract3DAxis *Bars3DController::createDefaultAxis(QAbstract3DAxis::AxisOrient return defaultAxis; } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h index e0d0786f..54520b32 100644 --- a/src/datavisualization/engine/bars3dcontroller_p.h +++ b/src/datavisualization/engine/bars3dcontroller_p.h @@ -34,7 +34,7 @@ //#define DISPLAY_RENDER_SPEED -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Bars3DRenderer; class QBar3DSeries; @@ -136,7 +136,6 @@ private: }; - -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp index af0dc7ad..29ceabc9 100644 --- a/src/datavisualization/engine/qabstract3dgraph.cpp +++ b/src/datavisualization/engine/qabstract3dgraph.cpp @@ -29,10 +29,10 @@ #include <QPainter> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::QAbstract3DGraph + * \class QAbstract3DGraph * \inmodule QtDataVisualization * \brief The QAbstract3DGraph class provides a window and render loop for graphs. * \since Qt Data Visualization 1.0 @@ -429,10 +429,6 @@ void QAbstract3DGraph::wheelEvent(QWheelEvent *event) d_ptr->m_visualController->wheelEvent(event); } -/*! - * \class QtDataVisualization::QAbstract3DGraphPrivate - * \internal - */ QAbstract3DGraphPrivate::QAbstract3DGraphPrivate(QAbstract3DGraph *q) : QObject(0), q_ptr(q), @@ -508,4 +504,4 @@ void QAbstract3DGraphPrivate::renderNow() m_context->swapBuffers(q_ptr); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h index 5383850e..e4cec5e2 100644 --- a/src/datavisualization/engine/qabstract3dgraph.h +++ b/src/datavisualization/engine/qabstract3dgraph.h @@ -25,7 +25,7 @@ #include <QOpenGLFunctions> #include <QScreen> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QAbstract3DGraphPrivate; class Abstract3DController; @@ -125,6 +125,6 @@ private: }; Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstract3DGraph::SelectionFlags) -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp index a3df9288..c3f03fb9 100644 --- a/src/datavisualization/engine/scatter3dcontroller.cpp +++ b/src/datavisualization/engine/scatter3dcontroller.cpp @@ -27,17 +27,7 @@ #include <QMatrix4x4> #include <qmath.h> -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::Scatter3DController - * \internal - */ - -/*! - * \class QtDataVisualization::Scatter3DChangeBitField - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION Scatter3DController::Scatter3DController(QRect boundRect, Q3DScene *scene) : Abstract3DController(boundRect, scene), @@ -384,4 +374,4 @@ void Scatter3DController::adjustValueAxisRange() } } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/scatter3dcontroller_p.h b/src/datavisualization/engine/scatter3dcontroller_p.h index 6e4d391a..35f4015d 100644 --- a/src/datavisualization/engine/scatter3dcontroller_p.h +++ b/src/datavisualization/engine/scatter3dcontroller_p.h @@ -34,7 +34,7 @@ //#define DISPLAY_RENDER_SPEED -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Scatter3DRenderer; class QScatterDataProxy; @@ -99,7 +99,6 @@ private: Q_DISABLE_COPY(Scatter3DController) }; - -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp index c69ad5bd..cae97d90 100644 --- a/src/datavisualization/engine/surface3dcontroller.cpp +++ b/src/datavisualization/engine/surface3dcontroller.cpp @@ -30,17 +30,7 @@ #include <QDebug> -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::Surface3DController - * \internal - */ - -/*! - * \class QtDataVisualization::Surface3DChangeBitField - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION Surface3DController::Surface3DController(QRect rect, Q3DScene *scene) : Abstract3DController(rect, scene), @@ -531,4 +521,4 @@ void Surface3DController::adjustValueAxisRange() } } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h index 22635b73..85a32564 100644 --- a/src/datavisualization/engine/surface3dcontroller_p.h +++ b/src/datavisualization/engine/surface3dcontroller_p.h @@ -33,7 +33,7 @@ #include "datavisualizationglobal_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Surface3DRenderer; class QSurface3DSeries; @@ -109,6 +109,6 @@ private: Q_DISABLE_COPY(Surface3DController) }; -} +QT_END_NAMESPACE_DATAVISUALIZATION -#endif // SURFACE3DCONTROLLER_P_H +#endif |