diff --git a/src/io/inkscapestream.cpp b/src/io/inkscapestream.cpp index 3042ecff7ad12ea699134534de6c13beb3ca834b..b28b0f74980af853c4ab8aee62143e387887b0c7 100644 --- a/src/io/inkscapestream.cpp +++ b/src/io/inkscapestream.cpp @@ -501,7 +501,7 @@ Writer &BasicWriter::writeChar(char ch) */ Writer &BasicWriter::writeUString(Glib::ustring &str) { - for (auto it = str.begin(); it != str.end(); it++) { + for (Glib::ustring::iterator it = str.begin(); it != str.end(); it++) { put(*it); } return *this; diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index d8a292960d509699dc55b66d24ecece2e85ba612..2c2d2af3a78509bc5a5f1035c3d872f65bb26111 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -325,7 +325,7 @@ sp_ui_close_view(GtkWidget */*widget*/) INKSCAPE.get_all_desktops(desktops); if (desktops.size() == 1) { Glib::ustring templateUri = sp_file_default_template_uri(); - SPDocument *doc = SPDocument::createNewDoc( templateUri.empty() ? nullptr : templateUri.c_str(), TRUE, true ); + SPDocument *doc = SPDocument::createNewDoc( templateUri.empty() ? NULL : templateUri.c_str(), TRUE, true ); // Set viewBox if it doesn't exist if (!doc->getRoot()->viewBox_set) { doc->setViewBox(Geom::Rect::from_xywh(0, 0, doc->getWidth().value(doc->getDisplayUnit()), doc->getHeight().value(doc->getDisplayUnit())));