Browse Source

Refactor

Add const
Use Qt5 connect syntax
adaptive-webui-19844
Chocobo1 7 years ago
parent
commit
1b652c882e
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 15
      src/base/bittorrent/session.cpp

15
src/base/bittorrent/session.cpp

@ -369,10 +369,10 @@ Session::Session(QObject *parent)
m_seedingLimitTimer = new QTimer(this); m_seedingLimitTimer = new QTimer(this);
m_seedingLimitTimer->setInterval(10000); m_seedingLimitTimer->setInterval(10000);
connect(m_seedingLimitTimer, SIGNAL(timeout()), SLOT(processShareLimits())); connect(m_seedingLimitTimer, &QTimer::timeout, this, &Session::processShareLimits);
// Set severity level of libtorrent session // Set severity level of libtorrent session
int alertMask = libt::alert::error_notification const int alertMask = libt::alert::error_notification
| libt::alert::peer_notification | libt::alert::peer_notification
| libt::alert::port_mapping_notification | libt::alert::port_mapping_notification
| libt::alert::storage_notification | libt::alert::storage_notification
@ -380,8 +380,7 @@ Session::Session(QObject *parent)
| libt::alert::status_notification | libt::alert::status_notification
| libt::alert::ip_block_notification | libt::alert::ip_block_notification
| libt::alert::progress_notification | libt::alert::progress_notification
| libt::alert::stats_notification | libt::alert::stats_notification;
;
#if LIBTORRENT_VERSION_NUM < 10100 #if LIBTORRENT_VERSION_NUM < 10100
libt::fingerprint fingerprint(PEER_ID, QBT_VERSION_MAJOR, QBT_VERSION_MINOR, QBT_VERSION_BUGFIX, QBT_VERSION_BUILD); libt::fingerprint fingerprint(PEER_ID, QBT_VERSION_MAJOR, QBT_VERSION_MINOR, QBT_VERSION_BUGFIX, QBT_VERSION_BUILD);
@ -417,7 +416,7 @@ Session::Session(QObject *parent)
dispatchAlerts(alertPtr.release()); dispatchAlerts(alertPtr.release());
}); });
#else #else
std::string peerId = libt::generate_fingerprint(PEER_ID, QBT_VERSION_MAJOR, QBT_VERSION_MINOR, QBT_VERSION_BUGFIX, QBT_VERSION_BUILD); const std::string peerId = libt::generate_fingerprint(PEER_ID, QBT_VERSION_MAJOR, QBT_VERSION_MINOR, QBT_VERSION_BUGFIX, QBT_VERSION_BUILD);
libt::settings_pack pack; libt::settings_pack pack;
pack.set_int(libt::settings_pack::alert_mask, alertMask); pack.set_int(libt::settings_pack::alert_mask, alertMask);
pack.set_str(libt::settings_pack::peer_fingerprint, peerId); pack.set_str(libt::settings_pack::peer_fingerprint, peerId);
@ -496,13 +495,13 @@ Session::Session(QObject *parent)
m_refreshTimer = new QTimer(this); m_refreshTimer = new QTimer(this);
m_refreshTimer->setInterval(refreshInterval()); m_refreshTimer->setInterval(refreshInterval());
connect(m_refreshTimer, SIGNAL(timeout()), SLOT(refresh())); connect(m_refreshTimer, &QTimer::timeout, this, &Session::refresh);
m_refreshTimer->start(); m_refreshTimer->start();
// Regular saving of fastresume data // Regular saving of fastresume data
m_resumeDataTimer = new QTimer(this); m_resumeDataTimer = new QTimer(this);
m_resumeDataTimer->setInterval(saveResumeDataInterval() * 60 * 1000); m_resumeDataTimer->setInterval(saveResumeDataInterval() * 60 * 1000);
connect(m_resumeDataTimer, SIGNAL(timeout()), SLOT(generateResumeData())); connect(m_resumeDataTimer, &QTimer::timeout, this, [this]() { generateResumeData(); });
m_statistics = new Statistics(this); m_statistics = new Statistics(this);
@ -522,7 +521,7 @@ Session::Session(QObject *parent)
m_ioThread = new QThread(this); m_ioThread = new QThread(this);
m_resumeDataSavingManager = new ResumeDataSavingManager(m_resumeFolderPath); m_resumeDataSavingManager = new ResumeDataSavingManager(m_resumeFolderPath);
m_resumeDataSavingManager->moveToThread(m_ioThread); m_resumeDataSavingManager->moveToThread(m_ioThread);
connect(m_ioThread, SIGNAL(finished()), m_resumeDataSavingManager, SLOT(deleteLater())); connect(m_ioThread, &QThread::finished, m_resumeDataSavingManager, &QObject::deleteLater);
m_ioThread->start(); m_ioThread->start();
m_resumeDataTimer->start(); m_resumeDataTimer->start();

Loading…
Cancel
Save