From e4a8e44701e7d893249b6c4b27d843ebf8008bcf Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Wed, 27 Dec 2023 12:49:36 +0100 Subject: [PATCH] refactor: Remove old AFV test server --- src/blackcore/data/globalsetup.cpp | 9 +++------ src/blackmisc/network/server.cpp | 8 -------- src/blackmisc/network/server.h | 3 --- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp index 6b223a21a..5126851cb 100644 --- a/src/blackcore/data/globalsetup.cpp +++ b/src/blackcore/data/globalsetup.cpp @@ -245,12 +245,9 @@ namespace BlackCore::Data CServerList CGlobalSetup::getPredefinedServersPlusHardcodedServers() const { static const CServerList hardcoded( - { - CServer::swiftFsdTestServer(), - CServer::fscFsdServer(), - CServer::esTowerView() - // CServer::afvFsdTestServer(), - }); + { CServer::swiftFsdTestServer(), + CServer::fscFsdServer(), + CServer::esTowerView() }); CServerList testServers(m_predefinedServers); testServers.addIfAddressNotExists(hardcoded); return testServers; diff --git a/src/blackmisc/network/server.cpp b/src/blackmisc/network/server.cpp index 71e6e8e6b..20a556063 100644 --- a/src/blackmisc/network/server.cpp +++ b/src/blackmisc/network/server.cpp @@ -79,14 +79,6 @@ namespace BlackMisc::Network return fsc; } - const CServer &CServer::afvFsdTestServer() - { - static const CServer afv("AFV testserver", "VATSIM AFV testserver", "afv-beta-fsd.vatsim.net", 6809, - CUser("OBF:AwLZ7f9hUmpSZhm4=", "OBF:AwJGiYV4GHQSMizchFk2=", "", ""), - CFsdSetup(), CVoiceSetup(), CEcosystem(CEcosystem::vatsim()), CServer::FSDServerVatsim); - return afv; - } - const CServer &CServer::esTowerView() { static const CServer s = CServer("ES Tower", "Euroscope Tower view", "localhost", 6809, diff --git a/src/blackmisc/network/server.h b/src/blackmisc/network/server.h index 1424286d2..bb60d49ae 100644 --- a/src/blackmisc/network/server.h +++ b/src/blackmisc/network/server.h @@ -214,9 +214,6 @@ namespace BlackMisc::Network //! FSC server static const CServer &fscFsdServer(); - //! The AFV test server - static const CServer &afvFsdTestServer(); - //! ES tower server static const CServer &esTowerView();