From aef41f5f6b39c577a543aa8f23aab637275262af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Du=C5=A1an=20Poizl?= <nou.spiro@gmail.com>
Date: Mon, 18 Dec 2023 16:03:04 +0100
Subject: [PATCH] Fix Qt deprectation warnings
---
databaseview.cpp | 3 ++-
imagescrollarea.cpp | 4 ++--
imagescrollareagl.cpp | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/databaseview.cpp b/databaseview.cpp
index 4429f86..db3de33 100644
--- a/databaseview.cpp
+++ b/databaseview.cpp
@@ -201,7 +201,8 @@ void FITSFileModel::prepareQuery()
if(lastError().type() != QSqlError::NoError)
qDebug() << "Database error" << lastError();
- m_markedFiles = m_database->getMarkedFiles().toSet();
+ QStringList list = m_database->getMarkedFiles();
+ m_markedFiles = QSet<QString>(list.begin(), list.end());
}
DatabaseTableView::DatabaseTableView(QWidget *parent) : QTableView(parent)
diff --git a/imagescrollarea.cpp b/imagescrollarea.cpp
index 16ff5d6..1bed5d2 100644
--- a/imagescrollarea.cpp
+++ b/imagescrollarea.cpp
@@ -106,7 +106,7 @@ void ImageScrollArea::wheelEvent(QWheelEvent *event)
m_scale = (float)size().width()/m_pixmap.size().width();
QPointF top(horizontalScrollBar()->value(), verticalScrollBar()->value());
- QPointF mousePos = (top + event->posF()) / m_scale;
+ QPointF mousePos = (top + event->position()) / m_scale;
QPoint delta = event->angleDelta();
if(delta.y() > 0)
@@ -115,7 +115,7 @@ void ImageScrollArea::wheelEvent(QWheelEvent *event)
setScale(m_scale - 0.1);
mousePos *= m_scale;
- top = mousePos - event->posF();
+ top = mousePos - event->position();
horizontalScrollBar()->setValue(top.x());
verticalScrollBar()->setValue(top.y());
}
diff --git a/imagescrollareagl.cpp b/imagescrollareagl.cpp
index 0a5de09..575aa0e 100644
--- a/imagescrollareagl.cpp
+++ b/imagescrollareagl.cpp
@@ -637,7 +637,7 @@ void ImageWidget::wheelEvent(QWheelEvent *event)
else
{
if(std::abs(event->angleDelta().y()) > 15)
- zoom(event->angleDelta().y(), event->modifiers() & Qt::ShiftModifier ? QPointF() : event->posF());
+ zoom(event->angleDelta().y(), event->modifiers() & Qt::ShiftModifier ? QPointF() : event->position());
}
}