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/qtouch3dinputhandler.cpp6
-rw-r--r--src/datavisualization/input/qtouch3dinputhandler_p.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp
index 0efdf41f..ec00ae1f 100644
--- a/src/datavisualization/input/q3dinputhandler.cpp
+++ b/src/datavisualization/input/q3dinputhandler.cpp
@@ -146,8 +146,8 @@ void Q3DInputHandler::mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos)
#else
if (QDataVis::InputStateRotating == inputState()) {
// Calculate mouse movement since last frame
- qreal xRotation = scene()->activeCamera()->xRotation();
- qreal yRotation = scene()->activeCamera()->yRotation();
+ float xRotation = scene()->activeCamera()->xRotation();
+ float yRotation = scene()->activeCamera()->yRotation();
float mouseMoveX = float(inputPosition().x() - mousePos.x())
/ (scene()->viewport().width() / rotationSpeed);
float mouseMoveY = float(inputPosition().y() - mousePos.y())
diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp
index 6211ef9e..b36fdb99 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.cpp
+++ b/src/datavisualization/input/qtouch3dinputhandler.cpp
@@ -23,7 +23,7 @@
QT_DATAVISUALIZATION_BEGIN_NAMESPACE
-const qreal maxTapAndHoldJitter = 20;
+const float maxTapAndHoldJitter = 20.0f;
const int maxPinchJitter = 10;
#if defined (Q_OS_ANDROID)
const int maxSelectionJitter = 10;
@@ -145,7 +145,7 @@ QTouch3DInputHandlerPrivate::~QTouch3DInputHandlerPrivate()
delete m_holdTimer;
}
-void QTouch3DInputHandlerPrivate::handlePinchZoom(qreal distance)
+void QTouch3DInputHandlerPrivate::handlePinchZoom(float distance)
{
int newDistance = distance;
int prevDist = q_ptr->prevDistance();
@@ -154,7 +154,7 @@ void QTouch3DInputHandlerPrivate::handlePinchZoom(qreal distance)
q_ptr->setInputState(QDataVis::InputStateOnPinch);
Q3DCamera *camera = q_ptr->scene()->activeCamera();
int zoomLevel = camera->zoomLevel();
- qreal zoomRate = qSqrt(qSqrt(zoomLevel));
+ float zoomRate = qSqrt(qSqrt(zoomLevel));
if (newDistance > prevDist)
zoomLevel += zoomRate;
else
diff --git a/src/datavisualization/input/qtouch3dinputhandler_p.h b/src/datavisualization/input/qtouch3dinputhandler_p.h
index 1c5b81c7..11163140 100644
--- a/src/datavisualization/input/qtouch3dinputhandler_p.h
+++ b/src/datavisualization/input/qtouch3dinputhandler_p.h
@@ -33,7 +33,7 @@ public:
QTouch3DInputHandlerPrivate(QTouch3DInputHandler *q);
~QTouch3DInputHandlerPrivate();
- void handlePinchZoom(qreal distance);
+ void handlePinchZoom(float distance);
void handleTapAndHold();
void handleSelection(const QPointF &position);
void handleRotation(const QPointF &position);