mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: replace C-style strings with std::string_view related to strings functions

pull/14132/head
Rubidium 2025-04-27 09:40:27 +02:00 committed by rubidium42
parent 4e3e3d5be6
commit 781187b8a6
7 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/base_media_base.h
View File

@ -47,7 +47,7 @@ template <class T> struct BaseSetTraits;
*/ */
template <class T> template <class T>
struct BaseSet { struct BaseSet {
typedef std::unordered_map<std::string, std::string> TranslatedStrings; typedef std::unordered_map<std::string, std::string, StringHash, std::equal_to<>> TranslatedStrings;
/** Number of files in this set */ /** Number of files in this set */
static constexpr size_t NUM_FILES = BaseSetTraits<T>::num_files; static constexpr size_t NUM_FILES = BaseSetTraits<T>::num_files;
@ -107,7 +107,7 @@ struct BaseSet {
* @param isocode the isocode to search for * @param isocode the isocode to search for
* @return the description * @return the description
*/ */
const std::string &GetDescription(const std::string &isocode) const const std::string &GetDescription(std::string_view isocode) const
{ {
if (!isocode.empty()) { if (!isocode.empty()) {
/* First the full ISO code */ /* First the full ISO code */

8
src/os/macosx/string_osx.cpp
View File

@ -302,22 +302,22 @@ void MacOSResetScriptCache(FontSize size)
} }
/** Register an external font file with the CoreText system. */ /** Register an external font file with the CoreText system. */
void MacOSRegisterExternalFont(const char *file_path) void MacOSRegisterExternalFont(std::string_view file_path)
{ {
if (!MacOSVersionIsAtLeast(10, 6, 0)) return; if (!MacOSVersionIsAtLeast(10, 6, 0)) return;
CFAutoRelease<CFStringRef> path(CFStringCreateWithCString(kCFAllocatorDefault, file_path, kCFStringEncodingUTF8)); CFAutoRelease<CFStringRef> path(CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8 *>(file_path.data()), file_path.size(), kCFStringEncodingUTF8, false));
CFAutoRelease<CFURLRef> url(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, path.get(), kCFURLPOSIXPathStyle, false)); CFAutoRelease<CFURLRef> url(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, path.get(), kCFURLPOSIXPathStyle, false));
CTFontManagerRegisterFontsForURL(url.get(), kCTFontManagerScopeProcess, nullptr); CTFontManagerRegisterFontsForURL(url.get(), kCTFontManagerScopeProcess, nullptr);
} }
/** Store current language locale as a CoreFoundation locale. */ /** Store current language locale as a CoreFoundation locale. */
void MacOSSetCurrentLocaleName(const char *iso_code) void MacOSSetCurrentLocaleName(std::string_view iso_code)
{ {
if (!MacOSVersionIsAtLeast(10, 5, 0)) return; if (!MacOSVersionIsAtLeast(10, 5, 0)) return;
CFAutoRelease<CFStringRef> iso(CFStringCreateWithCString(kCFAllocatorDefault, iso_code, kCFStringEncodingUTF8)); CFAutoRelease<CFStringRef> iso(CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8 *>(iso_code.data()), iso_code.size(), kCFStringEncodingUTF8, false));
_osx_locale.reset(CFLocaleCreate(kCFAllocatorDefault, iso.get())); _osx_locale.reset(CFLocaleCreate(kCFAllocatorDefault, iso.get()));
} }

4
src/os/macosx/string_osx.h
View File

@ -82,10 +82,10 @@ public:
}; };
void MacOSResetScriptCache(FontSize size); void MacOSResetScriptCache(FontSize size);
void MacOSSetCurrentLocaleName(const char *iso_code); void MacOSSetCurrentLocaleName(std::string_view iso_code);
int MacOSStringCompare(std::string_view s1, std::string_view s2); int MacOSStringCompare(std::string_view s1, std::string_view s2);
int MacOSStringContains(const std::string_view str, const std::string_view value, bool case_insensitive); int MacOSStringContains(const std::string_view str, const std::string_view value, bool case_insensitive);
void MacOSRegisterExternalFont(const char *file_path); void MacOSRegisterExternalFont(std::string_view file_path);
#endif /* STRING_OSX_H */ #endif /* STRING_OSX_H */

38
src/strings.cpp
View File

