mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 00:04:43 +01:00
Code Issues Releases Wiki Activity

Merge pull request #15249 from Broxzier/feature/make_ptr

Browse Source 
Refactor use of std::unique_ptr
This commit is contained in:
Michael Steenbeek
2021-08-21 21:50:42 +02:00
committed by GitHub
parent 7b3258b17e be4159f9ac
commit 95111047b0
13 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2-ui/scripting/ScTitleSequence.hpp
View File

@@ -11,7 +11,6 @@
#ifdef ENABLE_SCRIPTING
# include <memory>
# include <openrct2/Context.h>
# include <openrct2/Game.h>
# include <openrct2/OpenRCT2.h>
@@ -209,7 +208,7 @@ namespace OpenRCT2::Scripting
try
{
auto& objectMgr = GetContext()->GetObjectManager();
auto parkImporter = std::unique_ptr<IParkImporter>(ParkImporter::Create(handle->HintPath));
auto parkImporter = ParkImporter::Create(handle->HintPath);
auto result = parkImporter->LoadFromStream(handle->Stream.get(), isScenario);
objectMgr.LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
parkImporter->Import();

2
src/openrct2-ui/windows/TitleEditor.cpp
View File

@@ -351,7 +351,7 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
try
{
auto& objectMgr = OpenRCT2::GetContext()->GetObjectManager();
auto parkImporter = std::unique_ptr<IParkImporter>(ParkImporter::Create(handle->HintPath));
auto parkImporter = ParkImporter::Create(handle->HintPath);
auto result = parkImporter->LoadFromStream(handle->Stream.get(), isScenario);
objectMgr.LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
parkImporter->Import();

2
src/openrct2/CmdlineSprite.cpp
View File

@@ -185,7 +185,7 @@ bool SpriteFile::Save(const utf8* path)
static bool SpriteImageExport(const rct_g1_element& spriteElement, const char* outPath)
{
const auto pixelBufferSize = spriteElement.width * spriteElement.height;
std::unique_ptr<uint8_t[]> pixelBuffer(new uint8_t[pixelBufferSize]);
auto pixelBuffer = std::make_unique<uint8_t[]>(pixelBufferSize);
auto pixels = pixelBuffer.get();
std::fill_n(pixels, pixelBufferSize, 0x00);

2
src/openrct2/Context.cpp
View File

@@ -524,7 +524,7 @@ namespace OpenRCT2
{
drawingEngine->Initialise();
drawingEngine->SetVSync(gConfigGeneral.use_vsync);
_drawingEngine = std::unique_ptr<IDrawingEngine>(std::move(drawingEngine));
_drawingEngine = std::move(drawingEngine);
}
catch (const std::exception& ex)
{

3
src/openrct2/cmdline/RootCommands.cpp
View File

@@ -26,7 +26,6 @@
#include <ctime>
#include <iterator>
#include <memory>
#include <string>
#ifdef USE_BREAKPAD
@@ -406,7 +405,7 @@ static exitcode_t HandleCommandScanObjects([[maybe_unused]] CommandLineArgEnumer
gOpenRCT2Headless = true;
gOpenRCT2NoGraphics = true;
auto context = std::unique_ptr<OpenRCT2::IContext>(OpenRCT2::CreateContext());
auto context = OpenRCT2::CreateContext();
auto env = context->GetPlatformEnvironment();
auto objectRepository = CreateObjectRepository(env);
objectRepository->Construct(gConfigGeneral.language);

8
src/openrct2/config/Config.cpp
View File

@@ -37,8 +37,6 @@
#include "IniReader.hpp"
#include "IniWriter.hpp"
#include <memory>
using namespace OpenRCT2;
using namespace OpenRCT2::Ui;
@@ -565,7 +563,7 @@ namespace Config
{
try
{
auto reader = std::unique_ptr<IIniReader>(CreateDefaultIniReader());
auto reader = CreateDefaultIniReader();
ReadGeneral(reader.get());
ReadInterface(reader.get());
ReadSound(reader.get());
@@ -586,7 +584,7 @@ namespace Config
try
{
auto fs = FileStream(path, FILE_MODE_OPEN);
auto reader = std::unique_ptr<IIniReader>(CreateIniReader(&fs));
auto reader = CreateIniReader(&fs);
ReadGeneral(reader.get());
ReadInterface(reader.get());
ReadSound(reader.get());
@@ -610,7 +608,7 @@ namespace Config
Path::CreateDirectory(directory);
auto fs = FileStream(path, FILE_MODE_WRITE);
auto writer = std::unique_ptr<IIniWriter>(CreateIniWriter(&fs));
auto writer = CreateIniWriter(&fs);
WriteGeneral(writer.get());
WriteInterface(writer.get());
WriteSound(writer.get());

2
src/openrct2/core/DataSerialiserTraits.h
View File

@@ -284,7 +284,7 @@ template<> struct DataSerializerTraits_t<OpenRCT2::MemoryStream>
uint32_t length = 0;
s.decode(stream, length);
std::unique_ptr<uint8_t[]> buf(new uint8_t[length]);
auto buf = std::make_unique<uint8_t[]>(length);
stream->Read(buf.get(), length);
val.Write(buf.get(), length);

13
src/openrct2/localisation/LanguagePack.cpp
View File

@@ -20,6 +20,7 @@
#include "Localisation.h"
#include <algorithm>
#include <memory>
#include <string>
#include <vector>
@@ -62,7 +63,7 @@ private:
ScenarioOverride* _currentScenarioOverride = nullptr;
public:
static LanguagePack* FromFile(uint16_t id, const utf8* path)
static std::unique_ptr<LanguagePack> FromFile(uint16_t id, const utf8* path)
{
Guard::ArgumentNotNull(path);
@@ -90,15 +91,15 @@ public:
}
// Parse the memory as text
LanguagePack* result = FromText(id, fileData);
auto result = FromText(id, fileData);
Memory::Free(fileData);
return result;
}
static LanguagePack* FromText(uint16_t id, const utf8* text)
static std::unique_ptr<LanguagePack> FromText(uint16_t id, const utf8* text)
{
return new LanguagePack(id, text);
return std::make_unique<LanguagePack>(id, text);
}
LanguagePack(uint16_t id, const utf8* text)
@@ -579,13 +580,13 @@ private:
namespace LanguagePackFactory
{
ILanguagePack* FromFile(uint16_t id, const utf8* path)
std::unique_ptr<ILanguagePack> FromFile(uint16_t id, const utf8* path)
{
auto languagePack = LanguagePack::FromFile(id, path);
return languagePack;
}
ILanguagePack* FromText(uint16_t id, const utf8* text)
std::unique_ptr<ILanguagePack> FromText(uint16_t id, const utf8* text)
{
auto languagePack = LanguagePack::FromText(id, text);
return languagePack;

5
src/openrct2/localisation/LanguagePack.h
View File

@@ -11,6 +11,7 @@
#include "../common.h"
#include <memory>
#include <string>
#include <string_view>
@@ -30,6 +31,6 @@ struct ILanguagePack
namespace LanguagePackFactory
{
ILanguagePack* FromFile(uint16_t id, const utf8* path);
ILanguagePack* FromText(uint16_t id, const utf8* text);
std::unique_ptr<ILanguagePack> FromFile(uint16_t id, const utf8* path);
std::unique_ptr<ILanguagePack> FromText(uint16_t id, const utf8* text);
} // namespace LanguagePackFactory

5
src/openrct2/localisation/LocalisationService.cpp
View File

@@ -86,12 +86,11 @@ void LocalisationService::OpenLanguage(int32_t id)
if (id != LANGUAGE_ENGLISH_UK)
{
filename = GetLanguagePath(LANGUAGE_ENGLISH_UK);
_languageFallback = std::unique_ptr<ILanguagePack>(
LanguagePackFactory::FromFile(LANGUAGE_ENGLISH_UK, filename.c_str()));
_languageFallback = LanguagePackFactory::FromFile(LANGUAGE_ENGLISH_UK, filename.c_str());
}
filename = GetLanguagePath(id);
_languageCurrent = std::unique_ptr<ILanguagePack>(LanguagePackFactory::FromFile(id, filename.c_str()));
_languageCurrent = LanguagePackFactory::FromFile(id, filename.c_str());
if (_languageCurrent != nullptr)
{
_currentLanguage = id;

2
src/openrct2/rct12/SawyerChunkReader.cpp
View File

@@ -65,7 +65,7 @@ std::shared_ptr<SawyerChunk> SawyerChunkReader::ReadChunk()
case CHUNK_ENCODING_RLECOMPRESSED:
case CHUNK_ENCODING_ROTATE:
{
std::unique_ptr<uint8_t[]> compressedData(new uint8_t[header.length]);
auto compressedData = std::make_unique<uint8_t[]>(header.length);
if (_stream->TryRead(compressedData.get(), header.length) != header.length)
{
throw SawyerChunkException(EXCEPTION_MSG_CORRUPT_CHUNK_SIZE);

4
src/openrct2/title/TitleSequence.cpp
View File

@@ -53,7 +53,7 @@ std::unique_ptr<TitleSequence> LoadTitleSequence(const std::string& path)
auto ext = Path::GetExtension(path);
if (String::Equals(ext, TITLE_SEQUENCE_EXTENSION))
{
auto zip = std::unique_ptr<IZipArchive>(Zip::TryOpen(path, ZIP_ACCESS::READ));
auto zip = Zip::TryOpen(path, ZIP_ACCESS::READ);
if (zip == nullptr)
{
Console::Error::WriteLine("Unable to open '%s'", path.c_str());
@@ -103,7 +103,7 @@ std::unique_ptr<TitleSequenceParkHandle> TitleSequenceGetParkHandle(const TitleS
const auto& filename = seq.Saves[index];
if (seq.IsZip)
{
auto zip = std::unique_ptr<IZipArchive>(Zip::TryOpen(seq.Path, ZIP_ACCESS::READ));
auto zip = Zip::TryOpen(seq.Path, ZIP_ACCESS::READ);
if (zip != nullptr)
{
auto data = zip->GetFileData(filename);

12
test/tests/LanguagePackTest.cpp
View File

@@ -23,27 +23,25 @@ protected:
TEST_F(LanguagePackTest, create_empty)
{
ILanguagePack* empty = LanguagePackFactory::FromText(0, "");
auto empty = LanguagePackFactory::FromText(0, "");
ASSERT_EQ(empty->GetId(), 0);
ASSERT_EQ(empty->GetCount(), 0U);
delete empty;
}
TEST_F(LanguagePackTest, create_mutable_id_1)
{
ILanguagePack* lang = LanguagePackFactory::FromText(1, "STR_0000:\n");
auto lang = LanguagePackFactory::FromText(1, "STR_0000:\n");
ASSERT_EQ(lang->GetId(), 1);
ASSERT_EQ(lang->GetCount(), 1U);
ASSERT_STREQ(lang->GetString(0), nullptr);
lang->SetString(0, "xx");
ASSERT_EQ(lang->GetCount(), 1U);
ASSERT_STREQ(lang->GetString(0), "xx");
delete lang;
}
TEST_F(LanguagePackTest, language_pack_simple)
{
ILanguagePack* lang = LanguagePackFactory::FromText(0, LanguageEnGB);
auto lang = LanguagePackFactory::FromText(0, LanguageEnGB);
ASSERT_EQ(lang->GetId(), 0);
ASSERT_EQ(lang->GetCount(), 4U);
ASSERT_STREQ(lang->GetString(2), "Spiral Roller Coaster");
@@ -55,12 +53,11 @@ TEST_F(LanguagePackTest, language_pack_simple)
ASSERT_EQ(lang->GetString(1000), nullptr);
ASSERT_EQ(lang->GetScenarioOverrideStringId("No such park", 0), STR_NONE);
ASSERT_EQ(lang->GetObjectOverrideStringId(" ", 0), STR_NONE);
delete lang;
}
TEST_F(LanguagePackTest, language_pack_multibyte)
{
ILanguagePack* lang = LanguagePackFactory::FromText(0, (const utf8*)LanguageZhTW);
auto lang = LanguagePackFactory::FromText(0, (const utf8*)LanguageZhTW);
ASSERT_EQ(lang->GetId(), 0);
ASSERT_EQ(lang->GetCount(), 4U);
ASSERT_STREQ(lang->GetString(2), u8"懸吊式雲霄飛車");
@@ -70,7 +67,6 @@ TEST_F(LanguagePackTest, language_pack_multibyte)
ASSERT_STREQ(lang->GetString(0x7002), u8"在隱藏於森林深處的清空範圍中, 建造一個很受歡迎的樂園");
ASSERT_EQ(lang->GetObjectOverrideStringId("CONDORRD", 0), 0x6000);
ASSERT_STREQ(lang->GetString(0x6000), u8"神鷹暢遊");
delete lang;
}
const utf8* LanguagePackTest::LanguageEnGB = "# STR_XXXX part is read and XXXX becomes the string id number.\n"