diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-06-15 10:46:15 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2018-06-18 12:27:01 +0000 |
| commit | f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43 (patch) | |
| tree | 7c6044fd3a17a2665841959dac9b3b2110b27924 /src/svg/svg-color.cpp | |
| parent | Run clang-tidy’s modernize-use-override pass. (diff) | |
| download | inkscape-f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43.tar.gz inkscape-f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43.zip | |
Run clang-tidy’s modernize-use-nullptr pass.
This replaces all NULL or 0 with nullptr when assigned to or returned as
a pointer.
Diffstat (limited to 'src/svg/svg-color.cpp')
| -rw-r--r-- | src/svg/svg-color.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp index 1f26d02b1..5d8a5c448 100644 --- a/src/svg/svg-color.cpp +++ b/src/svg/svg-color.cpp @@ -210,7 +210,7 @@ static std::map<string, unsigned long> sp_svg_create_color_hash(); guint32 sp_svg_read_color(gchar const *str, guint32 const dfl) { - return sp_svg_read_color(str, NULL, dfl); + return sp_svg_read_color(str, nullptr, dfl); } static guint32 internal_sp_svg_read_color(gchar const *str, gchar const **end_ptr, guint32 def) @@ -218,7 +218,7 @@ static guint32 internal_sp_svg_read_color(gchar const *str, gchar const **end_pt static std::map<string, unsigned long> colors; guint32 val = 0; - if (str == NULL) return def; + if (str == nullptr) return def; while ((*str <= ' ') && *str) str++; if (!*str) return def; @@ -437,7 +437,7 @@ static void rgb24_to_css(char *const buf, unsigned const rgb24) * restricted set because the only component values are {00,80,ff}, other than silver 0xc0c0c0. */ - char const *src = NULL; + char const *src = nullptr; switch (rgb24) { /* Extracted mechanically from the table at * http://www.w3.org/TR/REC-html40/types.html#h-6.5 .*/ @@ -598,7 +598,7 @@ bool sp_svg_read_icc_color( gchar const *str, gchar const **end_ptr, SVGICCColor if ( good ) { while ( *str && *str != ')' ) { if ( g_ascii_isdigit(*str) || *str == '.' || *str == '-' || *str == '+') { - gchar* endPtr = 0; + gchar* endPtr = nullptr; gdouble dbl = g_ascii_strtod( str, &endPtr ); if ( !errno ) { if ( dest ) { @@ -645,7 +645,7 @@ bool sp_svg_read_icc_color( gchar const *str, gchar const **end_ptr, SVGICCColor bool sp_svg_read_icc_color( gchar const *str, SVGICCColor* dest ) { - return sp_svg_read_icc_color(str, NULL, dest); + return sp_svg_read_icc_color(str, nullptr, dest); } |
