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

This commit is contained in:
Jonathan G Rennison
2019-04-11 18:14:13 +01:00
585 changed files with 6604 additions and 6604 deletions

View File

@@ -132,14 +132,14 @@ struct ZoningWindow : public Window {
virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
{
const StringID *strs = NULL;
const StringID *strs = nullptr;
switch (widget) {
case ZTW_OUTER_DROPDOWN:
case ZTW_INNER_DROPDOWN:
strs = _zone_type_strings;
break;
}
if (strs != NULL) {
if (strs != nullptr) {
while (*strs != INVALID_STRING_ID) {
*size = maxdim(*size, GetStringBoundingBox(*strs++));
}