Merge pull request #11430 from Chocobo1/qt

Fix integer narrowing on x86
This commit is contained in:
Mike Tzou
2019-11-01 10:34:56 +08:00
committed by GitHub
7 changed files with 10 additions and 10 deletions

View File

@@ -730,7 +730,7 @@ bool Session::addTag(const QString &tag)
if (!hasTag(tag)) {
m_tags.insert(tag);
m_storedTags = m_tags.toList();
m_storedTags = m_tags.values();
emit tagAdded(tag);
return true;
}
@@ -742,7 +742,7 @@ bool Session::removeTag(const QString &tag)
if (m_tags.remove(tag)) {
for (TorrentHandle *const torrent : asConst(torrents()))
torrent->removeTag(tag);
m_storedTags = m_tags.toList();
m_storedTags = m_tags.values();
emit tagRemoved(tag);
return true;
}
@@ -3813,7 +3813,7 @@ void Session::startUpTorrents()
}
if (!queue.empty())
fastresumes = queue + fastresumes.toSet().subtract(queue.toSet()).toList();
fastresumes = queue + fastresumes.toSet().subtract(queue.toSet()).values();
}
for (const QString &fastresumeName : asConst(fastresumes)) {

View File

@@ -157,7 +157,7 @@ QStringList SearchPluginManager::getPluginCategories(const QString &pluginName)
categories << category;
}
return categories.toList();
return categories.values();
}
PluginInfo *SearchPluginManager::pluginInfo(const QString &name) const

View File

@@ -348,7 +348,7 @@ bool Utils::Fs::isNetworkFileSystem(const QString &path)
// Magic number references:
// 1. /usr/include/linux/magic.h
// 2. https://github.com/coreutils/coreutils/blob/master/src/stat.c
switch (buf.f_type) {
switch (static_cast<unsigned int>(buf.f_type)) {
case 0xFF534D42: // CIFS_MAGIC_NUMBER
case 0x6969: // NFS_SUPER_MAGIC
case 0x517B: // SMB_SUPER_MAGIC