From 20597b3632d3b6e25ba532716106f90d5b64d0e8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 28 Oct 2013 23:58:17 +0100 Subject: *: use nullptr instead of NULL --- src/fs/Config.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/fs/Config.cxx') diff --git a/src/fs/Config.cxx b/src/fs/Config.cxx index 3d7e99b4a..63e64ef99 100644 --- a/src/fs/Config.cxx +++ b/src/fs/Config.cxx @@ -38,15 +38,15 @@ void ConfigureFS() { - const char *charset = NULL; + const char *charset = nullptr; - charset = config_get_string(CONF_FS_CHARSET, NULL); - if (charset == NULL) { + charset = config_get_string(CONF_FS_CHARSET, nullptr); + if (charset == nullptr) { #ifndef WIN32 const gchar **encodings; g_get_filename_charsets(&encodings); - if (encodings[0] != NULL && *encodings[0] != '\0') + if (encodings[0] != nullptr && *encodings[0] != '\0') charset = encodings[0]; #else /* Glib claims that file system encoding is always utf-8 -- cgit v1.2.3