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

Cleanup: use nullptr instead of 0 or NULL

Browse Source
This commit is contained in:
Rubidium
2021-06-16 21:12:08 +02:00
committed by rubidium42
parent a9774f3e34
commit f904aef176
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/os/unix/font_unix.cpp
View File

@@ -51,10 +51,10 @@ FT_Error GetFontByFaceName(const char *font_name, FT_Face *face)
/* Resolve the name and populate the information structure */
pat = FcNameParse((FcChar8 *)font_family);
if (font_style != nullptr) FcPatternAddString(pat, FC_STYLE, (FcChar8 *)font_style);
FcConfigSubstitute(0, pat, FcMatchPattern);
FcConfigSubstitute(nullptr, pat, FcMatchPattern);
FcDefaultSubstitute(pat);
fs = FcFontSetCreate();
match = FcFontMatch(0, pat, &result);
match = FcFontMatch(nullptr, pat, &result);
if (fs != nullptr && match != nullptr) {
int i;

2
src/os/unix/unix.cpp
View File

@@ -277,7 +277,7 @@ bool GetClipboardContents(char *buffer, const char *last)
}
char *clip = SDL_GetClipboardText();
if (clip != NULL) {
if (clip != nullptr) {
strecpy(buffer, clip, last);
SDL_free(clip);
return true;