Fix Qt deprectation warnings
This commit is contained in:
+2
-1
@@ -201,7 +201,8 @@ void FITSFileModel::prepareQuery()
|
|||||||
if(lastError().type() != QSqlError::NoError)
|
if(lastError().type() != QSqlError::NoError)
|
||||||
qDebug() << "Database error" << lastError();
|
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)
|
DatabaseTableView::DatabaseTableView(QWidget *parent) : QTableView(parent)
|
||||||
|
|||||||
+2
-2
@@ -106,7 +106,7 @@ void ImageScrollArea::wheelEvent(QWheelEvent *event)
|
|||||||
m_scale = (float)size().width()/m_pixmap.size().width();
|
m_scale = (float)size().width()/m_pixmap.size().width();
|
||||||
|
|
||||||
QPointF top(horizontalScrollBar()->value(), verticalScrollBar()->value());
|
QPointF top(horizontalScrollBar()->value(), verticalScrollBar()->value());
|
||||||
QPointF mousePos = (top + event->posF()) / m_scale;
|
QPointF mousePos = (top + event->position()) / m_scale;
|
||||||
|
|
||||||
QPoint delta = event->angleDelta();
|
QPoint delta = event->angleDelta();
|
||||||
if(delta.y() > 0)
|
if(delta.y() > 0)
|
||||||
@@ -115,7 +115,7 @@ void ImageScrollArea::wheelEvent(QWheelEvent *event)
|
|||||||
setScale(m_scale - 0.1);
|
setScale(m_scale - 0.1);
|
||||||
|
|
||||||
mousePos *= m_scale;
|
mousePos *= m_scale;
|
||||||
top = mousePos - event->posF();
|
top = mousePos - event->position();
|
||||||
horizontalScrollBar()->setValue(top.x());
|
horizontalScrollBar()->setValue(top.x());
|
||||||
verticalScrollBar()->setValue(top.y());
|
verticalScrollBar()->setValue(top.y());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -637,7 +637,7 @@ void ImageWidget::wheelEvent(QWheelEvent *event)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
if(std::abs(event->angleDelta().y()) > 15)
|
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());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user