diff options
| author | rubidium42 <rubidium@openttd.org> | 2021-04-28 17:10:15 +0200 |
|---|---|---|
| committer | rubidium42 <rubidium42@users.noreply.github.com> | 2021-05-13 23:13:17 +0200 |
| commit | 77330d09fd8307261e94fe0eb0260f5ca5cc3898 (patch) | |
| tree | 0a2d3efe86b4f0047b558bb668dc9ed17ac63d3f /src/os/macosx | |
| parent | 65cbde4b30f8fdf6d4cf1196f6a596a5550c9aee (diff) | |
| download | openttd-77330d09fd8307261e94fe0eb0260f5ca5cc3898.tar.xz | |
Codechange: move font settings to std::string
Diffstat (limited to 'src/os/macosx')
| -rw-r--r-- | src/os/macosx/font_osx.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/os/macosx/font_osx.cpp b/src/os/macosx/font_osx.cpp index f5ceed850..295fcf257 100644 --- a/src/os/macosx/font_osx.cpp +++ b/src/os/macosx/font_osx.cpp @@ -359,7 +359,7 @@ void LoadCoreTextFont(FontSize fs) case FS_MONO: settings = &_freetype.mono; break; } - if (StrEmpty(settings->font)) return; + if (settings->font.empty()) return; CFAutoRelease<CTFontDescriptorRef> font_ref; @@ -375,10 +375,10 @@ void LoadCoreTextFont(FontSize fs) /* See if this is an absolute path. */ if (FileExists(settings->font)) { - path.reset(CFStringCreateWithCString(kCFAllocatorDefault, settings->font, kCFStringEncodingUTF8)); + path.reset(CFStringCreateWithCString(kCFAllocatorDefault, settings->font.c_str(), kCFStringEncodingUTF8)); } else { /* Scan the search-paths to see if it can be found. */ - std::string full_font = FioFindFullPath(BASE_DIR, settings->font); + std::string full_font = FioFindFullPath(BASE_DIR, settings->font.c_str()); if (!full_font.empty()) { path.reset(CFStringCreateWithCString(kCFAllocatorDefault, full_font.c_str(), kCFStringEncodingUTF8)); } @@ -393,13 +393,13 @@ void LoadCoreTextFont(FontSize fs) font_ref.reset((CTFontDescriptorRef)CFArrayGetValueAtIndex(descs.get(), 0)); CFRetain(font_ref.get()); } else { - ShowInfoF("Unable to load file '%s' for %s font, using default OS font selection instead", settings->font, SIZE_TO_NAME[fs]); + ShowInfoF("Unable to load file '%s' for %s font, using default OS font selection instead", settings->font.c_str(), SIZE_TO_NAME[fs]); } } } if (!font_ref) { - CFAutoRelease<CFStringRef> name(CFStringCreateWithCString(kCFAllocatorDefault, settings->font, kCFStringEncodingUTF8)); + CFAutoRelease<CFStringRef> name(CFStringCreateWithCString(kCFAllocatorDefault, settings->font.c_str(), kCFStringEncodingUTF8)); /* Simply creating the font using CTFontCreateWithNameAndSize will *always* return * something, no matter the name. As such, we can't use it to check for existence. @@ -417,7 +417,7 @@ void LoadCoreTextFont(FontSize fs) } if (!font_ref) { - ShowInfoF("Unable to use '%s' for %s font, using sprite font instead", settings->font, SIZE_TO_NAME[fs]); + ShowInfoF("Unable to use '%s' for %s font, using sprite font instead", settings->font.c_str(), SIZE_TO_NAME[fs]); return; } |