diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt index cba9ce9c0..1a736ede2 100644 --- a/src/base/CMakeLists.txt +++ b/src/base/CMakeLists.txt @@ -9,7 +9,6 @@ bittorrent/infohash.h bittorrent/magneturi.h bittorrent/peerinfo.h bittorrent/private/bandwidthscheduler.h -bittorrent/private/libtorrentfwd.h bittorrent/private/filterparserthread.h bittorrent/private/portforwarderimpl.h bittorrent/private/resumedatasavingmanager.h diff --git a/src/base/base.pri b/src/base/base.pri index 791217f26..f5a0b025d 100644 --- a/src/base/base.pri +++ b/src/base/base.pri @@ -9,7 +9,6 @@ HEADERS += \ $$PWD/bittorrent/peerinfo.h \ $$PWD/bittorrent/private/bandwidthscheduler.h \ $$PWD/bittorrent/private/filterparserthread.h \ - $$PWD/bittorrent/private/libtorrentfwd.h \ $$PWD/bittorrent/private/portforwarderimpl.h \ $$PWD/bittorrent/private/resumedatasavingmanager.h \ $$PWD/bittorrent/private/speedmonitor.h \ diff --git a/src/base/bittorrent/private/libtorrentfwd.h b/src/base/bittorrent/private/libtorrentfwd.h deleted file mode 100644 index 5bbaf9ff1..000000000 --- a/src/base/bittorrent/private/libtorrentfwd.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Bittorrent Client using Qt and libtorrent. - * Copyright (C) 2019 Vladimir Golovnev - * - * 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. - */ - -#pragma once - -#include - -#if (LIBTORRENT_VERSION_NUM < 10200) -namespace libtorrent -{ - class entry; - class session; - struct ip_filter; - struct settings_pack; - struct torrent_handle; - - class alert; - struct add_torrent_alert; - struct external_ip_alert; - struct fastresume_rejected_alert; - struct file_completed_alert; - struct file_error_alert; - struct file_rename_failed_alert; - struct file_renamed_alert; - struct listen_failed_alert; - struct listen_succeeded_alert; - struct metadata_received_alert; - struct peer_ban_alert; - struct peer_blocked_alert; - struct portmap_alert; - struct portmap_error_alert; - struct save_resume_data_alert; - struct save_resume_data_failed_alert; - struct session_stats_alert; - struct state_update_alert; - struct stats_alert; - struct storage_moved_alert; - struct storage_moved_failed_alert; - struct torrent_alert; - struct torrent_checked_alert; - struct torrent_delete_failed_alert; - struct torrent_deleted_alert; - struct torrent_finished_alert; - struct torrent_paused_alert; - struct torrent_removed_alert; - struct torrent_resumed_alert; - struct tracker_error_alert; - struct tracker_reply_alert; - struct tracker_warning_alert; - struct url_seed_alert; -} - -namespace lt = libtorrent; -#else -#include -#endif diff --git a/src/base/bittorrent/private/portforwarderimpl.h b/src/base/bittorrent/private/portforwarderimpl.h index 4889abe67..aa6527814 100644 --- a/src/base/bittorrent/private/portforwarderimpl.h +++ b/src/base/bittorrent/private/portforwarderimpl.h @@ -29,10 +29,13 @@ #pragma once #include + +#include +#include + #include #include "base/net/portforwarder.h" -#include "libtorrentfwd.h" #if (LIBTORRENT_VERSION_NUM < 10200) using LTPortMapping = int; diff --git a/src/base/bittorrent/session.h b/src/base/bittorrent/session.h index 55d73bd1c..d2c91b7e8 100644 --- a/src/base/bittorrent/session.h +++ b/src/base/bittorrent/session.h @@ -32,6 +32,8 @@ #include +#include + #include #include #include @@ -43,7 +45,6 @@ #include "base/settingvalue.h" #include "base/tristatebool.h" #include "base/types.h" -#include "private/libtorrentfwd.h" #include "addtorrentparams.h" #include "cachestatus.h" #include "sessionstatus.h" diff --git a/src/base/bittorrent/torrenthandle.h b/src/base/bittorrent/torrenthandle.h index f7b9c8519..725ff24f6 100644 --- a/src/base/bittorrent/torrenthandle.h +++ b/src/base/bittorrent/torrenthandle.h @@ -32,6 +32,7 @@ #include +#include #include #include @@ -42,7 +43,6 @@ #include #include -#include "private/libtorrentfwd.h" #include "private/speedmonitor.h" #include "downloadpriority.h" #include "infohash.h" diff --git a/src/base/bittorrent/torrentinfo.h b/src/base/bittorrent/torrentinfo.h index bedefd2b9..207736954 100644 --- a/src/base/bittorrent/torrentinfo.h +++ b/src/base/bittorrent/torrentinfo.h @@ -29,6 +29,7 @@ #ifndef BITTORRENT_TORRENTINFO_H #define BITTORRENT_TORRENTINFO_H +#include #include #include @@ -37,7 +38,6 @@ #include #include "base/indexrange.h" -#include "private/libtorrentfwd.h" class QByteArray; class QDateTime;