diff options
Diffstat (limited to 'src/datavisualization/input')
9 files changed, 18 insertions, 19 deletions
diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp index 5d730c47..80e02d5e 100644 --- a/src/datavisualization/input/q3dinputhandler.cpp +++ b/src/datavisualization/input/q3dinputhandler.cpp @@ -21,7 +21,7 @@ #include "q3dcamera_p.h" #include "q3dlight.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { const int minZoomLevel = 10; const int halfSizeZoomLevel = 50; @@ -190,4 +190,4 @@ void Q3DInputHandler::wheelEvent(QWheelEvent *event) scene()->activeCamera()->setZoomLevel(zoomLevel); } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h index a7fa0573..cca2f983 100644 --- a/src/datavisualization/input/q3dinputhandler.h +++ b/src/datavisualization/input/q3dinputhandler.h @@ -21,7 +21,7 @@ #include <QtDataVisualization/qabstract3dinputhandler.h> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class Q3DInputHandler; // Workaround for qdoc bug, removing this will cause qdoc compiler to not find the class. @@ -43,6 +43,6 @@ private: Q_DISABLE_COPY(Q3DInputHandler) }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif // QDEFAULT3DINPUTHANDLER_H diff --git a/src/datavisualization/input/q3dinputhandler_p.h b/src/datavisualization/input/q3dinputhandler_p.h index af8bef5f..8724f5bf 100644 --- a/src/datavisualization/input/q3dinputhandler_p.h +++ b/src/datavisualization/input/q3dinputhandler_p.h @@ -31,7 +31,7 @@ #include "datavisualizationglobal_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class Q3DInputHandler; @@ -46,6 +46,6 @@ public: }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif // Q3DINPUTHANDLER_P_H diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp index 0aa8372c..9e599535 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.cpp +++ b/src/datavisualization/input/qabstract3dinputhandler.cpp @@ -17,7 +17,7 @@ ****************************************************************************/ #include "qabstract3dinputhandler_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { /*! * \class QAbstract3DInputHandler @@ -243,4 +243,4 @@ QAbstract3DInputHandlerPrivate::~QAbstract3DInputHandlerPrivate() } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index 313abef3..2ad1514b 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -19,11 +19,10 @@ #ifndef QABSTRACT3DINPUTHANDLER_H #define QABSTRACT3DINPUTHANDLER_H -#include <QtDataVisualization/qdatavisualizationenums.h> #include <QtDataVisualization/q3dscene.h> #include <QMouseEvent> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class QAbstract3DInputHandlerPrivate; @@ -88,6 +87,6 @@ private: friend class QTouch3DInputHandlerPrivate; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif // QABSTRACT3DINPUTHANDLER_H diff --git a/src/datavisualization/input/qabstract3dinputhandler_p.h b/src/datavisualization/input/qabstract3dinputhandler_p.h index 205abf66..a44cc40d 100644 --- a/src/datavisualization/input/qabstract3dinputhandler_p.h +++ b/src/datavisualization/input/qabstract3dinputhandler_p.h @@ -33,7 +33,7 @@ #include "qabstract3dinputhandler.h" #include <QRect> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class QAbstract3DInputHandler; class Q3DScene; @@ -65,6 +65,6 @@ private: friend class Abstract3DController; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif // QABSTRACT3DINPUTHANDLER_P_H diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp index 42769562..0dd5b469 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.cpp +++ b/src/datavisualization/input/qtouch3dinputhandler.cpp @@ -21,7 +21,7 @@ #include <QTimer> #include <qmath.h> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { const float maxTapAndHoldJitter = 20.0f; const int maxPinchJitter = 10; @@ -209,4 +209,4 @@ void QTouch3DInputHandlerPrivate::handleRotation(const QPointF &position) } } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualization/input/qtouch3dinputhandler.h b/src/datavisualization/input/qtouch3dinputhandler.h index 1c366926..0f3cd255 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.h +++ b/src/datavisualization/input/qtouch3dinputhandler.h @@ -21,7 +21,7 @@ #include <QtDataVisualization/q3dinputhandler.h> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class QTouch3DInputHandlerPrivate; @@ -42,6 +42,6 @@ private: QScopedPointer<QTouch3DInputHandlerPrivate> d_ptr; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif // QTOUCH3DINPUTHANDLER_H diff --git a/src/datavisualization/input/qtouch3dinputhandler_p.h b/src/datavisualization/input/qtouch3dinputhandler_p.h index 11163140..e8d1793b 100644 --- a/src/datavisualization/input/qtouch3dinputhandler_p.h +++ b/src/datavisualization/input/qtouch3dinputhandler_p.h @@ -21,7 +21,7 @@ #include "qtouch3dinputhandler.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class QAbstract3DInputHandler; @@ -45,6 +45,6 @@ public: QPointF m_touchHoldPos; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif // QTOUCH3DINPUTHANDLER_H |