From b5cf65cefafe742b419100d882d5e390ca47877d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 28 Sep 2018 05:03:12 +0200 Subject: [PATCH] Ref T376, renamed server settings file --- src/blackcore/context/contextownaircraftimpl.h | 2 +- src/blackcore/data/networksetup.h | 2 +- src/blackgui/components/copysettingsandcachescomponent.h | 2 +- src/blackgui/components/settingsnetworkserverscomponent.h | 2 +- .../network/settings/{servers.h => serversettings.h} | 7 ++++--- 5 files changed, 8 insertions(+), 7 deletions(-) rename src/blackmisc/network/settings/{servers.h => serversettings.h} (94%) diff --git a/src/blackcore/context/contextownaircraftimpl.h b/src/blackcore/context/contextownaircraftimpl.h index c8a159449..ea20f2188 100644 --- a/src/blackcore/context/contextownaircraftimpl.h +++ b/src/blackcore/context/contextownaircraftimpl.h @@ -16,7 +16,7 @@ #include "blackcore/context/contextownaircraft.h" #include "blackcore/corefacadeconfig.h" #include "blackcore/vatsim/vatsimsettings.h" -#include "blackmisc/network/settings/servers.h" +#include "blackmisc/network/settings/serversettings.h" #include "blackmisc/network/user.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/ownaircraftprovider.h" diff --git a/src/blackcore/data/networksetup.h b/src/blackcore/data/networksetup.h index d2059f8dd..2688b4f39 100644 --- a/src/blackcore/data/networksetup.h +++ b/src/blackcore/data/networksetup.h @@ -16,7 +16,7 @@ #include "blackcore/data/vatsimsetup.h" #include "blackcore/blackcoreexport.h" #include "blackmisc/network/data/lastserver.h" -#include "blackmisc/network/settings/servers.h" +#include "blackmisc/network/settings/serversettings.h" #include "blackmisc/network/serverlist.h" #include "blackmisc/settingscache.h" #include "blackmisc/metaclass.h" diff --git a/src/blackgui/components/copysettingsandcachescomponent.h b/src/blackgui/components/copysettingsandcachescomponent.h index bdc5b3e22..3e25e66ea 100644 --- a/src/blackgui/components/copysettingsandcachescomponent.h +++ b/src/blackgui/components/copysettingsandcachescomponent.h @@ -28,7 +28,7 @@ #include "blackmisc/simulation/settings/simulatorsettings.h" #include "blackmisc/simulation/settings/modelsettings.h" #include "blackmisc/network/data/lastserver.h" -#include "blackmisc/network/settings/servers.h" +#include "blackmisc/network/settings/serversettings.h" #include "blackmisc/directories.h" #include "blackmisc/applicationinfo.h" diff --git a/src/blackgui/components/settingsnetworkserverscomponent.h b/src/blackgui/components/settingsnetworkserverscomponent.h index c3d49fed9..077ca4837 100644 --- a/src/blackgui/components/settingsnetworkserverscomponent.h +++ b/src/blackgui/components/settingsnetworkserverscomponent.h @@ -14,7 +14,7 @@ #include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h" -#include "blackmisc/network/settings/servers.h" +#include "blackmisc/network/settings/serversettings.h" #include #include #include diff --git a/src/blackmisc/network/settings/servers.h b/src/blackmisc/network/settings/serversettings.h similarity index 94% rename from src/blackmisc/network/settings/servers.h rename to src/blackmisc/network/settings/serversettings.h index b3048dae6..05880f3d7 100644 --- a/src/blackmisc/network/settings/servers.h +++ b/src/blackmisc/network/settings/serversettings.h @@ -9,12 +9,13 @@ //! \file -#ifndef BLACKMISC_NETWORK_SETTINGS_SERVERS_H -#define BLACKMISC_NETWORK_SETTINGS_SERVERS_H +#ifndef BLACKMISC_NETWORK_SETTINGS_SERVERSSETTINGS_H +#define BLACKMISC_NETWORK_SETTINGS_SERVERSSETTINGS_H +#include "blackmisc/network/serverlist.h" #include "blackmisc/settingscache.h" #include "blackmisc/valueobject.h" -#include "blackmisc/network/serverlist.h" + namespace BlackMisc {