From 06e82d10f6db00f0ee6338b5dd6843f793f9fa9f Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 6 Jan 2019 19:11:05 +0800 Subject: [PATCH] Replace boost::function with std::function --- src/base/bittorrent/torrenthandle.cpp | 8 +++----- src/base/bittorrent/torrenthandle.h | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp index 069ad11ab..bcc86983e 100644 --- a/src/base/bittorrent/torrenthandle.cpp +++ b/src/base/bittorrent/torrenthandle.cpp @@ -49,8 +49,6 @@ #include #endif -#include - #ifdef Q_OS_WIN #include #endif @@ -1596,8 +1594,8 @@ void TorrentHandle::handleTorrentFinishedAlert(const libtorrent::torrent_finishe const bool recheckTorrentsOnCompletion = Preferences::instance()->recheckTorrentsOnCompletion(); if (isMoveInProgress() || (m_renameCount > 0)) { if (recheckTorrentsOnCompletion) - m_moveFinishedTriggers.append(boost::bind(&TorrentHandle::forceRecheck, this)); - m_moveFinishedTriggers.append(boost::bind(&Session::handleTorrentFinished, m_session, this)); + m_moveFinishedTriggers.append([this]() { forceRecheck(); }); + m_moveFinishedTriggers.append([this]() { m_session->handleTorrentFinished(this); }); } else { if (recheckTorrentsOnCompletion && m_unchecked) @@ -1890,7 +1888,7 @@ void TorrentHandle::adjustActualSavePath() if (!isMoveInProgress()) adjustActualSavePath_impl(); else - m_moveFinishedTriggers.append(boost::bind(&TorrentHandle::adjustActualSavePath_impl, this)); + m_moveFinishedTriggers.append([this]() { adjustActualSavePath_impl(); }); } void TorrentHandle::adjustActualSavePath_impl() diff --git a/src/base/bittorrent/torrenthandle.h b/src/base/bittorrent/torrenthandle.h index 8e5c0d698..27bf0c902 100644 --- a/src/base/bittorrent/torrenthandle.h +++ b/src/base/bittorrent/torrenthandle.h @@ -30,6 +30,8 @@ #ifndef BITTORRENT_TORRENTHANDLE_H #define BITTORRENT_TORRENTHANDLE_H +#include + #include #include #include @@ -44,8 +46,6 @@ #include #endif -#include - #include "base/tristatebool.h" #include "private/speedmonitor.h" #include "infohash.h" @@ -383,7 +383,7 @@ namespace BitTorrent QVector availableFileFractions() const; private: - typedef boost::function EventTrigger; + typedef std::function EventTrigger; void updateStatus(); void updateStatus(const libtorrent::torrent_status &nativeStatus);