From ac2d063add3cd795a10c6eb3613a95f81b2be929 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 19 Apr 2020 11:12:18 +0800 Subject: [PATCH] Move initialization default values to header --- src/base/bittorrent/torrenthandleimpl.cpp | 5 ----- src/base/bittorrent/torrenthandleimpl.h | 10 +++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/base/bittorrent/torrenthandleimpl.cpp b/src/base/bittorrent/torrenthandleimpl.cpp index 409d83090..472171dfb 100644 --- a/src/base/bittorrent/torrenthandleimpl.cpp +++ b/src/base/bittorrent/torrenthandleimpl.cpp @@ -166,8 +166,6 @@ TorrentHandleImpl::TorrentHandleImpl(Session *session, const lt::torrent_handle : QObject(session) , m_session(session) , m_nativeHandle(nativeHandle) - , m_state(TorrentState::Unknown) - , m_renameCount(0) , m_useAutoTMM(params.savePath.isEmpty()) , m_name(params.name) , m_savePath(Utils::Fs::toNativePath(params.savePath)) @@ -177,10 +175,7 @@ TorrentHandleImpl::TorrentHandleImpl(Session *session, const lt::torrent_handle , m_ratioLimit(params.ratioLimit) , m_seedingTimeLimit(params.seedingTimeLimit) , m_tempPathDisabled(params.disableTempPath) - , m_fastresumeDataRejected(false) - , m_hasMissingFiles(false) , m_hasRootFolder(params.hasRootFolder) - , m_needsToSetFirstLastPiecePriority(false) { if (m_useAutoTMM) m_savePath = Utils::Fs::toNativePath(m_session->categorySavePath(m_category)); diff --git a/src/base/bittorrent/torrenthandleimpl.h b/src/base/bittorrent/torrenthandleimpl.h index 9cc139933..76738a9a9 100644 --- a/src/base/bittorrent/torrenthandleimpl.h +++ b/src/base/bittorrent/torrenthandleimpl.h @@ -298,7 +298,7 @@ namespace BitTorrent Session *const m_session; lt::torrent_handle m_nativeHandle; lt::torrent_status m_nativeStatus; - TorrentState m_state; + TorrentState m_state = TorrentState::Unknown; TorrentInfo m_torrentInfo; SpeedMonitor m_speedMonitor; @@ -308,7 +308,7 @@ namespace BitTorrent // m_moveFinishedTriggers is activated only when the following conditions are met: // all file rename jobs complete, all file move jobs complete QQueue m_moveFinishedTriggers; - int m_renameCount; + int m_renameCount = 0; // Until libtorrent provide an "old_name" field in `file_renamed_alert` // we will rely on this workaround to remove empty leftover folders @@ -325,10 +325,10 @@ namespace BitTorrent qreal m_ratioLimit; int m_seedingTimeLimit; bool m_tempPathDisabled; - bool m_fastresumeDataRejected; - bool m_hasMissingFiles; + bool m_fastresumeDataRejected = false; + bool m_hasMissingFiles = false; bool m_hasRootFolder; - bool m_needsToSetFirstLastPiecePriority; + bool m_needsToSetFirstLastPiecePriority = false; QHash m_trackerInfos;