summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/datavisualization/input')
-rw-r--r--src/datavisualization/input/q3dinputhandler.cpp4
-rw-r--r--src/datavisualization/input/q3dinputhandler.h4
-rw-r--r--src/datavisualization/input/q3dinputhandler_p.h4
-rw-r--r--src/datavisualization/input/qabstract3dinputhandler.cpp4
-rw-r--r--src/datavisualization/input/qabstract3dinputhandler.h4
-rw-r--r--src/datavisualization/input/qabstract3dinputhandler_p.h4
-rw-r--r--src/datavisualization/input/qtouch3dinputhandler.cpp4
-rw-r--r--src/datavisualization/input/qtouch3dinputhandler.h4
-rw-r--r--src/datavisualization/input/qtouch3dinputhandler_p.h4
9 files changed, 18 insertions, 18 deletions
diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp
index 3d5dd059..ce205bf6 100644
--- a/src/datavisualization/input/q3dinputhandler.cpp
+++ b/src/datavisualization/input/q3dinputhandler.cpp
@@ -31,7 +31,7 @@
#include "q3dinputhandler_p.h"
#include "abstract3dcontroller_p.h"
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
static const int halfSizeZoomLevel = 50;
static const int oneToOneZoomLevel = 100;
@@ -435,4 +435,4 @@ void Q3DInputHandlerPrivate::handleQueriedGraphPositionChange()
}
}
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h
index bbc3ff0f..6e6d1845 100644
--- a/src/datavisualization/input/q3dinputhandler.h
+++ b/src/datavisualization/input/q3dinputhandler.h
@@ -32,7 +32,7 @@
#include <QtDataVisualization/qabstract3dinputhandler.h>
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
class Q3DInputHandlerPrivate;
@@ -77,6 +77,6 @@ private:
QScopedPointer<Q3DInputHandlerPrivate> d_ptr;
};
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
#endif
diff --git a/src/datavisualization/input/q3dinputhandler_p.h b/src/datavisualization/input/q3dinputhandler_p.h
index 248bd594..addd65fa 100644
--- a/src/datavisualization/input/q3dinputhandler_p.h
+++ b/src/datavisualization/input/q3dinputhandler_p.h
@@ -43,7 +43,7 @@
#include "qabstract3dinputhandler_p.h"
#include "q3dinputhandler.h"
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
class Abstract3DController;
@@ -77,6 +77,6 @@ protected:
friend class Q3DInputHandler;
};
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
#endif
diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp
index 2809bee3..d439b793 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.cpp
+++ b/src/datavisualization/input/qabstract3dinputhandler.cpp
@@ -29,7 +29,7 @@
#include "qabstract3dinputhandler_p.h"
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
/*!
* \class QAbstract3DInputHandler
@@ -259,4 +259,4 @@ QAbstract3DInputHandlerPrivate::~QAbstract3DInputHandlerPrivate()
}
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h
index 21cabc47..c6e358c3 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.h
+++ b/src/datavisualization/input/qabstract3dinputhandler.h
@@ -38,7 +38,7 @@
#include <QtGui/QMouseEvent>
#include <QtGui/QTouchEvent>
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
class QAbstract3DInputHandlerPrivate;
@@ -101,6 +101,6 @@ private:
friend class QTouch3DInputHandlerPrivate;
};
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
#endif
diff --git a/src/datavisualization/input/qabstract3dinputhandler_p.h b/src/datavisualization/input/qabstract3dinputhandler_p.h
index ee43fb37..c6fe14b3 100644
--- a/src/datavisualization/input/qabstract3dinputhandler_p.h
+++ b/src/datavisualization/input/qabstract3dinputhandler_p.h
@@ -43,7 +43,7 @@
#include "datavisualizationglobal_p.h"
#include "qabstract3dinputhandler.h"
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
class QAbstract3DInputHandler;
class Q3DScene;
@@ -77,6 +77,6 @@ private:
friend class Abstract3DController;
};
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
#endif
diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp
index ce059dd1..5254d044 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.cpp
+++ b/src/datavisualization/input/qtouch3dinputhandler.cpp
@@ -31,7 +31,7 @@
#include <QtCore/QTimer>
#include <QtCore/qmath.h>
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
static const float maxTapAndHoldJitter = 20.0f;
static const int maxPinchJitter = 10;
@@ -278,4 +278,4 @@ void QTouch3DInputHandlerPrivate::handleRotation(const QPointF &position)
}
}
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/input/qtouch3dinputhandler.h b/src/datavisualization/input/qtouch3dinputhandler.h
index 8ef0fcbb..51f2e073 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.h
+++ b/src/datavisualization/input/qtouch3dinputhandler.h
@@ -32,7 +32,7 @@
#include <QtDataVisualization/q3dinputhandler.h>
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
class QTouch3DInputHandlerPrivate;
@@ -53,6 +53,6 @@ private:
QScopedPointer<QTouch3DInputHandlerPrivate> d_ptr;
};
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
#endif
diff --git a/src/datavisualization/input/qtouch3dinputhandler_p.h b/src/datavisualization/input/qtouch3dinputhandler_p.h
index 940c7653..fd94c12a 100644
--- a/src/datavisualization/input/qtouch3dinputhandler_p.h
+++ b/src/datavisualization/input/qtouch3dinputhandler_p.h
@@ -45,7 +45,7 @@
QT_FORWARD_DECLARE_CLASS(QTimer)
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
class QAbstract3DInputHandler;
@@ -71,6 +71,6 @@ public:
QPointF m_touchHoldPos;
};
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
#endif