Ref T286, moved server settings into "network" namespace (not VATSIM specific)

This commit is contained in:
Klaus Basan
2018-07-03 19:40:47 +02:00
parent 2da0186dd2
commit a2bca21715
6 changed files with 72 additions and 43 deletions

View File

@@ -24,38 +24,6 @@ namespace BlackCore
{
namespace Vatsim
{
/*!
* Virtual air traffic servers
*/
struct TTrafficServers : public BlackMisc::TSettingTrait<BlackMisc::Network::CServerList>
{
//! \copydoc BlackMisc::TSettingTrait::key
static const char *key() { return "network/trafficservers"; }
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("Traffic servers"); return name; }
};
/*!
* Currently selected virtual air traffic server
*/
struct TCurrentTrafficServer : public BlackMisc::TSettingTrait<BlackMisc::Network::CServer>
{
//! \copydoc BlackMisc::TSettingTrait::key
static const char *key() { return "network/currenttrafficserver"; }
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("Current traffic servers"); return name; }
//! \copydoc BlackMisc::TSettingTrait::defaultValue
static const BlackMisc::Network::CServer &defaultValue()
{
using namespace BlackMisc::Network;
static const CServer dv = CServer::swiftFsdTestServer();
return dv;
}
};
/*!
* Settings used with readers
*/
@@ -104,7 +72,7 @@ namespace BlackCore
static const CReaderSettings &neverUpdateSettings();
private:
BlackMisc::PhysicalQuantities::CTime m_initialTime { 30.0, BlackMisc::PhysicalQuantities::CTimeUnit::s()};
BlackMisc::PhysicalQuantities::CTime m_initialTime { 30.0, BlackMisc::PhysicalQuantities::CTimeUnit::s()};
BlackMisc::PhysicalQuantities::CTime m_periodicTime { 30.0, BlackMisc::PhysicalQuantities::CTimeUnit::s()};
bool m_neverUpdate = false;