mirror/qBittorrent
2
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-01-06 15:04:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use static_cast for explicit type conversions

Browse Source
This commit is contained in:
sledgehammer999 2020-04-18 15:51:38 +03:00
parent d69ce4f1cf
commit a17b1f2b78
No known key found for this signature in database
GPG Key ID: 6E4A2D025B7CC9A2
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base/bittorrent/private/nativetorrentextension.cpp
View File

@ -47,7 +47,7 @@ namespace
#if (LIBTORRENT_VERSION_NUM < 10200) #if (LIBTORRENT_VERSION_NUM < 10200)
return torrentStatus.auto_managed; return torrentStatus.auto_managed;
#else #else
return bool {torrentStatus.flags & lt::torrent_flags::auto_managed}; return static_cast<bool>(torrentStatus.flags & lt::torrent_flags::auto_managed);
#endif #endif
} }
} }

2
src/base/bittorrent/session.cpp
View File

@ -2599,7 +2599,7 @@ void Session::saveTorrentsQueue()
QMap<int, QString> queue; // Use QMap since it should be ordered by key QMap<int, QString> queue; // Use QMap since it should be ordered by key
for (const TorrentHandleImpl *torrent : asConst(m_torrents)) { for (const TorrentHandleImpl *torrent : asConst(m_torrents)) {
// We require actual (non-cached) queue position here! // We require actual (non-cached) queue position here!
const int queuePos = LTUnderlyingType<LTQueuePosition> {torrent->nativeHandle().queue_position()}; const int queuePos = static_cast<LTUnderlyingType<LTQueuePosition>>(torrent->nativeHandle().queue_position());
if (queuePos >= 0) if (queuePos >= 0)
queue[queuePos] = torrent->hash(); queue[queuePos] = torrent->hash();
} }

2
src/base/bittorrent/torrentcreatorthread.cpp
View File

@ -164,7 +164,7 @@ void TorrentCreatorThread::run()
lt::set_piece_hashes(newTorrent, Utils::Fs::toNativePath(parentPath).toStdString() lt::set_piece_hashes(newTorrent, Utils::Fs::toNativePath(parentPath).toStdString()
, [this, &newTorrent](const LTPieceIndex n) , [this, &newTorrent](const LTPieceIndex n)
{ {
sendProgressSignal(LTUnderlyingType<LTPieceIndex> {n}, newTorrent.num_pieces()); sendProgressSignal(static_cast<LTUnderlyingType<LTPieceIndex>>(n), newTorrent.num_pieces());
}); });
// Set qBittorrent as creator and add user comment to // Set qBittorrent as creator and add user comment to
// torrent_info structure // torrent_info structure

16
src/base/bittorrent/torrenthandleimpl.cpp
View File