@ -457,10 +457,10 @@ std::string GetStringWithArgs(StringID string, std::span<StringParameter> args)
return result; return result;
} }
static const char *GetDecimalSeparator() static std::string_view GetDecimalSeparator()
{ {
const char *decimal_separator = _settings_game.locale.digit_decimal_separator.c_str(); std::string_view decimal_separator = _settings_game.locale.digit_decimal_separator;
if (StrEmpty(decimal_separator)) decimal_separator = _langpack.langpack->digit_decimal_separator; if (decimal_separator.empty()) decimal_separator = _langpack.langpack->digit_decimal_separator;
return decimal_separator; return decimal_separator;
} }
@ -470,7 +470,7 @@ static const char *GetDecimalSeparator()
* @param number the number to write down * @param number the number to write down
* @param separator the thousands-separator to use * @param separator the thousands-separator to use
*/ */
static void FormatNumber(StringBuilder &builder, int64_t number, const char *separator) static void FormatNumber(StringBuilder &builder, int64_t number, std::string_view separator)
{ {
static const int max_digits = 20; static const int max_digits = 20;
uint64_t divisor = 10000000000000000000ULL; uint64_t divisor = 10000000000000000000ULL;
@ -500,8 +500,8 @@ static void FormatNumber(StringBuilder &builder, int64_t number, const char *sep
static void FormatCommaNumber(StringBuilder &builder, int64_t number) static void FormatCommaNumber(StringBuilder &builder, int64_t number)
{ {
const char *separator = _settings_game.locale.digit_group_separator.c_str(); std::string_view separator = _settings_game.locale.digit_group_separator;
if (StrEmpty(separator)) separator = _langpack.langpack->digit_group_separator; if (separator.empty()) separator = _langpack.langpack->digit_group_separator;
FormatNumber(builder, number, separator); FormatNumber(builder, number, separator);
} }
@ -529,8 +529,8 @@ static void FormatBytes(StringBuilder &builder, int64_t number)
{ {
assert(number >= 0); assert(number >= 0);
/* 1 2^10 2^20 2^30 2^40 2^50 2^60 */ /* 1 2^10 2^20 2^30 2^40 2^50 2^60 */
const char * const iec_prefixes[] = {"", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei"}; const std::string_view iec_prefixes[] = {"", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei"};
uint id = 1; uint id = 1;
while (number >= 1024 * 1024) { while (number >= 1024 * 1024) {
number /= 1024; number /= 1024;
@ -620,9 +620,9 @@ static void FormatGenericCurrency(StringBuilder &builder, const CurrencySpec *sp
} }
} }
const char *separator = _settings_game.locale.digit_group_separator_currency.c_str(); std::string_view separator = _settings_game.locale.digit_group_separator_currency;
if (StrEmpty(separator)) separator = GetCurrency().separator.c_str(); if (separator.empty()) separator = GetCurrency().separator;
if (StrEmpty(separator)) separator = _langpack.langpack->digit_group_separator_currency; if (separator.empty()) separator = _langpack.langpack->digit_group_separator_currency;
FormatNumber(builder, number, separator); FormatNumber(builder, number, separator);
if (number_str != STR_NULL) { if (number_str != STR_NULL) {
FormatString(builder, GetStringPtr(number_str), {}); FormatString(builder, GetStringPtr(number_str), {});
@ -1808,7 +1808,7 @@ static void StationGetSpecialString(StringBuilder &builder, StationFacilities x)
if (x.Test(StationFacility::Airport)) builder.PutUtf8(SCC_PLANE); if (x.Test(StationFacility::Airport)) builder.PutUtf8(SCC_PLANE);
} }
static const char * const _silly_company_names[] = { static const std::string_view _silly_company_names[] = {
"Bloggs Brothers", "Bloggs Brothers",
"Tiny Transport Ltd.", "Tiny Transport Ltd.",
"Express Travel", "Express Travel",
@ -1824,7 +1824,7 @@ static const char * const _silly_company_names[] = {
"Getout & Pushit Ltd." "Getout & Pushit Ltd."
}; };
static const char * const _surname_list[] = { static const std::string_view _surname_list[] = {
"Adams", "Adams",
"Allan", "Allan",
"Baker", "Baker",
@ -1856,7 +1856,7 @@ static const char * const _surname_list[] = {
"Watkins" "Watkins"
}; };
static const char * const _silly_surname_list[] = { static const std::string_view _silly_surname_list[] = {
"Grumpy", "Grumpy",
"Dozy", "Dozy",
"Speedy", "Speedy",
@ -1876,7 +1876,7 @@ static const char _initial_name_letters[] = {
'K', 'L', 'M', 'N', 'P', 'R', 'S', 'T', 'W', 'K', 'L', 'M', 'N', 'P', 'R', 'S', 'T', 'W',
}; };
static std::span<const char * const> GetSurnameOptions() static std::span<const std::string_view> GetSurnameOptions()
{ {
if (_settings_game.game_creation.landscape == LandscapeType::Toyland) return _silly_surname_list; if (_settings_game.game_creation.landscape == LandscapeType::Toyland) return _silly_surname_list;
return _surname_list; return _surname_list;
@ -1887,7 +1887,7 @@ static std::span<const char * const> GetSurnameOptions()
* @param seed The seed the surname was generated from. * @param seed The seed the surname was generated from.
* @return The surname. * @return The surname.
*/ */
static const char *GetSurname(uint32_t seed) static std::string_view GetSurname(uint32_t seed)
{ {
auto surname_options = GetSurnameOptions(); auto surname_options = GetSurnameOptions();
return surname_options[surname_options.size() * GB(seed, 16, 8) >> 8]; return surname_options[surname_options.size() * GB(seed, 16, 8) >> 8];
@ -2037,7 +2037,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang)
#endif #endif
#ifdef WITH_COCOA #ifdef WITH_COCOA
extern void MacOSSetCurrentLocaleName(const char *iso_code); extern void MacOSSetCurrentLocaleName(std::string_view iso_code);
MacOSSetCurrentLocaleName(_current_language->isocode); MacOSSetCurrentLocaleName(_current_language->isocode);
#endif #endif
@ -2220,7 +2220,7 @@ void InitializeLanguagePacks()
* Get the ISO language code of the currently loaded language. * Get the ISO language code of the currently loaded language.
* @return the ISO code. * @return the ISO code.
*/ */
const char *GetCurrentLanguageIsoCode() std::string_view GetCurrentLanguageIsoCode()
{ {
return _langpack.langpack->isocode; return _langpack.langpack->isocode;
} }
@ -2297,7 +2297,7 @@ class LanguagePackGlyphSearcher : public MissingGlyphSearcher {
return false; return false;
} }
void SetFontNames([[maybe_unused]] FontCacheSettings *settings, [[maybe_unused]] const char *font_name, [[maybe_unused]] const void *os_data) override void SetFontNames([[maybe_unused]] FontCacheSettings *settings, [[maybe_unused]] std::string_view font_name, [[maybe_unused]] const void *os_data) override
{ {
#if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA) #if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA)
settings->small.font = font_name; settings->small.font = font_name;

4
src/strings_func.h
View File

@ -96,7 +96,7 @@ uint64_t GetParamMaxDigits(uint count, FontSize size = FS_NORMAL);
extern TextDirection _current_text_dir; ///< Text direction of the currently selected language extern TextDirection _current_text_dir; ///< Text direction of the currently selected language
void InitializeLanguagePacks(); void InitializeLanguagePacks();
const char *GetCurrentLanguageIsoCode(); std::string_view GetCurrentLanguageIsoCode();
std::string_view GetListSeparator(); std::string_view GetListSeparator();
/** /**
@ -189,7 +189,7 @@ public:
* @param font_name The new font name. * @param font_name The new font name.
* @param os_data Opaque pointer to OS-specific data. * @param os_data Opaque pointer to OS-specific data.
*/ */
virtual void SetFontNames(struct FontCacheSettings *settings, const char *font_name, const void *os_data = nullptr) = 0; virtual void SetFontNames(struct FontCacheSettings *settings, std::string_view font_name, const void *os_data = nullptr) = 0;
bool FindMissingGlyphs(); bool FindMissingGlyphs();
}; };

2
src/textfile_gui.cpp
View File

@ -656,7 +656,7 @@ void TextfileWindow::ScrollToLine(size_t line)
return true; return true;
} }
/* virtual */ void TextfileWindow::SetFontNames([[maybe_unused]] FontCacheSettings *settings, [[maybe_unused]] const char *font_name, [[maybe_unused]] const void *os_data) /* virtual */ void TextfileWindow::SetFontNames([[maybe_unused]] FontCacheSettings *settings, [[maybe_unused]] std::string_view font_name, [[maybe_unused]] const void *os_data)
{ {
#if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA) #if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA)
settings->mono.font = font_name; settings->mono.font = font_name;

2
src/textfile_gui.h
View File

@ -35,7 +35,7 @@ struct TextfileWindow : public Window, MissingGlyphSearcher {
FontSize DefaultSize() override; FontSize DefaultSize() override;
std::optional<std::string_view> NextString() override; std::optional<std::string_view> NextString() override;
bool Monospace() override; bool Monospace() override;
void SetFontNames(FontCacheSettings *settings, const char *font_name, const void *os_data) override; void SetFontNames(FontCacheSettings *settings, std::string_view font_name, const void *os_data) override;
void ScrollToLine(size_t line); void ScrollToLine(size_t line);
virtual void LoadTextfile(const std::string &textfile, Subdirectory dir); virtual void LoadTextfile(const std::string &textfile, Subdirectory dir);