Merge pull request #10125 from Chocobo1/boost

Replace boost::function with std::function

src/base/bittorrent/torrentcreatorthread.cpp

@@ -30,7 +30,6 @@
 
 #include <fstream>
 
-#include <boost/bind.hpp>
 #include <libtorrent/bencode.hpp>
 #include <libtorrent/create_torrent.hpp>
 #include <libtorrent/storage.hpp>
@@ -108,7 +107,7 @@ void TorrentCreatorThread::run()
             std::sort(dirs.begin(), dirs.end(), Utils::String::naturalLessThan<Qt::CaseInsensitive>);
 
             QStringList fileNames;
-            QHash<QString, boost::int64_t> fileSizeMap;
+            QHash<QString, qint64> fileSizeMap;
 
             for (const auto &dir : asConst(dirs)) {
                 QStringList tmpNames;  // natural sort files within each dir

src/base/bittorrent/torrenthandle.cpp

@@ -49,8 +49,6 @@
 #include <libtorrent/time.hpp>
 #endif
 
-#include <boost/bind.hpp>
-
 #ifdef Q_OS_WIN
 #include <windows.h>
 #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()

src/base/bittorrent/torrenthandle.h

@@ -30,6 +30,8 @@
 #ifndef BITTORRENT_TORRENTHANDLE_H
 #define BITTORRENT_TORRENTHANDLE_H
 
+#include <functional>
+
 #include <QDateTime>
 #include <QHash>
 #include <QObject>
@@ -44,8 +46,6 @@
 #include <libtorrent/torrent_status.hpp>
 #endif
 
-#include <boost/function.hpp>
-
 #include "base/tristatebool.h"
 #include "private/speedmonitor.h"
 #include "infohash.h"
@@ -383,7 +383,7 @@ namespace BitTorrent
         QVector<qreal> availableFileFractions() const;
 
     private:
-        typedef boost::function<void ()> EventTrigger;
+        typedef std::function<void ()> EventTrigger;
 
         void updateStatus();
         void updateStatus(const libtorrent::torrent_status &nativeStatus);

src/base/net/reverseresolution.cpp

@@ -28,9 +28,6 @@
 
 #include "reverseresolution.h"
 
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/version.hpp>
-
 #include <QDebug>
 #include <QHostInfo>
 #include <QString>