diff --git a/src/bandwidthscheduler.h b/src/qtlibtorrent/bandwidthscheduler.h similarity index 100% rename from src/bandwidthscheduler.h rename to src/qtlibtorrent/bandwidthscheduler.h diff --git a/src/qtlibtorrent/qbtsession.h b/src/qtlibtorrent/qbtsession.h index 5a7aea4dd..f42212c36 100644 --- a/src/qtlibtorrent/qbtsession.h +++ b/src/qtlibtorrent/qbtsession.h @@ -46,7 +46,9 @@ #include #include #include + #include "qtorrenthandle.h" +#include "trackerinfos.h" using namespace libtorrent; @@ -59,35 +61,6 @@ class HttpServer; class BandwidthScheduler; class ScanFoldersModel; -class TrackerInfos { -public: - QString name_or_url; - QString last_message; - unsigned long num_peers; -#if LIBTORRENT_VERSION_MINOR < 15 - bool verified; - uint fail_count; -#endif - - //TrackerInfos() {} - TrackerInfos(const TrackerInfos &b) { - name_or_url = b.name_or_url; - Q_ASSERT(!name_or_url.isEmpty()); - last_message = b.last_message; - num_peers = b.num_peers; -#if LIBTORRENT_VERSION_MINOR < 15 - verified = b.verified; - fail_count = b.fail_count; -#endif - } - TrackerInfos(QString name_or_url): name_or_url(name_or_url), last_message(""), num_peers(0) { -#if LIBTORRENT_VERSION_MINOR < 15 - fail_count = 0; - verified = false; -#endif - } -}; - class Bittorrent : public QObject { Q_OBJECT diff --git a/src/qtlibtorrent/qtlibtorrent.pri b/src/qtlibtorrent/qtlibtorrent.pri index daaa762f3..dcb6e17b8 100644 --- a/src/qtlibtorrent/qtlibtorrent.pri +++ b/src/qtlibtorrent/qtlibtorrent.pri @@ -1,7 +1,9 @@ INCLUDEPATH += $$PWD HEADERS += $$PWD/qbtsession.h \ - $$PWD/qtorrenthandle.h + $$PWD/qtorrenthandle.h \ + $$PWD/bandwidthscheduler.h \ + $$PWD/trackerinfos.h SOURCES += $$PWD/qbtsession.cpp \ $$PWD/qtorrenthandle.cpp diff --git a/src/qtlibtorrent/trackerinfos.h b/src/qtlibtorrent/trackerinfos.h new file mode 100644 index 000000000..127c80de0 --- /dev/null +++ b/src/qtlibtorrent/trackerinfos.h @@ -0,0 +1,65 @@ +/* + * Bittorrent Client using Qt4 and libtorrent. + * Copyright (C) 2010 Christophe Dumez + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * In addition, as a special exception, the copyright holders give permission to + * link this program with the OpenSSL project's "OpenSSL" library (or with + * modified versions of it that use the same license as the "OpenSSL" library), + * and distribute the linked executables. You must obey the GNU General Public + * License in all respects for all of the code used other than "OpenSSL". If you + * modify file(s), you may extend this exception to your version of the file(s), + * but you are not obligated to do so. If you do not wish to do so, delete this + * exception statement from your version. + * + * Contact : chris@qbittorrent.org + */ + +#ifndef TRACKERINFOS_H +#define TRACKERINFOS_H + +#include + +class TrackerInfos { +public: + QString name_or_url; + QString last_message; + unsigned long num_peers; +#if LIBTORRENT_VERSION_MINOR < 15 + bool verified; + uint fail_count; +#endif + + //TrackerInfos() {} + TrackerInfos(const TrackerInfos &b) { + name_or_url = b.name_or_url; + Q_ASSERT(!name_or_url.isEmpty()); + last_message = b.last_message; + num_peers = b.num_peers; +#if LIBTORRENT_VERSION_MINOR < 15 + verified = b.verified; + fail_count = b.fail_count; +#endif + } + TrackerInfos(QString name_or_url): name_or_url(name_or_url), last_message(""), num_peers(0) { +#if LIBTORRENT_VERSION_MINOR < 15 + fail_count = 0; + verified = false; +#endif + } +}; + +#endif // TRACKERINFOS_H diff --git a/src/src.pro b/src/src.pro index d70277de1..dcaa562c2 100644 --- a/src/src.pro +++ b/src/src.pro @@ -280,7 +280,6 @@ HEADERS += misc.h \ torrentpersistentdata.h \ filesystemwatcher.h \ preferences.h \ - bandwidthscheduler.h \ scannedfoldersmodel.h \ qinisettings.h \ smtp.h