kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Replace deprecated qt functions toList() & toSet() (#5213)

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

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

* Add back support for qt < 5.14
This commit is contained in:
Mark O'Donovan
2021-12-01 03:31:34 +00:00
committed by GitHub
parent a05cd50fa5
commit 770c7f6330
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Gui/DocumentRecovery.cpp
View File

@@ -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
}
}