Browse Source

Cleanup

adaptive-webui-19844
Chocobo1 8 years ago committed by sledgehammer999
parent
commit
eba45a0b26
No known key found for this signature in database
GPG Key ID: 6E4A2D025B7CC9A2
  1. 33
      src/webui/btjson.cpp

33
src/webui/btjson.cpp

@ -29,28 +29,31 @@
*/ */
#include "btjson.h" #include "btjson.h"
#include "base/logger.h"
#include "base/utils/misc.h"
#include "base/utils/fs.h"
#include "base/preferences.h"
#include "base/bittorrent/session.h"
#include "base/bittorrent/sessionstatus.h"
#include "base/bittorrent/torrenthandle.h"
#include "base/bittorrent/trackerentry.h"
#include "base/bittorrent/peerinfo.h"
#include "base/torrentfilter.h"
#include "base/net/geoipmanager.h"
#include "jsonutils.h"
#include <QDebug> #include <QDebug>
#include <QVariant> #include <QVariant>
#ifndef QBT_USES_QT5 #ifndef QBT_USES_QT5
#include <QMetaType> #include <QMetaType>
#endif #endif
#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0) #if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
#include <QElapsedTimer> #include <QElapsedTimer>
#endif #endif
#include "base/bittorrent/session.h"
#include "base/bittorrent/sessionstatus.h"
#include "base/bittorrent/peerinfo.h"
#include "base/bittorrent/torrenthandle.h"
#include "base/bittorrent/trackerentry.h"
#include "base/logger.h"
#include "base/net/geoipmanager.h"
#include "base/preferences.h"
#include "base/torrentfilter.h"
#include "base/utils/fs.h"
#include "base/utils/misc.h"
#include "jsonutils.h"
#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0) #if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
#define CACHED_VARIABLE(VARTYPE, VAR, DUR) \ #define CACHED_VARIABLE(VARTYPE, VAR, DUR) \
@ -740,9 +743,9 @@ QByteArray btjson::getTorrentsRatesLimits(QStringList &hashes, bool downloadLimi
QVariantMap toMap(BitTorrent::TorrentHandle *const torrent) QVariantMap toMap(BitTorrent::TorrentHandle *const torrent)
{ {
QVariantMap ret; QVariantMap ret;
ret[KEY_TORRENT_HASH] = QString(torrent->hash()); ret[KEY_TORRENT_HASH] = QString(torrent->hash());
ret[KEY_TORRENT_NAME] = torrent->name(); ret[KEY_TORRENT_NAME] = torrent->name();
ret[KEY_TORRENT_SIZE] = torrent->wantedSize(); ret[KEY_TORRENT_SIZE] = torrent->wantedSize();
ret[KEY_TORRENT_PROGRESS] = torrent->progress(); ret[KEY_TORRENT_PROGRESS] = torrent->progress();
ret[KEY_TORRENT_DLSPEED] = torrent->downloadPayloadRate(); ret[KEY_TORRENT_DLSPEED] = torrent->downloadPayloadRate();
ret[KEY_TORRENT_UPSPEED] = torrent->uploadPayloadRate(); ret[KEY_TORRENT_UPSPEED] = torrent->uploadPayloadRate();

Loading…
Cancel
Save