Create header for common BitTorrent declarations

src/base/CMakeLists.txt

@@ -7,6 +7,7 @@ add_library(qbt_base STATIC
     bittorrent/addtorrentparams.h
     bittorrent/bandwidthscheduler.h
     bittorrent/cachestatus.h
+    bittorrent/common.h
     bittorrent/customstorage.h
     bittorrent/downloadpriority.h
     bittorrent/filterparserthread.h

src/base/base.pri

@@ -4,6 +4,7 @@ HEADERS += \
     $$PWD/bittorrent/addtorrentparams.h \
     $$PWD/bittorrent/bandwidthscheduler.h \
     $$PWD/bittorrent/cachestatus.h \
+    $$PWD/bittorrent/common.h \
     $$PWD/bittorrent/customstorage.h \
     $$PWD/bittorrent/downloadpriority.h \
     $$PWD/bittorrent/filterparserthread.h \

src/base/bittorrent/common.h

@@ -0,0 +1,34 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2020  Vladimir Golovnev <glassez@yandex.ru>
+ *
+ * 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 <QString>
+
+// TODO: Make it inline in C++17
+extern const QString QB_EXT;

src/base/bittorrent/customstorage.cpp

@@ -34,8 +34,7 @@
 #include <QDir>
 
 #include "base/utils/fs.h"
-
-extern const QString QB_EXT {QStringLiteral(".!qB")};
+#include "common.h"
 
 lt::storage_interface *customStorageConstructor(const lt::storage_params &params, lt::file_pool &pool)
 {

src/base/bittorrent/session.cpp

@@ -94,6 +94,7 @@
 #include "base/utils/net.h"
 #include "base/utils/random.h"
 #include "bandwidthscheduler.h"
+#include "common.h"
 #include "customstorage.h"
 #include "filterparserthread.h"
 #include "ltunderlyingtype.h"

src/base/bittorrent/torrenthandle.cpp

@@ -31,8 +31,6 @@
 
 #include <type_traits>
 
-const QString QB_EXT {QStringLiteral(".!qB")};
-
 namespace BitTorrent
 {
     uint qHash(const BitTorrent::TorrentState key, const uint seed)

src/base/bittorrent/torrenthandle.h

@@ -40,8 +40,6 @@ class QDateTime;
 class QStringList;
 class QUrl;
 
-extern const QString QB_EXT;
-
 namespace BitTorrent
 {
     enum class DownloadPriority;

src/base/bittorrent/torrenthandleimpl.cpp

@@ -65,6 +65,7 @@
 #include "base/tristatebool.h"
 #include "base/utils/fs.h"
 #include "base/utils/string.h"
+#include "common.h"
 #include "downloadpriority.h"
 #include "ltunderlyingtype.h"
 #include "peeraddress.h"
@@ -72,6 +73,8 @@
 #include "session.h"
 #include "trackerentry.h"
 
+const QString QB_EXT {QStringLiteral(".!qB")};
+
 using namespace BitTorrent;
 
 #if (LIBTORRENT_VERSION_NUM >= 10200)

src/base/utils/fs.cpp

@@ -58,7 +58,7 @@
 #include <QStorageInfo>
 #include <QRegularExpression>
 
-#include "base/bittorrent/torrenthandle.h"
+#include "base/bittorrent/common.h"
 #include "base/global.h"
 
 QString Utils::Fs::toNativePath(const QString &path)

src/gui/previewselectdialog.cpp

@@ -36,6 +36,7 @@
 #include <QStandardItemModel>
 #include <QTableView>
 
+#include "base/bittorrent/common.h"
 #include "base/bittorrent/torrenthandle.h"
 #include "base/preferences.h"
 #include "base/utils/fs.h"

src/gui/torrentcontentmodelfile.cpp

@@ -28,7 +28,7 @@
 
 #include "torrentcontentmodelfile.h"
 
-#include "base/bittorrent/torrenthandle.h"
+#include "base/bittorrent/common.h"
 #include "torrentcontentmodelfolder.h"
 
 TorrentContentModelFile::TorrentContentModelFile(const QString &fileName, qulonglong fileSize,

src/gui/torrentcontentmodelfolder.cpp

@@ -30,7 +30,7 @@
 
 #include <QVariant>
 
-#include "base/bittorrent/torrenthandle.h"
+#include "base/bittorrent/common.h"
 #include "base/global.h"
 
 TorrentContentModelFolder::TorrentContentModelFolder(const QString &name, TorrentContentModelFolder *parent)

src/gui/torrentcontenttreeview.cpp

@@ -37,6 +37,7 @@
 #include <QTableView>
 #include <QThread>
 
+#include "base/bittorrent/common.h"
 #include "base/bittorrent/session.h"
 #include "base/bittorrent/torrenthandle.h"
 #include "base/bittorrent/torrentinfo.h"

src/webui/api/torrentscontroller.cpp

@@ -39,6 +39,7 @@
 #include <QRegularExpression>
 #include <QUrl>
 
+#include "base/bittorrent/common.h"
 #include "base/bittorrent/downloadpriority.h"
 #include "base/bittorrent/infohash.h"
 #include "base/bittorrent/peeraddress.h"