@ -354,7 +354,7 @@ bool TorrentHandleImpl::isAutoManaged() const
#if (LIBTORRENT_VERSION_NUM < 10200) #if (LIBTORRENT_VERSION_NUM < 10200)
return m_nativeStatus.auto_managed; return m_nativeStatus.auto_managed;
#else #else
return bool {m_nativeStatus.flags & lt::torrent_flags::auto_managed}; return static_cast<bool>(m_nativeStatus.flags & lt::torrent_flags::auto_managed);
#endif #endif
} }
@ -699,7 +699,7 @@ QVector<DownloadPriority> TorrentHandleImpl::filePriorities() const
QVector<DownloadPriority> ret; QVector<DownloadPriority> ret;
std::transform(fp.cbegin(), fp.cend(), std::back_inserter(ret), [](LTDownloadPriority priority) std::transform(fp.cbegin(), fp.cend(), std::back_inserter(ret), [](LTDownloadPriority priority)
{ {
return static_cast<DownloadPriority>(LTUnderlyingType<LTDownloadPriority> {priority}); return static_cast<DownloadPriority>(static_cast<LTUnderlyingType<LTDownloadPriority>>(priority));
}); });
return ret; return ret;
} }
@ -822,7 +822,7 @@ bool TorrentHandleImpl::isSequentialDownload() const
#if (LIBTORRENT_VERSION_NUM < 10200) #if (LIBTORRENT_VERSION_NUM < 10200)
return m_nativeStatus.sequential_download; return m_nativeStatus.sequential_download;
#else #else
return bool {m_nativeStatus.flags & lt::torrent_flags::sequential_download}; return static_cast<bool>(m_nativeStatus.flags & lt::torrent_flags::sequential_download);
#endif #endif
} }
@ -1148,7 +1148,7 @@ bool TorrentHandleImpl::superSeeding() const
#if (LIBTORRENT_VERSION_NUM < 10200) #if (LIBTORRENT_VERSION_NUM < 10200)
return m_nativeStatus.super_seeding; return m_nativeStatus.super_seeding;
#else #else
return bool {m_nativeStatus.flags & lt::torrent_flags::super_seeding}; return static_cast<bool>(m_nativeStatus.flags & lt::torrent_flags::super_seeding);
#endif #endif
} }
@ -1185,7 +1185,7 @@ QBitArray TorrentHandleImpl::downloadingPieces() const
#if (LIBTORRENT_VERSION_NUM < 10200) #if (LIBTORRENT_VERSION_NUM < 10200)
result.setBit(info.piece_index); result.setBit(info.piece_index);
#else #else
result.setBit(LTUnderlyingType<LTPieceIndex> {info.piece_index}); result.setBit(static_cast<LTUnderlyingType<LTPieceIndex>>(info.piece_index));
#endif #endif
return result; return result;
@ -1737,7 +1737,7 @@ void TorrentHandleImpl::handleFileRenamedAlert(const lt::file_renamed_alert *p)
void TorrentHandleImpl::handleFileRenameFailedAlert(const lt::file_rename_failed_alert *p) void TorrentHandleImpl::handleFileRenameFailedAlert(const lt::file_rename_failed_alert *p)
{ {
LogMsg(tr("File rename failed. Torrent: \"%1\", file: \"%2\", reason: \"%3\"") LogMsg(tr("File rename failed. Torrent: \"%1\", file: \"%2\", reason: \"%3\"")
.arg(name(), filePath(LTUnderlyingType<LTFileIndex> {p->index}) .arg(name(), filePath(static_cast<LTUnderlyingType<LTFileIndex>>(p->index))
, QString::fromLocal8Bit(p->error.message().c_str())), Log::WARNING); , QString::fromLocal8Bit(p->error.message().c_str())), Log::WARNING);
m_oldPath[p->index].removeFirst(); m_oldPath[p->index].removeFirst();
@ -1760,12 +1760,12 @@ void TorrentHandleImpl::handleFileCompletedAlert(const lt::file_completed_alert
qDebug("A file completed download in torrent \"%s\"", qUtf8Printable(name())); qDebug("A file completed download in torrent \"%s\"", qUtf8Printable(name()));
if (m_session->isAppendExtensionEnabled()) { if (m_session->isAppendExtensionEnabled()) {
QString name = filePath(LTUnderlyingType<LTFileIndex> {p->index}); QString name = filePath(static_cast<LTUnderlyingType<LTFileIndex>>(p->index));
if (name.endsWith(QB_EXT)) { if (name.endsWith(QB_EXT)) {
const QString oldName = name; const QString oldName = name;
name.chop(QB_EXT.size()); name.chop(QB_EXT.size());
qDebug("Renaming %s to %s", qUtf8Printable(oldName), qUtf8Printable(name)); qDebug("Renaming %s to %s", qUtf8Printable(oldName), qUtf8Printable(name));
renameFile(LTUnderlyingType<LTFileIndex> {p->index}, name); renameFile(static_cast<LTUnderlyingType<LTFileIndex>>(p->index), name);
} }
} }
} }