dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: use smart pointers when creating StringIterators

Browse Source
This commit is contained in:
Rubidium
2023-01-13 17:55:43 +01:00
committed by rubidium42
parent b35c791d05
commit b951332def
6 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/string.cpp
View File

@@ -765,9 +765,9 @@ int strnatcmp(const char *s1, const char *s2, bool ignore_garbage_at_front)
#ifdef WITH_UNISCRIBE
/* static */ StringIterator *StringIterator::Create()
/* static */ std::unique_ptr<StringIterator> StringIterator::Create()
{
return new UniscribeStringIterator();
return std::make_unique<UniscribeStringIterator>();
}
#elif defined(WITH_ICU_I18N)
@@ -921,9 +921,9 @@ public:
}
};
/* static */ StringIterator *StringIterator::Create()
/* static */ std::unique_ptr<StringIterator> StringIterator::Create()
{
return new IcuStringIterator();
return std::make_unique<IcuStringIterator>();
}
#else
@@ -1032,17 +1032,17 @@ public:
};
#if defined(WITH_COCOA) && !defined(STRGEN) && !defined(SETTINGSGEN)
/* static */ StringIterator *StringIterator::Create()
/* static */ std::unique_ptr<StringIterator> StringIterator::Create()
{
StringIterator *i = OSXStringIterator::Create();
std::unique_ptr<StringIterator> i = OSXStringIterator::Create();
if (i != nullptr) return i;
return new DefaultStringIterator();
return std::make_unique<DefaultStringIterator>();
}
#else
/* static */ StringIterator *StringIterator::Create()
/* static */ std::unique_ptr<StringIterator> StringIterator::Create()
{
return new DefaultStringIterator();
return std::make_unique<DefaultStringIterator>();
}
#endif /* defined(WITH_COCOA) && !defined(STRGEN) && !defined(SETTINGSGEN) */