Merge pull request #11739 from Chocobo1/qt5_14

Migrate away from deprecated API in Qt 5.14
This commit is contained in:
Mike Tzou 2019-12-26 12:43:04 +08:00 committed by GitHub
commit 5c3c1e07df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 38 additions and 9 deletions

View file

@ -501,7 +501,7 @@ Session::Session(QObject *parent)
m_storedCategories = map_cast(m_categories);
}
m_tags = QSet<QString>::fromList(m_storedTags.value());
m_tags = List::toSet(m_storedTags.value());
m_refreshTimer->setInterval(refreshInterval());
connect(m_refreshTimer, &QTimer::timeout, this, &Session::refresh);
@ -4060,7 +4060,7 @@ void Session::startUpTorrents()
}
if (!queue.empty())
fastresumes = queue + fastresumes.toSet().subtract(queue.toSet()).values();
fastresumes = queue + List::toSet(fastresumes).subtract(List::toSet(queue)).values();
}
for (const QString &fastresumeName : asConst(fastresumes)) {