From 302fe00805f152da810d9588a7d5c7780ad8ad27 Mon Sep 17 00:00:00 2001 From: Ted John Date: Fri, 27 Apr 2018 18:47:57 +0100 Subject: [PATCH] Always pass shared_ptr by reference --- src/openrct2-ui/UiContext.cpp | 4 ++-- src/openrct2-ui/UiContext.h | 2 +- .../drawing/engines/DrawingEngineFactory.hpp | 8 ++++---- .../engines/HardwareDisplayDrawingEngine.cpp | 4 ++-- .../drawing/engines/SoftwareDrawingEngine.cpp | 4 ++-- .../engines/opengl/OpenGLDrawingEngine.cpp | 4 ++-- src/openrct2-ui/input/KeyboardShortcuts.cpp | 2 +- src/openrct2-ui/input/KeyboardShortcuts.h | 2 +- src/openrct2/Context.cpp | 18 +++++++++--------- src/openrct2/Context.h | 6 +++--- src/openrct2/drawing/IDrawingEngine.h | 2 +- src/openrct2/drawing/X8DrawingEngine.cpp | 2 +- src/openrct2/drawing/X8DrawingEngine.h | 2 +- src/openrct2/network/Network.cpp | 6 +++--- src/openrct2/network/network.h | 4 ++-- src/openrct2/object/ObjectRepository.cpp | 4 ++-- src/openrct2/object/ObjectRepository.h | 2 +- src/openrct2/paint/Painter.cpp | 2 +- src/openrct2/paint/Painter.h | 2 +- src/openrct2/ride/TrackDesignRepository.cpp | 4 ++-- src/openrct2/ride/TrackDesignRepository.h | 2 +- src/openrct2/scenario/ScenarioRepository.cpp | 4 ++-- src/openrct2/scenario/ScenarioRepository.h | 2 +- src/openrct2/ui/DummyUiContext.cpp | 2 +- 24 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/openrct2-ui/UiContext.cpp b/src/openrct2-ui/UiContext.cpp index 6f16ce6715..7696ca05cb 100644 --- a/src/openrct2-ui/UiContext.cpp +++ b/src/openrct2-ui/UiContext.cpp @@ -94,7 +94,7 @@ private: public: InGameConsole& GetInGameConsole() { return _inGameConsole; } - explicit UiContext(std::shared_ptr env) + explicit UiContext(const std::shared_ptr& env) : _platformUiContext(CreatePlatformUiContext()), _windowManager(CreateWindowManager()), _keyboardShortcuts(env) @@ -803,7 +803,7 @@ private: } }; -std::unique_ptr OpenRCT2::Ui::CreateUiContext(std::shared_ptr env) +std::unique_ptr OpenRCT2::Ui::CreateUiContext(const std::shared_ptr& env) { return std::make_unique(env); } diff --git a/src/openrct2-ui/UiContext.h b/src/openrct2-ui/UiContext.h index 31708474c9..4aafb72ef7 100644 --- a/src/openrct2-ui/UiContext.h +++ b/src/openrct2-ui/UiContext.h @@ -44,7 +44,7 @@ namespace OpenRCT2 virtual std::string ShowDirectoryDialog(SDL_Window * window, const std::string &title) abstract; }; - std::unique_ptr CreateUiContext(std::shared_ptr env); + std::unique_ptr CreateUiContext(const std::shared_ptr& env); IPlatformUiContext * CreatePlatformUiContext(); InGameConsole& GetInGameConsole(); diff --git a/src/openrct2-ui/drawing/engines/DrawingEngineFactory.hpp b/src/openrct2-ui/drawing/engines/DrawingEngineFactory.hpp index ad17c06cdf..bcdb26fd07 100644 --- a/src/openrct2-ui/drawing/engines/DrawingEngineFactory.hpp +++ b/src/openrct2-ui/drawing/engines/DrawingEngineFactory.hpp @@ -28,16 +28,16 @@ namespace OpenRCT2 interface IUiContext; - std::unique_ptr CreateSoftwareDrawingEngine(std::shared_ptr uiContext); - std::unique_ptr CreateHardwareDisplayDrawingEngine(std::shared_ptr uiContext); + std::unique_ptr CreateSoftwareDrawingEngine(const std::shared_ptr& uiContext); + std::unique_ptr CreateHardwareDisplayDrawingEngine(const std::shared_ptr& uiContext); #ifndef DISABLE_OPENGL - std::unique_ptr CreateOpenGLDrawingEngine(std::shared_ptr uiContext); + std::unique_ptr CreateOpenGLDrawingEngine(const std::shared_ptr& uiContext); #endif class DrawingEngineFactory final : public IDrawingEngineFactory { public: - std::unique_ptr Create(DRAWING_ENGINE_TYPE type, std::shared_ptr uiContext) override + std::unique_ptr Create(DRAWING_ENGINE_TYPE type, const std::shared_ptr& uiContext) override { switch ((sint32)type) { case DRAWING_ENGINE_SOFTWARE: diff --git a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp index 1e826d29b7..b999d41ce1 100644 --- a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp @@ -60,7 +60,7 @@ private: bool smoothNN = false; public: - explicit HardwareDisplayDrawingEngine(std::shared_ptr uiContext) + explicit HardwareDisplayDrawingEngine(const std::shared_ptr& uiContext) : X8DrawingEngine(uiContext), _uiContext(uiContext) { @@ -415,7 +415,7 @@ private: } }; -std::unique_ptr OpenRCT2::Ui::CreateHardwareDisplayDrawingEngine(std::shared_ptr uiContext) +std::unique_ptr OpenRCT2::Ui::CreateHardwareDisplayDrawingEngine(const std::shared_ptr& uiContext) { return std::make_unique(uiContext); } diff --git a/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp index 5ff72c6050..50c41c2f58 100644 --- a/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp @@ -39,7 +39,7 @@ private: SDL_Palette * _palette = nullptr; public: - explicit SoftwareDrawingEngine(std::shared_ptr uiContext) + explicit SoftwareDrawingEngine(const std::shared_ptr& uiContext) : X8DrawingEngine(uiContext), _uiContext(uiContext) { @@ -163,7 +163,7 @@ private: } }; -std::unique_ptr OpenRCT2::Ui::CreateSoftwareDrawingEngine(std::shared_ptr uiContext) +std::unique_ptr OpenRCT2::Ui::CreateSoftwareDrawingEngine(const std::shared_ptr& uiContext) { return std::make_unique(uiContext); } diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp index 3d981adbfe..a9929c0206 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp @@ -144,7 +144,7 @@ public: SDL_Color Palette[256]; vec4 GLPalette[256]; - explicit OpenGLDrawingEngine(std::shared_ptr uiContext) + explicit OpenGLDrawingEngine(const std::shared_ptr& uiContext) : _uiContext(uiContext) { _window = (SDL_Window *)_uiContext->GetWindow(); @@ -419,7 +419,7 @@ private: } }; -std::unique_ptr OpenRCT2::Ui::CreateOpenGLDrawingEngine(std::shared_ptr uiContext) +std::unique_ptr OpenRCT2::Ui::CreateOpenGLDrawingEngine(const std::shared_ptr& uiContext) { return std::make_unique(uiContext); } diff --git a/src/openrct2-ui/input/KeyboardShortcuts.cpp b/src/openrct2-ui/input/KeyboardShortcuts.cpp index 2c05711a45..41f2372518 100644 --- a/src/openrct2-ui/input/KeyboardShortcuts.cpp +++ b/src/openrct2-ui/input/KeyboardShortcuts.cpp @@ -32,7 +32,7 @@ using namespace OpenRCT2::Input; // Remove when the C calls are removed static KeyboardShortcuts * _instance; -KeyboardShortcuts::KeyboardShortcuts(std::shared_ptr env) +KeyboardShortcuts::KeyboardShortcuts(const std::shared_ptr& env) : _env(env) { _instance = this; diff --git a/src/openrct2-ui/input/KeyboardShortcuts.h b/src/openrct2-ui/input/KeyboardShortcuts.h index acd50b1247..7c7df5893b 100644 --- a/src/openrct2-ui/input/KeyboardShortcuts.h +++ b/src/openrct2-ui/input/KeyboardShortcuts.h @@ -124,7 +124,7 @@ namespace OpenRCT2 uint16 _keys[SHORTCUT_COUNT]; public: - KeyboardShortcuts(std::shared_ptr env); + KeyboardShortcuts(const std::shared_ptr& env); void Reset(); bool Load(); diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 78dd2837d0..1d52cedca6 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -119,9 +119,9 @@ namespace OpenRCT2 public: Context( - std::shared_ptr env, - std::shared_ptr audioContext, - std::shared_ptr uiContext) + const std::shared_ptr& env, + const std::shared_ptr& audioContext, + const std::shared_ptr& uiContext) : _env(env), _audioContext(audioContext), _uiContext(uiContext), @@ -931,9 +931,9 @@ namespace OpenRCT2 } PlainContext( - std::shared_ptr env, - std::shared_ptr audioContext, - std::shared_ptr uiContext) + const std::shared_ptr& env, + const std::shared_ptr& audioContext, + const std::shared_ptr& uiContext) : Context(env, audioContext, uiContext), _env(env), _audioContext(audioContext), @@ -950,9 +950,9 @@ namespace OpenRCT2 } std::unique_ptr CreateContext( - std::shared_ptr env, - std::shared_ptr audioContext, - std::shared_ptr uiContext) + const std::shared_ptr& env, + const std::shared_ptr& audioContext, + const std::shared_ptr& uiContext) { return std::make_unique(env, audioContext, uiContext); } diff --git a/src/openrct2/Context.h b/src/openrct2/Context.h index 9f8f151acb..b5252e413f 100644 --- a/src/openrct2/Context.h +++ b/src/openrct2/Context.h @@ -120,9 +120,9 @@ namespace OpenRCT2 std::unique_ptr CreateContext(); std::unique_ptr CreateContext( - std::shared_ptr env, - std::shared_ptr audioContext, - std::shared_ptr uiContext); + const std::shared_ptr& env, + const std::shared_ptr& audioContext, + const std::shared_ptr& uiContext); IContext * GetContext(); } // namespace OpenRCT2 diff --git a/src/openrct2/drawing/IDrawingEngine.h b/src/openrct2/drawing/IDrawingEngine.h index 755dfbe335..490545fc96 100644 --- a/src/openrct2/drawing/IDrawingEngine.h +++ b/src/openrct2/drawing/IDrawingEngine.h @@ -80,7 +80,7 @@ namespace OpenRCT2::Drawing interface IDrawingEngineFactory { virtual ~IDrawingEngineFactory() { } - virtual std::unique_ptr Create(DRAWING_ENGINE_TYPE type, std::shared_ptr uiContext) abstract; + virtual std::unique_ptr Create(DRAWING_ENGINE_TYPE type, const std::shared_ptr& uiContext) abstract; }; interface IRainDrawer diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp index 252a01b5e2..c5aa68a3f7 100644 --- a/src/openrct2/drawing/X8DrawingEngine.cpp +++ b/src/openrct2/drawing/X8DrawingEngine.cpp @@ -133,7 +133,7 @@ void X8RainDrawer::Restore() #pragma GCC diagnostic ignored "-Wsuggest-final-methods" #endif -X8DrawingEngine::X8DrawingEngine(std::shared_ptr uiContext) +X8DrawingEngine::X8DrawingEngine(const std::shared_ptr& uiContext) { _drawingContext = new X8DrawingContext(this); #ifdef __ENABLE_LIGHTFX__ diff --git a/src/openrct2/drawing/X8DrawingEngine.h b/src/openrct2/drawing/X8DrawingEngine.h index f0aecb24b0..737633ff48 100644 --- a/src/openrct2/drawing/X8DrawingEngine.h +++ b/src/openrct2/drawing/X8DrawingEngine.h @@ -91,7 +91,7 @@ namespace OpenRCT2 X8DrawingContext * _drawingContext; public: - explicit X8DrawingEngine(std::shared_ptr uiContext); + explicit X8DrawingEngine(const std::shared_ptr& uiContext); ~X8DrawingEngine() override; void Initialise() override; diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index cd86316fda..648dea1d7e 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -142,7 +142,7 @@ Network::~Network() CloseConnection(); } -void Network::SetEnvironment(std::shared_ptr env) +void Network::SetEnvironment(const std::shared_ptr& env) { _env = env; } @@ -2545,7 +2545,7 @@ void Network::Client_Handle_GAMEINFO(NetworkConnection& connection, NetworkPacke network_chat_show_server_greeting(); } -void network_set_env(std::shared_ptr env) +void network_set_env(const std::shared_ptr& env) { gNetwork.SetEnvironment(env); } @@ -3327,7 +3327,7 @@ sint32 network_get_pickup_peep_old_x(uint8 playerid) { return _pickup_peep_old_x void network_send_chat(const char* text) {} void network_send_password(const char* password) {} void network_close() {} -void network_set_env(std::shared_ptr) {} +void network_set_env(const std::shared_ptr&) {} void network_shutdown_client() {} void network_set_password(const char* password) {} uint8 network_get_current_player_id() { return 0; } diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index 2b9fe070ee..e0eb279dce 100644 --- a/src/openrct2/network/network.h +++ b/src/openrct2/network/network.h @@ -89,7 +89,7 @@ class Network public: Network(); ~Network(); - void SetEnvironment(std::shared_ptr env); + void SetEnvironment(const std::shared_ptr& env); bool Init(); void Close(); bool BeginClient(const char* host, uint16 port); @@ -301,7 +301,7 @@ private: #endif /* DISABLE_NETWORK */ -void network_set_env(std::shared_ptr env); +void network_set_env(const std::shared_ptr& env); void network_close(); void network_shutdown_client(); sint32 network_begin_client(const char *host, sint32 port); diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index 3ef73ebd5b..c71b860787 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -215,7 +215,7 @@ class ObjectRepository final : public IObjectRepository ObjectEntryMap _itemMap; public: - explicit ObjectRepository(std::shared_ptr env) + explicit ObjectRepository(const std::shared_ptr& env) : _env(env), _fileIndex(*this, *env) { @@ -639,7 +639,7 @@ private: } }; -IObjectRepository * CreateObjectRepository(std::shared_ptr env) +IObjectRepository * CreateObjectRepository(const std::shared_ptr& env) { return new ObjectRepository(env); } diff --git a/src/openrct2/object/ObjectRepository.h b/src/openrct2/object/ObjectRepository.h index 1d71b20e02..9798710bb4 100644 --- a/src/openrct2/object/ObjectRepository.h +++ b/src/openrct2/object/ObjectRepository.h @@ -83,7 +83,7 @@ interface IObjectRepository virtual void WritePackedObjects(IStream * stream, std::vector &objects) abstract; }; -IObjectRepository * CreateObjectRepository(std::shared_ptr env); +IObjectRepository * CreateObjectRepository(const std::shared_ptr& env); bool IsObjectCustom(const ObjectRepositoryItem * object); diff --git a/src/openrct2/paint/Painter.cpp b/src/openrct2/paint/Painter.cpp index 0d2dcea379..550debda9c 100644 --- a/src/openrct2/paint/Painter.cpp +++ b/src/openrct2/paint/Painter.cpp @@ -34,7 +34,7 @@ using namespace OpenRCT2::Drawing; using namespace OpenRCT2::Paint; using namespace OpenRCT2::Ui; -Painter::Painter(std::shared_ptr uiContext) +Painter::Painter(const std::shared_ptr& uiContext) : _uiContext(uiContext) { } diff --git a/src/openrct2/paint/Painter.h b/src/openrct2/paint/Painter.h index 28cd451166..2e73c9de69 100644 --- a/src/openrct2/paint/Painter.h +++ b/src/openrct2/paint/Painter.h @@ -45,7 +45,7 @@ namespace OpenRCT2 sint32 _frames = 0; public: - explicit Painter(std::shared_ptr uiContext); + explicit Painter(const std::shared_ptr& uiContext); void Paint(Drawing::IDrawingEngine& de); private: diff --git a/src/openrct2/ride/TrackDesignRepository.cpp b/src/openrct2/ride/TrackDesignRepository.cpp index 97bf9d756f..36d7de2202 100644 --- a/src/openrct2/ride/TrackDesignRepository.cpp +++ b/src/openrct2/ride/TrackDesignRepository.cpp @@ -143,7 +143,7 @@ private: std::vector _items; public: - explicit TrackDesignRepository(std::shared_ptr env) + explicit TrackDesignRepository(const std::shared_ptr& env) : _env(env), _fileIndex(*env) { @@ -398,7 +398,7 @@ private: } }; -ITrackDesignRepository * CreateTrackDesignRepository(std::shared_ptr env) +ITrackDesignRepository * CreateTrackDesignRepository(const std::shared_ptr& env) { return new TrackDesignRepository(env); } diff --git a/src/openrct2/ride/TrackDesignRepository.h b/src/openrct2/ride/TrackDesignRepository.h index 7426f149d4..40b83e762a 100644 --- a/src/openrct2/ride/TrackDesignRepository.h +++ b/src/openrct2/ride/TrackDesignRepository.h @@ -52,7 +52,7 @@ interface ITrackDesignRepository virtual std::string Install(const std::string &path) abstract; }; -ITrackDesignRepository * CreateTrackDesignRepository(std::shared_ptr env); +ITrackDesignRepository * CreateTrackDesignRepository(const std::shared_ptr& env); std::string GetNameFromTrackPath(const std::string &path); void track_repository_scan(); diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp index a7ab09d2b2..ba8d09be91 100644 --- a/src/openrct2/scenario/ScenarioRepository.cpp +++ b/src/openrct2/scenario/ScenarioRepository.cpp @@ -329,7 +329,7 @@ private: std::vector _highscores; public: - explicit ScenarioRepository(std::shared_ptr env) + explicit ScenarioRepository(const std::shared_ptr& env) : _env(env), _fileIndex(*env) { @@ -730,7 +730,7 @@ private: static ScenarioRepository * _scenarioRepository; -IScenarioRepository * CreateScenarioRepository(std::shared_ptr env) +IScenarioRepository * CreateScenarioRepository(const std::shared_ptr& env) { _scenarioRepository = new ScenarioRepository(env); return _scenarioRepository; diff --git a/src/openrct2/scenario/ScenarioRepository.h b/src/openrct2/scenario/ScenarioRepository.h index 5baea19768..f1aed054e6 100644 --- a/src/openrct2/scenario/ScenarioRepository.h +++ b/src/openrct2/scenario/ScenarioRepository.h @@ -78,7 +78,7 @@ interface IScenarioRepository virtual bool TryRecordHighscore(sint32 language, const utf8 * scenarioFileName, money32 companyValue, const utf8 * name) abstract; }; -IScenarioRepository * CreateScenarioRepository(std::shared_ptr env); +IScenarioRepository * CreateScenarioRepository(const std::shared_ptr& env); IScenarioRepository * GetScenarioRepository(); void scenario_repository_scan(); diff --git a/src/openrct2/ui/DummyUiContext.cpp b/src/openrct2/ui/DummyUiContext.cpp index 3040b47752..036b81b60e 100644 --- a/src/openrct2/ui/DummyUiContext.cpp +++ b/src/openrct2/ui/DummyUiContext.cpp @@ -68,7 +68,7 @@ namespace OpenRCT2::Ui class X8DrawingEngineFactory final : public IDrawingEngineFactory { - std::unique_ptr Create(DRAWING_ENGINE_TYPE type, std::shared_ptr uiContext) override + std::unique_ptr Create(DRAWING_ENGINE_TYPE type, const std::shared_ptr& uiContext) override { return std::make_unique(uiContext); }