Merge: Codechange: Use null pointer literal instead of the NULL macro

src/table/misc_settings.ini

@@ -15,12 +15,12 @@ static const SettingDescGlobVarList _misc_settings[] = {
 [post-amble]
 };
 [templates]
-SDTG_LIST  =  SDTG_LIST($name, $type, $length, $flags, $guiflags, $var, $def,                               $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, NULL),
-SDTG_MMANY = SDTG_MMANY($name, $type,          $flags, $guiflags, $var, $def,                        $full, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, NULL),
-SDTG_OMANY = SDTG_OMANY($name, $type,          $flags, $guiflags, $var, $def,       $max,            $full, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, NULL),
-SDTG_STR   =   SDTG_STR($name, $type,          $flags, $guiflags, $var, $def,                               $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, NULL),
-SDTG_BOOL  =  SDTG_BOOL($name,                 $flags, $guiflags, $var, $def,                               $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, NULL),
-SDTG_VAR   =   SDTG_VAR($name, $type,          $flags, $guiflags, $var, $def, $min, $max, $interval,        $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, NULL, $orderproc),
+SDTG_LIST  =  SDTG_LIST($name, $type, $length, $flags, $guiflags, $var, $def,                               $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, nullptr),
+SDTG_MMANY = SDTG_MMANY($name, $type,          $flags, $guiflags, $var, $def,                        $full, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, nullptr),
+SDTG_OMANY = SDTG_OMANY($name, $type,          $flags, $guiflags, $var, $def,       $max,            $full, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, nullptr),
+SDTG_STR   =   SDTG_STR($name, $type,          $flags, $guiflags, $var, $def,                               $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, nullptr),
+SDTG_BOOL  =  SDTG_BOOL($name,                 $flags, $guiflags, $var, $def,                               $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, nullptr),
+SDTG_VAR   =   SDTG_VAR($name, $type,          $flags, $guiflags, $var, $def, $min, $max, $interval,        $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, nullptr, $orderproc),
 SDTG_END   = SDTG_END()
 
 [defaults]
@@ -30,13 +30,13 @@ interval = 0
 str      = STR_NULL
 strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
-proc     = NULL
-load     = NULL
+proc     = nullptr
+load     = nullptr
 from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
 extver   = SlXvFeatureTest()
-orderproc = NULL
+orderproc = nullptr
 
 
 
@@ -66,55 +66,55 @@ cat      = SC_BASIC
 name     = ""graphicsset""
 type     = SLE_STRQ
 var      = BaseGraphics::ini_set
-def      = NULL
+def      = nullptr
 cat      = SC_BASIC
 
 [SDTG_STR]
 name     = ""soundsset""
 type     = SLE_STRQ
 var      = BaseSounds::ini_set
-def      = NULL
+def      = nullptr
 cat      = SC_BASIC
 
 [SDTG_STR]
 name     = ""musicset""
 type     = SLE_STRQ
 var      = BaseMusic::ini_set
-def      = NULL
+def      = nullptr
 cat      = SC_BASIC
 
 [SDTG_STR]
 name     = ""videodriver""
 type     = SLE_STRQ
 var      = _ini_videodriver
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_STR]
 name     = ""musicdriver""
 type     = SLE_STRQ
 var      = _ini_musicdriver
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_STR]
 name     = ""sounddriver""
 type     = SLE_STRQ
 var      = _ini_sounddriver
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_STR]
 name     = ""blitter""
 type     = SLE_STRQ
 var      = _ini_blitter
-def      = NULL
+def      = nullptr
 
 [SDTG_STR]
 name     = ""language""
 type     = SLE_STRB
 var      = _config_language_file
-def      = NULL
+def      = nullptr
 cat      = SC_BASIC
 
 ; workaround for implicit lengthof() in SDTG_LIST
@@ -130,14 +130,14 @@ cat      = SC_BASIC
 name     = ""screenshot_format""
 type     = SLE_STRB
 var      = _screenshot_format_name
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_STR]
 name     = ""savegame_format""
 type     = SLE_STRB
 var      = _savegame_format
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_BOOL]
@@ -150,28 +150,28 @@ ifdef    = WITH_FREETYPE
 name     = ""small_font""
 type     = SLE_STRB
 var      = _freetype.small.font
-def      = NULL
+def      = nullptr
 
 [SDTG_STR]
 ifdef    = WITH_FREETYPE
 name     = ""medium_font""
 type     = SLE_STRB
 var      = _freetype.medium.font
-def      = NULL
+def      = nullptr
 
 [SDTG_STR]
 ifdef    = WITH_FREETYPE
 name     = ""large_font""
 type     = SLE_STRB
 var      = _freetype.large.font
-def      = NULL
+def      = nullptr
 
 [SDTG_STR]
 ifdef    = WITH_FREETYPE
 name     = ""mono_font""
 type     = SLE_STRB
 var      = _freetype.mono.font
-def      = NULL
+def      = nullptr
 
 [SDTG_VAR]
 ifdef    = WITH_FREETYPE
@@ -282,14 +282,14 @@ cat      = SC_BASIC
 name     = ""keyboard""
 type     = SLE_STRB
 var      = _keyboard_opt[0]
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_STR]
 name     = ""keyboard_caps""
 type     = SLE_STRB
 var      = _keyboard_opt[1]
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_VAR]