summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/ocaldialogs.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/ui/dialog/ocaldialogs.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/ui/dialog/ocaldialogs.cpp')
-rw-r--r--src/ui/dialog/ocaldialogs.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index 4302161dc..2c457b6d0 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -995,8 +995,8 @@ void ImportDialog::on_xml_file_read(const Glib::RefPtr<Gio::AsyncResult>& result
// Create the resulting xml document tree
// Initialize libxml and test mistakes between compiled and shared library used
LIBXML_TEST_VERSION
- xmlDoc *doc = NULL;
- xmlNode *root_element = NULL;
+ xmlDoc *doc = nullptr;
+ xmlNode *root_element = nullptr;
int parse_options = XML_PARSE_RECOVER + XML_PARSE_NOWARNING + XML_PARSE_NOERROR; // do not use XML_PARSE_NOENT ! see bug lp:1025185
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -1005,9 +1005,9 @@ void ImportDialog::on_xml_file_read(const Glib::RefPtr<Gio::AsyncResult>& result
parse_options |= XML_PARSE_NONET;
}
- doc = xmlReadMemory(data, (int) length, xml_uri.c_str(), NULL, parse_options);
+ doc = xmlReadMemory(data, (int) length, xml_uri.c_str(), nullptr, parse_options);
- if (doc == NULL) {
+ if (doc == nullptr) {
// If nothing is returned, no results could be found
if (length == 0) {
notebook_content->set_current_page(NOTEBOOK_PAGE_NOT_FOUND);
@@ -1065,7 +1065,7 @@ ImportDialog::ImportDialog(Gtk::Window& parent_window, FileDialogType file_types
FileDialogBase(title, parent_window)
{
// Initialize to Autodetect
- extension = NULL;
+ extension = nullptr;
// No filename to start out with
Glib::ustring search_keywords = "";