diff options
| author | Rubidium <rubidium@openttd.org> | 2021-06-16 21:12:08 +0200 |
|---|---|---|
| committer | rubidium42 <rubidium42@users.noreply.github.com> | 2021-06-17 16:18:30 +0200 |
| commit | f904aef176b7bde38f27cc9b4f23c55dc13d2ce5 (patch) | |
| tree | 2ea8cfd92faf9786275824cf1a5c5be927283601 /src/os | |
| parent | a9774f3e341812d43427b9e0166b0def08202477 (diff) | |
| download | openttd-f904aef176b7bde38f27cc9b4f23c55dc13d2ce5.tar.xz | |
Cleanup: use nullptr instead of 0 or NULL
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/unix/font_unix.cpp | 4 | ||||
| -rw-r--r-- | src/os/unix/unix.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/os/unix/font_unix.cpp b/src/os/unix/font_unix.cpp index f8cf96a48..246d65e63 100644 --- a/src/os/unix/font_unix.cpp +++ b/src/os/unix/font_unix.cpp @@ -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; diff --git a/src/os/unix/unix.cpp b/src/os/unix/unix.cpp index f696f817f..95d6fa1fa 100644 --- a/src/os/unix/unix.cpp +++ b/src/os/unix/unix.cpp @@ -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; |