squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-18 06:28:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14593 from glassez/qt6-compat

Browse Source 
Make current codebase more compatible with Qt6
This commit is contained in:
Vladimir Golovnev
2021-03-29 14:00:23 +03:00
committed by GitHub
parent 48d532777a cd7bdc8998
commit 2d1c34d8e0
12 changed files with 48 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/base/bittorrent/session.cpp
View File

@@ -58,7 +58,9 @@
#include <QFile>
#include <QHostAddress>
#include <QNetworkAddressEntry>
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
#include <QNetworkConfigurationManager>
#endif
#include <QNetworkInterface>
#include <QRegularExpression>
#include <QString>
@@ -95,7 +97,6 @@
#include "statistics.h"
#include "torrentimpl.h"
#include "tracker.h"
#include "trackerentry.h"
using namespace BitTorrent;
@@ -444,7 +445,9 @@ Session::Session(QObject *parent)
, m_statistics {new Statistics {this}}
, m_ioThread {new QThread {this}}
, m_recentErroredTorrentsTimer {new QTimer {this}}
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
, m_networkManager {new QNetworkConfigurationManager {this}}
#endif
{
if (port() < 0)
m_port = Utils::Random::rand(1024, 65535);
@@ -485,11 +488,13 @@ Session::Session(QObject *parent)
, &Net::ProxyConfigurationManager::proxyConfigurationChanged
, this, &Session::configureDeferred);
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
// Network configuration monitor
connect(m_networkManager, &QNetworkConfigurationManager::onlineStateChanged, this, &Session::networkOnlineStateChanged);
connect(m_networkManager, &QNetworkConfigurationManager::configurationAdded, this, &Session::networkConfigurationChange);
connect(m_networkManager, &QNetworkConfigurationManager::configurationRemoved, this, &Session::networkConfigurationChange);
connect(m_networkManager, &QNetworkConfigurationManager::configurationChanged, this, &Session::networkConfigurationChange);
#endif
m_fileSearcher = new FileSearcher;
m_fileSearcher->moveToThread(m_ioThread);
@@ -2413,6 +2418,7 @@ void Session::setTempPath(QString path)
torrent->handleTempPathChanged();
}
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
void Session::networkOnlineStateChanged(const bool online)
{
LogMsg(tr("System network status changed to %1", "e.g: System network status changed to ONLINE").arg(online ? tr("ONLINE") : tr("OFFLINE")), Log::INFO);
@@ -2433,6 +2439,7 @@ void Session::networkConfigurationChange(const QNetworkConfiguration &cfg)
configureListeningInterface();
}
}
#endif
QStringList Session::getListeningIPs() const
{