From aa7fb358391e70963fb2a67c8d990f473293f605 Mon Sep 17 00:00:00 2001
From: Hielke Morsink <hielke.morsink@gmail.com>
Date: Fri, 30 Mar 2018 14:32:12 +0200
Subject: [PATCH] Remove use of 'using namespace' from headers

---
 src/openrct2/actions/BannerSetNameAction.hpp          | 2 --
 src/openrct2/actions/ParkMarketingAction.hpp          | 4 +---
 src/openrct2/actions/ParkSetLoanAction.hpp            | 4 +---
 src/openrct2/actions/ParkSetNameAction.hpp            | 2 --
 src/openrct2/actions/ParkSetResearchFundingAction.hpp | 4 +---
 src/openrct2/actions/RideSetName.hpp                  | 4 +---
 src/openrct2/actions/SignSetNameAction.hpp            | 2 --
 src/openrct2/actions/StaffSetColourAction.hpp         | 2 --
 8 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/openrct2/actions/BannerSetNameAction.hpp b/src/openrct2/actions/BannerSetNameAction.hpp
index 9a54ac9d80..e7b61c0b18 100644
--- a/src/openrct2/actions/BannerSetNameAction.hpp
+++ b/src/openrct2/actions/BannerSetNameAction.hpp
@@ -26,8 +26,6 @@
 #include "../windows/Intent.h"
 #include "GameAction.h"
 
-using namespace OpenRCT2;
-
 struct BannerSetNameAction : public GameActionBase<GAME_COMMAND_SET_BANNER_NAME, GameActionResult>
 {
 private:
diff --git a/src/openrct2/actions/ParkMarketingAction.hpp b/src/openrct2/actions/ParkMarketingAction.hpp
index 4e53f8fa45..b0bb1ae6ef 100644
--- a/src/openrct2/actions/ParkMarketingAction.hpp
+++ b/src/openrct2/actions/ParkMarketingAction.hpp
@@ -28,8 +28,6 @@
 #include "../world/Park.h"
 #include "GameAction.h"
 
-using namespace OpenRCT2;
-
 struct ParkMarketingAction : public GameActionBase<GAME_COMMAND_START_MARKETING_CAMPAIGN, GameActionResult>
 {
 private:
@@ -78,7 +76,7 @@ public:
         gMarketingCampaignRideIndex[_type] = _item;
 
         // We are only interested in invalidating the finances (marketing) window
-        auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
+        auto windowManager = OpenRCT2::GetContext()->GetUiContext()->GetWindowManager();
         windowManager->BroadcastIntent(Intent(INTENT_ACTION_UPDATE_CASH));
 
         return CreateResult();
diff --git a/src/openrct2/actions/ParkSetLoanAction.hpp b/src/openrct2/actions/ParkSetLoanAction.hpp
index 7b87733a72..78580c7b91 100644
--- a/src/openrct2/actions/ParkSetLoanAction.hpp
+++ b/src/openrct2/actions/ParkSetLoanAction.hpp
@@ -25,8 +25,6 @@
 #include "../windows/Intent.h"
 #include "GameAction.h"
 
-using namespace OpenRCT2;
-
 struct ParkSetLoanAction : public GameActionBase<GAME_COMMAND_SET_CURRENT_LOAN, GameActionResult>
 {
 private:
@@ -76,7 +74,7 @@ public:
         gCash -= (gBankLoan - _value);
         gBankLoan = _value;
 
-        auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
+        auto windowManager = OpenRCT2::GetContext()->GetUiContext()->GetWindowManager();
         windowManager->BroadcastIntent(Intent(INTENT_ACTION_UPDATE_CASH));
         return MakeResult();
     }
diff --git a/src/openrct2/actions/ParkSetNameAction.hpp b/src/openrct2/actions/ParkSetNameAction.hpp
index dc876a4933..0e9cd59a91 100644
--- a/src/openrct2/actions/ParkSetNameAction.hpp
+++ b/src/openrct2/actions/ParkSetNameAction.hpp
@@ -24,8 +24,6 @@
 #include "../world/Park.h"
 #include "GameAction.h"
 
-using namespace OpenRCT2;
-
 struct ParkSetNameAction : public GameActionBase<GAME_COMMAND_SET_PARK_NAME, GameActionResult>
 {
 private:
diff --git a/src/openrct2/actions/ParkSetResearchFundingAction.hpp b/src/openrct2/actions/ParkSetResearchFundingAction.hpp
index d8a6d91e3a..0510ad8728 100644
--- a/src/openrct2/actions/ParkSetResearchFundingAction.hpp
+++ b/src/openrct2/actions/ParkSetResearchFundingAction.hpp
@@ -25,8 +25,6 @@
 #include "../windows/Intent.h"
 #include "GameAction.h"
 
-using namespace OpenRCT2;
-
 struct ParkSetResearchFundingAction : public GameActionBase<GAME_COMMAND_SET_RESEARCH_FUNDING, GameActionResult>
 {
 private:
@@ -67,7 +65,7 @@ public:
         gResearchPriorities = _priorities;
         gResearchFundingLevel = _fundingAmount;
 
-        auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
+        auto windowManager = OpenRCT2::GetContext()->GetUiContext()->GetWindowManager();
         windowManager->BroadcastIntent(Intent(INTENT_ACTION_UPDATE_RESEARCH));
         return MakeResult();
     }
diff --git a/src/openrct2/actions/RideSetName.hpp b/src/openrct2/actions/RideSetName.hpp
index b83df58b16..329faaa659 100644
--- a/src/openrct2/actions/RideSetName.hpp
+++ b/src/openrct2/actions/RideSetName.hpp
@@ -27,8 +27,6 @@
 #include "../world/Park.h"
 #include "GameAction.h"
 
-using namespace OpenRCT2;
-
 struct RideSetNameAction : public GameActionBase<GAME_COMMAND_SET_RIDE_NAME, GameActionResult>
 {
 private:
@@ -97,7 +95,7 @@ public:
         gfx_invalidate_screen();
 
         // Refresh windows that display ride name
-        auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
+        auto windowManager = OpenRCT2::GetContext()->GetUiContext()->GetWindowManager();
         windowManager->BroadcastIntent(Intent(INTENT_ACTION_REFRESH_RIDE_LIST));
         windowManager->BroadcastIntent(Intent(INTENT_ACTION_REFRESH_GUEST_LIST));
 
diff --git a/src/openrct2/actions/SignSetNameAction.hpp b/src/openrct2/actions/SignSetNameAction.hpp
index f911cd85b8..e5440d2e68 100644
--- a/src/openrct2/actions/SignSetNameAction.hpp
+++ b/src/openrct2/actions/SignSetNameAction.hpp
@@ -24,8 +24,6 @@
 #include "../world/Banner.h"
 #include "GameAction.h"
 
-using namespace OpenRCT2;
-
 struct SignSetNameAction : public GameActionBase<GAME_COMMAND_SET_SIGN_NAME, GameActionResult>
 {
 private:
diff --git a/src/openrct2/actions/StaffSetColourAction.hpp b/src/openrct2/actions/StaffSetColourAction.hpp
index 8f93e8d2ba..9ea2144b6c 100644
--- a/src/openrct2/actions/StaffSetColourAction.hpp
+++ b/src/openrct2/actions/StaffSetColourAction.hpp
@@ -27,8 +27,6 @@
 #include "../world/Sprite.h"
 #include "GameAction.h"
 
-using namespace OpenRCT2;
-
 struct StaffSetColourAction : public GameActionBase<GAME_COMMAND_SET_STAFF_COLOUR, GameActionResult>
 {
 private: