From 0c32575a65cd074334ddd8f420cc9ef88c94edca Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Tue, 2 Oct 2018 00:09:18 +0200 Subject: [PATCH] Remove C++11 language elements see ad484e4c56bddb0eda2e182cbdf69641c29db3f8 and 840d975a39364c80b6238451390c727696f33eec --- src/io/inkscapestream.cpp | 2 +- src/ui/interface.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/io/inkscapestream.cpp b/src/io/inkscapestream.cpp index 3042ecff7a..b28b0f7498 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 d8a292960d..2c2d2af3a7 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()))); -- GitLab