summaryrefslogtreecommitdiffstats
path: root/src/extension/internal/svg.cpp
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-15 10:46:15 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2018-06-18 12:27:01 +0000
commitf4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43 (patch)
tree7c6044fd3a17a2665841959dac9b3b2110b27924 /src/extension/internal/svg.cpp
parentRun clang-tidy’s modernize-use-override pass. (diff)
downloadinkscape-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/extension/internal/svg.cpp')
-rw-r--r--src/extension/internal/svg.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp
index c4e12c174..f4e28e7ed 100644
--- a/src/extension/internal/svg.cpp
+++ b/src/extension/internal/svg.cpp
@@ -76,7 +76,7 @@ static void pruneExtendedNamespaces( Inkscape::XML::Node *repr )
}
// Can't change the set we're interating over while we are iterating.
for ( std::vector<gchar const*>::iterator it = attrsRemoved.begin(); it != attrsRemoved.end(); ++it ) {
- repr->setAttribute(*it, 0);
+ repr->setAttribute(*it, nullptr);
}
}
@@ -225,11 +225,11 @@ Svg::open (Inkscape::Extension::Input *mod, const gchar *uri)
prefs->setBool("/dialogs/import/ask", !mod->get_param_bool("do_not_ask") );
}
- SPDocument * doc = SPDocument::createNewDoc (NULL, TRUE, TRUE);
+ SPDocument * doc = SPDocument::createNewDoc (nullptr, TRUE, TRUE);
if (link_svg.compare("include") != 0 && is_import) {
bool embed = ( link_svg.compare( "embed" ) == 0 );
SPDocument * ret = SPDocument::createNewDoc(uri, TRUE);
- SPNamedView *nv = sp_document_namedview(doc, NULL);
+ SPNamedView *nv = sp_document_namedview(doc, nullptr);
Glib::ustring display_unit = nv->display_units->abbr;
if (display_unit.empty()) {
display_unit = "px";
@@ -259,7 +259,7 @@ Svg::open (Inkscape::Extension::Input *mod, const gchar *uri)
sp_embed_svg(image_node, uri);
}
} else {
- gchar* _uri = g_filename_to_uri(uri, NULL, NULL);
+ gchar* _uri = g_filename_to_uri(uri, nullptr, nullptr);
if(_uri) {
image_node->setAttribute("xlink:href", _uri);
g_free(_uri);
@@ -292,7 +292,7 @@ Svg::open (Inkscape::Extension::Input *mod, const gchar *uri)
return SPDocument::createNewDocFromMem(contents, length, 1);
} catch (Gio::Error &e) {
g_warning("Could not load contents of non-local URI %s\n", uri);
- return NULL;
+ return nullptr;
}
} else {
uri = path.c_str();
@@ -329,8 +329,8 @@ Svg::open (Inkscape::Extension::Input *mod, const gchar *uri)
void
Svg::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filename)
{
- g_return_if_fail(doc != NULL);
- g_return_if_fail(filename != NULL);
+ g_return_if_fail(doc != nullptr);
+ g_return_if_fail(filename != nullptr);
Inkscape::XML::Document *rdoc = doc->rdoc;
bool const exportExtensions = ( !mod->get_id()