From c7b5d1054644b31d3fcd7b60d471948eb33648ed Mon Sep 17 00:00:00 2001 From: oltolm Date: Sat, 25 May 2024 14:11:53 +0200 Subject: [PATCH] fix Qt deprecation warnings --- src/platform/qt/ConfigController.cpp | 4 ++++ src/platform/qt/FrameView.cpp | 8 ++++++++ src/platform/qt/MapView.cpp | 5 +++++ src/platform/qt/MemoryModel.cpp | 10 ++++++++++ src/platform/qt/SaveConverter.cpp | 2 +- src/platform/qt/Swatch.cpp | 5 +++++ src/platform/qt/TilePainter.cpp | 5 +++++ src/platform/qt/Window.cpp | 8 ++++++++ src/platform/qt/main.cpp | 6 ++++++ 9 files changed, 52 insertions(+), 1 deletion(-) diff --git a/src/platform/qt/ConfigController.cpp b/src/platform/qt/ConfigController.cpp index 91ecf8e7a..ccec60432 100644 --- a/src/platform/qt/ConfigController.cpp +++ b/src/platform/qt/ConfigController.cpp @@ -318,7 +318,11 @@ void ConfigController::setOption(const char* key, const char* value) { } void ConfigController::setOption(const char* key, const QVariant& value) { +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) if (value.type() == QVariant::Bool) { +#else + if (value.typeId() == QMetaType::Type::Bool) { +#endif setOption(key, value.toBool()); return; } diff --git a/src/platform/qt/FrameView.cpp b/src/platform/qt/FrameView.cpp index 2fe37e64c..ada077d74 100644 --- a/src/platform/qt/FrameView.cpp +++ b/src/platform/qt/FrameView.cpp @@ -505,12 +505,20 @@ bool FrameView::eventFilter(QObject*, QEvent* event) { QPointF pos; switch (event->type()) { case QEvent::MouseButtonPress: +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) pos = static_cast(event)->localPos(); +#else + pos = static_cast(event)->position(); +#endif pos /= m_ui.magnification->value(); selectLayer(pos); return true; case QEvent::MouseButtonDblClick: +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) pos = static_cast(event)->localPos(); +#else + pos = static_cast(event)->position(); +#endif pos /= m_ui.magnification->value(); disableLayer(pos); return true; diff --git a/src/platform/qt/MapView.cpp b/src/platform/qt/MapView.cpp index a00c63c0e..aef8c58b7 100644 --- a/src/platform/qt/MapView.cpp +++ b/src/platform/qt/MapView.cpp @@ -161,8 +161,13 @@ bool MapView::eventFilter(QObject*, QEvent* event) { if (event->type() != QEvent::MouseButtonPress) { return false; } +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) int x = static_cast(event)->x(); int y = static_cast(event)->y(); +#else + int x = static_cast(event)->position().x(); + int y = static_cast(event)->position().y(); +#endif x /= 8 * m_ui.magnification->value(); y /= 8 * m_ui.magnification->value(); selectTile(x, y); diff --git a/src/platform/qt/MemoryModel.cpp b/src/platform/qt/MemoryModel.cpp index 538ce2c51..9bcf54223 100644 --- a/src/platform/qt/MemoryModel.cpp +++ b/src/platform/qt/MemoryModel.cpp @@ -511,8 +511,13 @@ void MemoryModel::wheelEvent(QWheelEvent* event) { } void MemoryModel::mousePressEvent(QMouseEvent* event) { +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) if (event->x() < m_margins.left() || event->y() < m_margins.top() || event->x() > size().width() - m_margins.right()) { +#else + if (event->position().x() < m_margins.left() || event->position().y() < m_margins.top() || + event->position().x() > size().width() - m_margins.right()) { +#endif m_selection = qMakePair(0, 0); return; } @@ -540,8 +545,13 @@ void MemoryModel::mousePressEvent(QMouseEvent* event) { } void MemoryModel::mouseMoveEvent(QMouseEvent* event) { +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) if (event->x() < m_margins.left() || event->y() < m_margins.top() || event->x() > size().width() - m_margins.right()) { +#else + if (event->position().x() < m_margins.left() || event->position().y() < m_margins.top() || + event->position().x() > size().width() - m_margins.right()) { +#endif return; } diff --git a/src/platform/qt/SaveConverter.cpp b/src/platform/qt/SaveConverter.cpp index d16eeeea4..974f31af0 100644 --- a/src/platform/qt/SaveConverter.cpp +++ b/src/platform/qt/SaveConverter.cpp @@ -281,7 +281,7 @@ void SaveConverter::detectFromHeaders(std::shared_ptr vf) { } free(data); } - } else if (buffer.left(gsv.count()) == gsv) { + } else if (buffer.left(gsv.size()) == gsv) { size_t size; void* data = GBASavedataGSVGetPayload(*vf, &size, nullptr, false); if (data) { diff --git a/src/platform/qt/Swatch.cpp b/src/platform/qt/Swatch.cpp index 3eb85d780..f4a9ad7c3 100644 --- a/src/platform/qt/Swatch.cpp +++ b/src/platform/qt/Swatch.cpp @@ -56,8 +56,13 @@ void Swatch::paintEvent(QPaintEvent*) { } void Swatch::mousePressEvent(QMouseEvent* event) { +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) int x = event->x() / (m_size + 1); int y = event->y() / (m_size + 1); +#else + int x = event->position().x() / (m_size + 1); + int y = event->position().y() / (m_size + 1); +#endif emit indexPressed(y * m_dims.width() + x); } diff --git a/src/platform/qt/TilePainter.cpp b/src/platform/qt/TilePainter.cpp index c27ade72e..fcb62d420 100644 --- a/src/platform/qt/TilePainter.cpp +++ b/src/platform/qt/TilePainter.cpp @@ -39,8 +39,13 @@ void TilePainter::resizeEvent(QResizeEvent*) { } void TilePainter::mousePressEvent(QMouseEvent* event) { +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) int x = event->x() / m_size; int y = event->y() / m_size; +#else + int x = event->position().x() / m_size; + int y = event->position().y() / m_size; +#endif int index = y * (width() / m_size) + x; if (index < m_tileCount) { emit indexPressed(index); diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index c75a163ef..a5576c1c9 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -918,7 +918,11 @@ void Window::gameStarted() { #ifdef M_CORE_GBA if (m_controller->platform() == mPLATFORM_GBA) { QVariant eCardList = m_config->takeArgvOption(QString("ecard")); +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) if (eCardList.canConvert(QMetaType::QStringList)) { +#else + if (QMetaType::canConvert(eCardList.metaType(), QMetaType(QMetaType::QStringList))) { +#endif m_controller->scanCards(eCardList.toStringList()); } } @@ -2149,7 +2153,11 @@ void Window::setController(CoreController* controller, const QString& fname) { #ifdef M_CORE_GBA if (m_controller->platform() == mPLATFORM_GBA) { QVariant mb = m_config->takeArgvOption(QString("mb")); +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) if (mb.canConvert(QMetaType::QString)) { +#else + if (QMetaType::canConvert(mb.metaType(), QMetaType(QMetaType::QString))) { +#endif m_controller->replaceGame(mb.toString()); } } diff --git a/src/platform/qt/main.cpp b/src/platform/qt/main.cpp index 62967bf1a..f98d2cd88 100644 --- a/src/platform/qt/main.cpp +++ b/src/platform/qt/main.cpp @@ -90,7 +90,9 @@ int main(int argc, char* argv[]) { QApplication::setApplicationName(projectName); QApplication::setApplicationVersion(projectVersion); +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true); +#endif #ifdef BUILD_GLES2 QSurfaceFormat format; @@ -109,7 +111,11 @@ int main(int argc, char* argv[]) { #endif QTranslator qtTranslator; +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) if (qtTranslator.load(locale, "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { +#else + if (qtTranslator.load(locale, "qt", "_", QLibraryInfo::path(QLibraryInfo::TranslationsPath))) { +#endif application.installTranslator(&qtTranslator); }