d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-08 12:54:27 +00:00
Code Issues Projects Releases Wiki Activity

Fix deprecation warnings with libtorrent v0.15

Browse Source
This commit is contained in:
Christophe Dumez 2010-04-06 16:52:17 +00:00
parent 9824d86a3c
commit a6abedd67d
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/bittorrent.cpp
View File

@ -151,7 +151,9 @@ session_proxy Bittorrent::asyncDeletion() {
qDebug("Bittorrent session async deletion IN"); qDebug("Bittorrent session async deletion IN");
exiting = true; exiting = true;
// Do some BT related saving // Do some BT related saving
#ifndef LIBTORRENT_0_15
saveDHTEntry(); saveDHTEntry();
#endif
saveSessionState(); saveSessionState();
saveFastResumeData(); saveFastResumeData();
// Delete session // Delete session
@ -166,7 +168,9 @@ Bittorrent::~Bittorrent() {
qDebug("BTSession destructor IN"); qDebug("BTSession destructor IN");
if(!exiting) { if(!exiting) {
// Do some BT related saving // Do some BT related saving
#ifndef LIBTORRENT_0_15
saveDHTEntry(); saveDHTEntry();
#endif
saveSessionState(); saveSessionState();
saveFastResumeData(); saveFastResumeData();
// Delete session // Delete session
@ -1328,28 +1332,54 @@ void Bittorrent::enableLSD(bool b) {
void Bittorrent::loadSessionState() { void Bittorrent::loadSessionState() {
const QString state_path = misc::cacheLocation()+QDir::separator()+QString::fromUtf8("ses_state"); const QString state_path = misc::cacheLocation()+QDir::separator()+QString::fromUtf8("ses_state");
#ifdef LIBTORRENT_0_15
std::vector<char> in;
if (load_file(state_path.toLocal8Bit().constData(), in) == 0)
{
lazy_entry e;
if (lazy_bdecode(&in[0], &in[0] + in.size(), e) == 0)
s->load_state(e);
}
#else
boost::filesystem::ifstream ses_state_file(state_path.toLocal8Bit().constData() boost::filesystem::ifstream ses_state_file(state_path.toLocal8Bit().constData()
, std::ios_base::binary); , std::ios_base::binary);
ses_state_file.unsetf(std::ios_base::skipws); ses_state_file.unsetf(std::ios_base::skipws);
s->load_state(bdecode( s->load_state(bdecode(
std::istream_iterator<char>(ses_state_file) std::istream_iterator<char>(ses_state_file)
, std::istream_iterator<char>())); , std::istream_iterator<char>()));
#endif
} }
void Bittorrent::saveSessionState() { void Bittorrent::saveSessionState() {
qDebug("Saving session state to disk..."); qDebug("Saving session state to disk...");
entry session_state = s->state();
const QString state_path = misc::cacheLocation()+QDir::separator()+QString::fromUtf8("ses_state"); const QString state_path = misc::cacheLocation()+QDir::separator()+QString::fromUtf8("ses_state");
#ifdef LIBTORRENT_0_15
entry session_state;
s->save_state(session_state);
std::vector<char> out;
bencode(std::back_inserter(out), session_state);
file f;
error_code ec;
if (f.open(state_path.toLocal8Bit().data(), file::write_only, ec)) {
if (ec) {
file::iovec_t b = {&out[0], out.size()};
f.writev(0, &b, 1, ec);
}
}
#else
entry session_state = s->state();
boost::filesystem::ofstream out(state_path.toLocal8Bit().constData() boost::filesystem::ofstream out(state_path.toLocal8Bit().constData()
, std::ios_base::binary); , std::ios_base::binary);
out.unsetf(std::ios_base::skipws); out.unsetf(std::ios_base::skipws);
bencode(std::ostream_iterator<char>(out), session_state); bencode(std::ostream_iterator<char>(out), session_state);
#endif
} }
// Enable DHT // Enable DHT
bool Bittorrent::enableDHT(bool b) { bool Bittorrent::enableDHT(bool b) {
if(b) { if(b) {
if(!DHTEnabled) { if(!DHTEnabled) {
#ifndef LIBTORRENT_0_15
entry dht_state; entry dht_state;
const QString dht_state_path = misc::cacheLocation()+QDir::separator()+QString::fromUtf8("dht_state"); const QString dht_state_path = misc::cacheLocation()+QDir::separator()+QString::fromUtf8("dht_state");
if(QFile::exists(dht_state_path)) { if(QFile::exists(dht_state_path)) {
@ -1359,8 +1389,13 @@ bool Bittorrent::enableDHT(bool b) {
dht_state = bdecode(std::istream_iterator<char>(dht_state_file), std::istream_iterator<char>()); dht_state = bdecode(std::istream_iterator<char>(dht_state_file), std::istream_iterator<char>());
}catch (std::exception&) {} }catch (std::exception&) {}
} }
#endif
try { try {
#ifdef LIBTORRENT_0_15
s->start_dht();
#else
s->start_dht(dht_state); s->start_dht(dht_state);
#endif
s->add_dht_router(std::make_pair(std::string("router.bittorrent.com"), 6881)); s->add_dht_router(std::make_pair(std::string("router.bittorrent.com"), 6881));
s->add_dht_router(std::make_pair(std::string("router.utorrent.com"), 6881)); s->add_dht_router(std::make_pair(std::string("router.utorrent.com"), 6881));
s->add_dht_router(std::make_pair(std::string("router.bitcomet.com"), 6881)); s->add_dht_router(std::make_pair(std::string("router.bitcomet.com"), 6881));
@ -2281,6 +2316,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
return sessionStatus.payload_upload_rate; return sessionStatus.payload_upload_rate;
} }
#ifndef LIBTORRENT_0_15
// Save DHT entry to hard drive // Save DHT entry to hard drive
void Bittorrent::saveDHTEntry() { void Bittorrent::saveDHTEntry() {
// Save DHT entry // Save DHT entry
@ -2297,6 +2333,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
} }
} }
} }
#endif
void Bittorrent::applyEncryptionSettings(pe_settings se) { void Bittorrent::applyEncryptionSettings(pe_settings se) {
qDebug("Applying encryption settings"); qDebug("Applying encryption settings");

2
src/bittorrent.h
View File

@ -135,7 +135,9 @@ public slots:
void resumeTorrent(QString hash); void resumeTorrent(QString hash);
void resumeAllTorrents(); void resumeAllTorrents();
/* End Web UI */ /* End Web UI */
#ifndef LIBTORRENT_0_15
void saveDHTEntry(); void saveDHTEntry();
#endif
void preAllocateAllFiles(bool b); void preAllocateAllFiles(bool b);
void saveFastResumeData(); void saveFastResumeData();
void enableIPFilter(QString filter); void enableIPFilter(QString filter);