From 40cae51e2871f95a9721d9e34bd8fa783ef94bea Mon Sep 17 00:00:00 2001 From: Adam Higerd Date: Thu, 10 Apr 2025 18:08:20 -0500 Subject: [PATCH] Qt: replace deprecated QSet APIs --- src/platform/qt/library/LibraryController.cpp | 5 +++-- src/platform/qt/utils.h | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/platform/qt/library/LibraryController.cpp b/src/platform/qt/library/LibraryController.cpp index 87d9ab5e2..8ae4055ba 100644 --- a/src/platform/qt/library/LibraryController.cpp +++ b/src/platform/qt/library/LibraryController.cpp @@ -9,6 +9,7 @@ #include "ConfigController.h" #include "GBAApp.h" #include "LibraryModel.h" +#include "utils.h" #include #include @@ -190,7 +191,7 @@ void LibraryController::refresh() { setDisabled(true); - QSet removedEntries(m_knownGames.keyBegin(), m_knownGames.keyEnd()); + QSet removedEntries(qListToSet(m_knownGames.keys())); QList updatedEntries; QList newEntries; @@ -215,7 +216,7 @@ void LibraryController::refresh() { m_knownGames.remove(path); } - m_libraryModel->removeEntries(QList(removedEntries.begin(), removedEntries.end())); + m_libraryModel->removeEntries(removedEntries.values()); m_libraryModel->updateEntries(updatedEntries); m_libraryModel->addEntries(newEntries); diff --git a/src/platform/qt/utils.h b/src/platform/qt/utils.h index d1e1a7063..3cc7d28f4 100644 --- a/src/platform/qt/utils.h +++ b/src/platform/qt/utils.h @@ -134,4 +134,13 @@ struct SpanSet { QVector spans; }; +template +QSet qListToSet(const QList& list) { +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) + return QSet::fromList(list); +#else + return QSet(list.begin(), list.end()); +#endif +} + }