flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-23 23:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use CApplication::isNetworkAccessible() wherever possible

Browse Source 
Up to now we had a mixture of different methods to detect whether
network is connected, accessible or both. Even if they implied a
different meaning, they were all doing the same and internally
referred to almost the same code. Almost, since our implementation
of CNetworkUtils::hasConnectedInterface refers to code from Qt 4.4.
However, all of them returned a boolean status whether a network
interface is generally up or not. Instead of maintaining our own
version, use Qt functions.

refs #869
This commit is contained in:
Roland Winklmeier
2017-01-24 14:08:38 +01:00
committed by Mathew Sutcliffe
parent 10f9c9c50a
commit 64a47da67f
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/application.cpp
View File

@@ -539,7 +539,7 @@ namespace BlackCore
QNetworkReply *CApplication::postToNetwork(const QNetworkRequest &request, QHttpMultiPart *multiPart, const CSlot<void(QNetworkReply *)> &callback)
{
if (!this->isNetworkConnectedAndAccessible()) { return nullptr; }
if (!this->isNetworkAccessible()) { return nullptr; }
if (QThread::currentThread() != this->m_accessManager.thread())
{
multiPart->moveToThread(this->m_accessManager.thread());
@@ -1176,7 +1176,7 @@ namespace BlackCore
QNetworkReply *CApplication::httpRequestImpl(const QNetworkRequest &request, const BlackMisc::CSlot<void (QNetworkReply *)> &callback, int maxRedirects, std::function<QNetworkReply *(QNetworkAccessManager &, const QNetworkRequest &)> requestOrPostMethod)
{
if (this->m_shutdown) { return nullptr; }
if (!this->isNetworkConnectedAndAccessible()) { return nullptr; }
if (!this->isNetworkAccessible()) { return nullptr; }
QWriteLocker locker(&m_accessManagerLock);
Q_ASSERT_X(QCoreApplication::instance()->thread() == m_accessManager.thread(), Q_FUNC_INFO, "Network manager supposed to be in main thread");
if (QThread::currentThread() != this->m_accessManager.thread())

2
src/blackcore/setupreader.cpp
View File

@@ -197,7 +197,7 @@ namespace BlackCore
CStatusMessageList CSetupReader::triggerReadSetup()
{
if (this->m_shutdown) { return CStatusMessage(this, CStatusMessage::SeverityError, "shutdown"); }
if (!CNetworkUtils::hasConnectedInterface())
if (!sApp->isNetworkAccessible())
{
const CStatusMessage m(this, CStatusMessage::SeverityError,
"No network, cancelled reading of setup");

2
src/blackcore/threadedreader.cpp
View File

@@ -71,7 +71,7 @@ namespace BlackCore
bool CThreadedReader::isNetworkConnectedAndAccessible() const
{
return sApp->isNetworkConnectedAndAccessible();
return sApp->isNetworkAccessible();
}
void CThreadedReader::gracefulShutdown()

2
src/plugins/weatherdata/gfs/weatherdatagfs.cpp
View File

@@ -65,7 +65,7 @@ namespace BlackWxPlugin
m_maxRange = range;
if (m_gribData.isEmpty())
{
if (!sApp->isNetworkConnectedAndAccessible())
if (!sApp->isNetworkAccessible())
{
CLogMessage(this).error("No weather download since network not accessible");
return;

2
src/swiftguistandard/swiftguistdinit.cpp
View File

@@ -153,7 +153,7 @@ void SwiftGuiStd::init()
this->m_init = true;
QTimer::singleShot(2500, this, &SwiftGuiStd::ps_verifyDataAvailability);
if (!CNetworkUtils::hasConnectedInterface())
if (!sGui->isNetworkAccessible())
{
CLogMessage(this).error("No network interface, software will not work properly");
}