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

Added network to UNIT tests (needed for CUrl

Browse Source 
Other includes where needed
This commit is contained in:
Klaus Basan
2019-06-29 20:48:38 +02:00
committed by Mat Sutcliffe
parent 458daa4532
commit 74be3fa8c2
10 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackmisc/invoke.h
View File

@@ -14,6 +14,7 @@
#include <tuple>
#include "blackmisc/typetraits.h"
#include "blackmisc/integersequence.h"
#include <QtGlobal>
namespace BlackMisc
{
@@ -23,17 +24,17 @@ namespace BlackMisc
// Our own version of C++17 std::invoke().
template <typename F, typename T, typename = std::enable_if_t<std::is_member_object_pointer<F>::value>>
decltype(auto) invoke(F ptr, T &&object)
decltype(auto) invoke(F ptr, T && object)
{
return std::forward<T>(object).*ptr;
}
template <typename F, typename T, typename... Ts, typename = std::enable_if_t<std::is_member_function_pointer<F>::value>>
decltype(auto) invoke(F ptr, T &&object, Ts &&... args)
decltype(auto) invoke(F ptr, T && object, Ts && ... args)
{
return (std::forward<T>(object).*ptr)(std::forward<Ts>(args)...);
}
template <typename F, typename... Ts, typename = std::enable_if_t<! std::is_member_pointer<std::decay_t<F>>::value>>
decltype(auto) invoke(F &&func, Ts &&... args)
template < typename F, typename... Ts, typename = std::enable_if_t < ! std::is_member_pointer<std::decay_t<F>>::value >>
decltype(auto) invoke(F && func, Ts && ... args)
{
return std::forward<F>(func)(std::forward<Ts>(args)...);
}
@@ -54,7 +55,7 @@ namespace BlackMisc
template <typename F, typename T, typename... Ts>
decltype(auto) invokeSlot(F &&func, T *object, Ts &&... args)
{
using seq = MaskSequence<std::make_index_sequence<sizeof...(Ts)>, ! TIsQPrivateSignal<std::decay_t<Ts>>::value...>;
using seq = MaskSequence < std::make_index_sequence<sizeof...(Ts)>, ! TIsQPrivateSignal<std::decay_t<Ts>>::value... >;
return invokeSlotImpl(std::forward<F>(func), object, std::forward_as_tuple(std::forward<Ts>(args)...), seq(), std::is_member_pointer<std::decay_t<F>>());
}
@@ -62,4 +63,4 @@ namespace BlackMisc
//! \endcond
}
#endif
#endif

2
src/blackmisc/network/url.h
View File

@@ -11,11 +11,11 @@
#ifndef BLACKMISC_NETWORK_URL_H
#define BLACKMISC_NETWORK_URL_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/metaclass.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/valueobject.h"
#include "blackmisc/variant.h"
#include "blackmisc/blackmiscexport.h"
#include <QJsonObject>
#include <QMetaType>

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

@@ -153,7 +153,7 @@ namespace BlackWxPlugin
m_maxRange = range;
if (m_gribData.isEmpty())
{
if (!sApp->isInternetAccessible())
if (!sApp || !sApp->isInternetAccessible())
{
CLogMessage(this).error(u"No weather download since network/internet not accessible");
return;