From e5be04926b7ec49b2f6385aa6917f043bb91681d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Du=C5=A1an=20Poizl?= <nou.spiro@gmail.com>
Date: Wed, 20 Dec 2023 11:31:08 +0100
Subject: [PATCH] Fix warnings

---
 imagescrollareagl.cpp | 10 +++++++---
 stfslider.cpp         | 34 ++++++++++++++++++----------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/imagescrollareagl.cpp b/imagescrollareagl.cpp
index 47e952e..c5071ee 100644
--- a/imagescrollareagl.cpp
+++ b/imagescrollareagl.cpp
@@ -49,6 +49,10 @@ RawImageType getRawImageType(const RawImage *img)
         else
             type.textureFormat = QOpenGLTexture::R32F;
         type.dataType = QOpenGLTexture::Float32;
+        break;
+    default:
+        qWarning() << "Invalid format" << img->type();
+        break;
     }
 
     if(img->channels() >= 3)
@@ -559,7 +563,7 @@ void ImageWidget::mousePressEvent(QMouseEvent *event)
     else
     {
         if(event->button() == Qt::LeftButton)
-            m_lastPos = event->localPos();
+            m_lastPos = event->position();
     }
 }
 
@@ -571,8 +575,8 @@ void ImageWidget::mouseMoveEvent(QMouseEvent *event)
     }
     else if(!m_lastPos.isNull())
     {
-        QPointF off = event->localPos() - m_lastPos;
-        m_lastPos = event->localPos();
+        QPointF off = event->position() - m_lastPos;
+        m_lastPos = event->position();
         setOffset(m_dx - off.x(), m_dy - off.y());
         return;
     }
diff --git a/stfslider.cpp b/stfslider.cpp
index c80c9d9..b2756db 100644
--- a/stfslider.cpp
+++ b/stfslider.cpp
@@ -105,43 +105,44 @@ void STFSlider::paintEvent(QPaintEvent *event)
 
 void STFSlider::mouseMoveEvent(QMouseEvent *event)
 {
-    if(std::abs(m_blackPoint*width() - event->x()) < 5 ||
-            std::abs((m_blackPoint + (m_whitePoint - m_blackPoint) * m_midPoint)*width() - event->x()) < 5 ||
-            std::abs(m_whitePoint*width() - event->x()) < 5)
+    const qreal x = event->position().x();
+    if(std::abs(m_blackPoint*width() - x) < 5 ||
+            std::abs((m_blackPoint + (m_whitePoint - m_blackPoint) * m_midPoint)*width() - x) < 5 ||
+            std::abs(m_whitePoint*width() - x) < 5)
         setCursor(Qt::SplitHCursor);
     else
         unsetCursor();
 
-    qreal x = (qreal)event->x()/width();
+    qreal xw = x/width();
     if(event->modifiers() & Qt::ShiftModifier && !m_fineTune)
     {
         m_fineTune = true;
-        m_fineTuneX = x;
+        m_fineTuneX = xw;
     }
     if(!(event->modifiers() & Qt::ShiftModifier) && m_fineTune)
         m_fineTune = false;
 
     if(m_fineTune)
     {
-        x = m_fineTuneX + (x - m_fineTuneX) * 0.2;
+        xw = m_fineTuneX + (xw - m_fineTuneX) * 0.2;
     }
 
     switch(m_grabbed)
     {
     case 0:
-        m_blackPoint = clamp(x);
+        m_blackPoint = clamp(xw);
         m_whitePoint = std::max(m_whitePoint, m_blackPoint);
-        QToolTip::showText(event->globalPos(), QString::number(m_blackPoint), this);
+        QToolTip::showText(event->globalPosition().toPoint(), QString::number(m_blackPoint), this);
         break;
     case 1:
-        m_midPoint = (x - m_blackPoint) / (m_whitePoint - m_blackPoint);
+        m_midPoint = (xw - m_blackPoint) / (m_whitePoint - m_blackPoint);
         m_midPoint = clamp(m_midPoint);
-        QToolTip::showText(event->globalPos(), QString::number(m_midPoint), this);
+        QToolTip::showText(event->globalPosition().toPoint(), QString::number(m_midPoint), this);
         break;
     case 2:
-        m_whitePoint = clamp(x);
+        m_whitePoint = clamp(xw);
         m_blackPoint = std::min(m_blackPoint, m_whitePoint);
-        QToolTip::showText(event->globalPos(), QString::number(m_whitePoint), this);
+        QToolTip::showText(event->globalPosition().toPoint(), QString::number(m_whitePoint), this);
         break;
     }
     if(m_grabbed >= 0)
@@ -153,17 +154,18 @@ void STFSlider::mouseMoveEvent(QMouseEvent *event)
 
 void STFSlider::mousePressEvent(QMouseEvent *event)
 {
+    const qreal x = event->position().x();
     if(event->modifiers() & Qt::ShiftModifier)
     {
         m_fineTune = true;
-        m_fineTuneX = (qreal)event->x()/width();
+        m_fineTuneX = x/width();
     }
 
-    if(std::abs((m_blackPoint + (m_whitePoint - m_blackPoint) * m_midPoint)*width() - event->x()) < 5)
+    if(std::abs((m_blackPoint + (m_whitePoint - m_blackPoint) * m_midPoint)*width() - x) < 5)
         m_grabbed = 1;
-    else if(std::abs(m_blackPoint*width() - event->x()) < 5)
+    else if(std::abs(m_blackPoint*width() - x) < 5)
         m_grabbed = 0;
-    else if(std::abs(m_whitePoint*width() - event->x()) < 5)
+    else if(std::abs(m_whitePoint*width() - x) < 5)
         m_grabbed = 2;
     else
         m_grabbed = -1;