From c091bc0bb3d27258ab3d7538b757f573a0d80546 Mon Sep 17 00:00:00 2001
From: Cristian Luis Duarte <cristian.duarte.mb@gmail.com>
Date: Mon, 5 Mar 2018 17:08:38 -0300
Subject: [PATCH] Fix warnings regarding float to double conversion

---
 .../src/input-plugins/TouchscreenVirtualPadDevice.cpp  |  6 +++---
 .../src/input-plugins/TouchscreenVirtualPadDevice.h    | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp b/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp
index 1774bbb4d3..bbe6102d21 100644
--- a/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp
+++ b/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp
@@ -68,7 +68,7 @@ void TouchscreenVirtualPadDevice::setupFixedCenter(VirtualPad::Manager& virtualP
     if (_extraBottomMargin == virtualPadManager.extraBottomMargin() && !force) return; // Our only criteria to decide a center change is the bottom margin
 
     _extraBottomMargin = virtualPadManager.extraBottomMargin();
-    qreal margin = _screenDPI * 59 / 534; // 59px is for our 'base' of 534dpi (Pixel XL or Huawei Mate 9 Pro)
+    float margin = _screenDPI * 59 / 534; // 59px is for our 'base' of 534dpi (Pixel XL or Huawei Mate 9 Pro)
     QScreen* eventScreen = qApp->primaryScreen(); // do not call every time
     _fixedCenterPosition = glm::vec2( _fixedRadius + margin, eventScreen->size().height() - margin - _fixedRadius - _extraBottomMargin);
 
@@ -104,12 +104,12 @@ glm::vec2 TouchscreenVirtualPadDevice::clippedPointInCircle(float radius, glm::v
     // quadtratic coefs of circumference and line intersection
     float qa = pow(m,2)+1;
     float qb = 2 * ( m * b - origin.x - origin.y * m );
-    float qc = pow(origin.x, 2) - pow(radius,2) + b * b - 2 * b * origin.y + pow(origin.y, 2);
+    float qc = powf(origin.x, 2) - powf(radius,2) + b * b - 2 * b * origin.y + powf(origin.y, 2);
 
     float discr = qb * qb - 4 * qa * qc;
     float discrSign = deltaX>0?1.0:-1.0;
 
-    float finalX = (- qb + discrSign * sqrt(discr)) / (2 * qa);
+    float finalX = (- qb + discrSign * sqrtf(discr)) / (2 * qa);
     float finalY = m * finalX + b;
 
     return vec2(finalX, finalY);
diff --git a/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.h b/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.h
index f71490b0e3..4b95f3fbaf 100644
--- a/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.h
+++ b/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.h
@@ -62,9 +62,9 @@ public:
     const std::shared_ptr<InputDevice>& getInputDevice() const { return _inputDevice; }
 
 protected:
-    qreal _lastPinchScale;
-    qreal _pinchScale;
-    qreal _screenDPI;
+    float _lastPinchScale;
+    float _pinchScale;
+    float _screenDPI;
     glm::vec2 _screenDPIScale;
     bool _validTouchLeft;
     glm::vec2 _firstTouchLeftPoint;
@@ -78,8 +78,8 @@ protected:
 
     bool _fixedPosition;
     glm::vec2 _fixedCenterPosition;
-    qreal _fixedRadius;
-    qreal _fixedRadiusForCalc;
+    float _fixedRadius;
+    float _fixedRadiusForCalc;
     int _extraBottomMargin {0};
 
     void touchLeftBegin(glm::vec2 touchPoint);