Code clean up

This commit is contained in:
Christophe Dumez 2012-02-16 21:04:02 +02:00
parent 16071ec266
commit de4559659d
2 changed files with 10 additions and 9 deletions

View file

@ -92,14 +92,6 @@ public:
return tmp.join("/");
}
static inline libtorrent::sha1_hash QStringToSha1(const QString& s) {
std::string str(s.toLocal8Bit().data());
std::istringstream i(str);
libtorrent::sha1_hash x;
i>>x;
return x;
}
static inline QString file_extension(const QString &filename) {
QString extension;
int point_index = filename.lastIndexOf(".");

View file

@ -90,6 +90,15 @@ const qreal QBtSession::MAX_RATIO = 9999.;
const int MAX_TRACKER_ERRORS = 2;
/* Converts a QString hash into a libtorrent sha1_hash */
static libtorrent::sha1_hash QStringToSha1(const QString& s) {
QByteArray raw = s.toAscii();
Q_ASSERT(raw.size() == 40);
libtorrent::sha1_hash ret;
from_hex(raw.constData(), 40, (char*)&ret[0]);
return ret;
}
// Main constructor
QBtSession::QBtSession()
: m_scanFolders(ScanFoldersModel::instance(this)),
@ -718,7 +727,7 @@ void QBtSession::useAlternativeSpeedsLimit(bool alternative) {
// Return the torrent handle, given its hash
QTorrentHandle QBtSession::getTorrentHandle(const QString &hash) const{
return QTorrentHandle(s->find_torrent(misc::QStringToSha1(hash)));
return QTorrentHandle(s->find_torrent(QStringToSha1(hash)));
}
bool QBtSession::hasActiveTorrents() const {