Inkscapestream: Make some things const and avoid unnecessary copies

2 files changed, 8 insertions, 9 deletions

diff --git a/src/io/inkscapestream.cpp b/src/io/inkscapestream.cpp
index 7afc3a175..63cea38ab 100644
--- a/src/io/inkscapestream.cpp
+++ b/src/io/inkscapestream.cpp
@@ -496,19 +496,18 @@ Writer &BasicWriter::writeChar(char ch)
 /**
  * Writes the specified unicode string to this output writer.
  */ 
-Writer &BasicWriter::writeUString(Glib::ustring &str)
+Writer &BasicWriter::writeUString(const Glib::ustring &str)
 {
-    std::string tmp = str.raw();
-    writeStdString(tmp);
+    writeStdString(str.raw());
     return *this;
 }
 
 /**
  * Writes the specified standard string to this output writer.
  */ 
-Writer &BasicWriter::writeStdString(std::string &str)
+Writer &BasicWriter::writeStdString(const std::string &str)
 {
-    for (auto it = str.begin(); it != str.end(); it++) {
+    for (auto it = str.begin(); it != str.end(); ++it) {
         put(*it);
     }
     return *this;
diff --git a/src/io/inkscapestream.h b/src/io/inkscapestream.h
index d1b27e902..b2e836267 100644
--- a/src/io/inkscapestream.h
+++ b/src/io/inkscapestream.h
@@ -477,9 +477,9 @@ public:
 
     virtual Writer& writeChar(char val) = 0;
 
-    virtual Writer& writeUString(Glib::ustring &val) = 0;
+    virtual Writer& writeUString(const Glib::ustring &val) = 0;
 
-    virtual Writer& writeStdString(std::string &val) = 0;
+    virtual Writer& writeStdString(const std::string &val) = 0;
 
     virtual Writer& writeString(const char *str) = 0;
 
@@ -533,9 +533,9 @@ public:
 
     Writer& writeChar(char val) override;
 
-    Writer& writeUString(Glib::ustring &val) override;
+    Writer& writeUString(const Glib::ustring &val) override;
 
-    Writer& writeStdString(std::string &val) override;
+    Writer& writeStdString(const std::string &val) override;
 
     Writer& writeString(const char *str) override;