From f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Fri, 15 Jun 2018 12:46:15 +0200 Subject: =?UTF-8?q?Run=20clang-tidy=E2=80=99s=20modernize-use-nullptr=20pa?= =?UTF-8?q?ss.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This replaces all NULL or 0 with nullptr when assigned to or returned as a pointer. --- src/display/canvas-axonomgrid.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/display/canvas-axonomgrid.cpp') diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index 66231b7dd..8d9cb7d0a 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -191,7 +191,7 @@ CanvasAxonomGrid::readRepr() } if ( (value = repr->attribute("gridanglex")) ) { - angle_deg[X] = g_ascii_strtod(value, NULL); + angle_deg[X] = g_ascii_strtod(value, nullptr); if (angle_deg[X] < 0.) angle_deg[X] = 0.; if (angle_deg[X] > 89.0) angle_deg[X] = 89.0; angle_rad[X] = Geom::rad_from_deg(angle_deg[X]); @@ -199,7 +199,7 @@ CanvasAxonomGrid::readRepr() } if ( (value = repr->attribute("gridanglez")) ) { - angle_deg[Z] = g_ascii_strtod(value, NULL); + angle_deg[Z] = g_ascii_strtod(value, nullptr); if (angle_deg[Z] < 0.) angle_deg[Z] = 0.; if (angle_deg[Z] > 89.0) angle_deg[Z] = 89.0; angle_rad[Z] = Geom::rad_from_deg(angle_deg[Z]); @@ -230,12 +230,12 @@ CanvasAxonomGrid::readRepr() } if ( (value = repr->attribute("enabled")) ) { - g_assert(snapper != NULL); + g_assert(snapper != nullptr); snapper->setEnabled(strcmp(value,"false") != 0 && strcmp(value, "0") != 0); } if ( (value = repr->attribute("snapvisiblegridlinesonly")) ) { - g_assert(snapper != NULL); + g_assert(snapper != nullptr); snapper->setSnapVisibleOnly(strcmp(value,"false") != 0 && strcmp(value, "0") != 0); } @@ -358,7 +358,7 @@ CanvasAxonomGrid::updateWidgets() _wr.setUpdating (true); _rcb_visible->setActive(visible); - if (snapper != NULL) { + if (snapper != nullptr) { _rcb_enabled->setActive(snapper->getEnabled()); _rcb_snap_visible_only->setActive(snapper->getSnapVisibleOnly()); } @@ -590,7 +590,7 @@ CanvasAxonomGridSnapper::_getSnapLines(Geom::Point const &p) const { LineList s; - if ( grid == NULL ) { + if ( grid == nullptr ) { return s; } -- cgit v1.2.3