From 770c7f6330403fb6d2882ea41e22940d6ffdfc6b Mon Sep 17 00:00:00 2001
From: Mark O'Donovan <shiftee@posteo.net>
Date: Wed, 1 Dec 2021 03:31:34 +0000
Subject: [PATCH] Replace deprecated qt functions toList() & toSet() (#5213)

* Replace deprecated qt functions toList() & toSet()

QSet<QString>::toList() and QStringList::toSet() are both
deprecated.

* Add back support for qt < 5.14
---
 src/Gui/DocumentRecovery.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Gui/DocumentRecovery.cpp b/src/Gui/DocumentRecovery.cpp
index aea8bee3c4..9b3186733a 100644
--- a/src/Gui/DocumentRecovery.cpp
+++ b/src/Gui/DocumentRecovery.cpp
@@ -706,10 +706,17 @@ void DocumentRecoveryCleaner::clearDirectory(const QFileInfo& dir)
 void DocumentRecoveryCleaner::subtractFiles(QStringList& files)
 {
     if (!ignoreFiles.isEmpty() && !files.isEmpty()) {
+#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
+        auto set1 = QSet<QString>(files.begin(), files.end());
+        auto set2 = QSet<QString>(ignoreFiles.begin(), ignoreFiles.end());
+        set1.subtract(set2);
+        files = QList<QString>(set1.begin(), set1.end());
+#else
         QSet<QString> set1 = files.toSet();
         QSet<QString> set2 = ignoreFiles.toSet();
         set1.subtract(set2);
         files = set1.toList();
+#endif
     }
 }