1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 15:24:30 +01:00

Use unique_ptr and shared_ptr for services in Context

This commit is contained in:
Ted John
2018-04-20 22:16:37 +01:00
parent bece5e5429
commit 529c744276
19 changed files with 79 additions and 88 deletions

View File

@@ -166,7 +166,7 @@ public:
size_t GetCountForObjectEntry(uint8 rideType, const std::string &entry) const override
{
size_t count = 0;
const IObjectRepository * repo = GetContext()->GetObjectRepository();
const auto repo = GetContext()->GetObjectRepository();
for (const auto &item : _items)
{
@@ -195,7 +195,7 @@ public:
size_t GetCountForRideGroup(uint8 rideType, const RideGroup * rideGroup) const override
{
size_t count = 0;
const IObjectRepository * repo = GetContext()->GetObjectRepository();
const auto repo = GetContext()->GetObjectRepository();
for (const auto &item : _items)
{
@@ -227,7 +227,7 @@ public:
std::vector<track_design_file_ref> GetItemsForObjectEntry(uint8 rideType, const std::string &entry) const override
{
std::vector<track_design_file_ref> refs;
const IObjectRepository * repo = GetContext()->GetObjectRepository();
const auto repo = GetContext()->GetObjectRepository();
for (const auto &item : _items)
{
@@ -260,7 +260,7 @@ public:
std::vector<track_design_file_ref> GetItemsForRideGroup(uint8 rideType, const RideGroup * rideGroup) const override
{
std::vector<track_design_file_ref> refs;
const IObjectRepository * repo = GetContext()->GetObjectRepository();
const auto repo = GetContext()->GetObjectRepository();
for (const auto &item : _items)
{
@@ -398,9 +398,9 @@ private:
}
};
ITrackDesignRepository * CreateTrackDesignRepository(const std::shared_ptr<IPlatformEnvironment>& env)
std::unique_ptr<ITrackDesignRepository> CreateTrackDesignRepository(const std::shared_ptr<IPlatformEnvironment>& env)
{
return new TrackDesignRepository(env);
return std::make_unique<TrackDesignRepository>(env);
}
void track_repository_scan()