More c++ string usage.

(bzr r13763)

3 files changed, 23 insertions, 17 deletions

diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index bedce4e94..ba491f535 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -521,11 +521,9 @@ void sp_selection_duplicate(SPDesktop *desktop, bool suppressDone)
                     if (!strcmp(orig->getId(), old_ids[j])) {
                         // we have both orig and clone in selection, relink
                         // std::cout << id  << " old, its ori: " << orig->getId() << "; will relink:" << new_ids[i] << " to " << new_ids[j] << "\n";
-                        gchar *newref = g_strdup_printf("#%s", new_ids[j]);
                         SPObject *new_clone = doc->getObjectById(new_ids[i]);
-                        new_clone->getRepr()->setAttribute("xlink:href", newref);
+                        new_clone->getRepr()->setAttribute("xlink:href", '#' + new_ids[j]);
                         new_clone->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
-                        g_free(newref);
                     }
                 }
             } else {
@@ -534,9 +532,7 @@ void sp_selection_duplicate(SPDesktop *desktop, bool suppressDone)
                     for (guint j = 0; j < old_ids.size(); j++) {
                         gchar *source_href = offset->sourceHref;
                         if (source_href && source_href[0]=='#' && !strcmp(source_href+1, old_ids[j])) {
-                            gchar *newref = g_strdup_printf("#%s", new_ids[j]);
-                            doc->getObjectById(new_ids[i])->getRepr()->setAttribute("xlink:href", newref);
-                            g_free(newref);
+                            doc->getObjectById(new_ids[i])->getRepr()->setAttribute("xlink:href", '#' + new_ids[j]);
                         }
                     }
                 }
@@ -2907,7 +2903,7 @@ void sp_selection_clone_original_path_lpe(SPDesktop *desktop)
         Inkscape::XML::Node *lpe_repr = xml_doc->createElement("inkscape:path-effect");
         {
             lpe_repr->setAttribute("effect", "fill_between_many");
-            lpe_repr->setAttribute("linkedpaths", os.str().c_str());
+            lpe_repr->setAttribute("linkedpaths", os.str());
             desktop->doc()->getDefs()->getRepr()->addChild(lpe_repr, NULL); // adds to <defs> and assigns the 'id' attribute
         }
         std::string lpe_id_href = '#' + lpe_repr->attribute("id");
@@ -3178,7 +3174,7 @@ void sp_selection_symbol(SPDesktop *desktop, bool /*apply*/ )
         the_group->setAttribute("style", NULL);
         std::string id = symbol_repr->attribute("id");
         id += "_transform";
-        the_group->setAttribute("id", id.c_str());
+        the_group->setAttribute("id", id);
 
     }
 
@@ -3196,10 +3192,7 @@ void sp_selection_symbol(SPDesktop *desktop, bool /*apply*/ )
     // Create <use> pointing to new symbol (to replace the moved objects).
     Inkscape::XML::Node *clone = xml_doc->createElement("svg:use");
 
-    const gchar *symbol_id = symbol_repr->attribute("id");
-    gchar *href_str = g_strdup_printf("#%s", symbol_id);
-    clone->setAttribute("xlink:href", href_str, false);
-    g_free(href_str);
+    clone->setAttribute("xlink:href", '#'+symbol_repr->attribute("id"), false);
 
     the_parent_repr->appendChild(clone);
 
@@ -3290,7 +3283,7 @@ void sp_selection_unsymbol(SPDesktop *desktop)
     // Need to delete <symbol>; all <use> elements that referenced <symbol> should
     // auto-magically reference <g> (if <symbol> deleted after setting <g> 'id').
     Glib::ustring id = symbol->getAttribute("id");
-    group->setAttribute("id",id.c_str());
+    group->setAttribute("id", id);
     symbol->deleteObject(true);
 
     // Change selection to new <g> element.
@@ -4088,9 +4081,7 @@ void sp_selection_set_mask(SPDesktop *desktop, bool apply_clip_path, bool apply_
             Inkscape::GC::release(group);
         }
 
-        gchar *value_str = g_strdup_printf("url(#%s)", mask_id);
-        apply_mask_to->setAttribute(attributeName, value_str);
-        g_free(value_str);
+        apply_mask_to->setAttribute(attributeName, Glib::ustring("url(#") + mask_id + ')');
 
     }
 
diff --git a/src/sp-object.cpp b/src/sp-object.cpp
index 024fce85a..4e45eb824 100644
--- a/src/sp-object.cpp
+++ b/src/sp-object.cpp
@@ -1254,6 +1254,16 @@ void SPObject::setAttribute(gchar const *key, gchar const *value, SPException *e
     //XML Tree being used here.
     getRepr()->setAttribute(key, value, false);
 }
+void SPObject::setAttribute(char const *key, Glib::ustring const &value, SPException *ex)
+{
+    setAttribute(key, value.empty() ? NULL : value.c_str(), ex);
+}
+void SPObject::setAttribute(Glib::ustring const &key, Glib::ustring const &value, SPException *ex)
+{
+    setAttribute( key.empty()   ? NULL : key.c_str(),
+                  value.empty() ? NULL : value.c_str(), ex);
+}
+
 
 void SPObject::removeAttribute(gchar const *key, SPException *ex)
 {
diff --git a/src/sp-object.h b/src/sp-object.h
index 575198f36..d08add0bf 100644
--- a/src/sp-object.h
+++ b/src/sp-object.h
@@ -67,6 +67,9 @@ struct Document;
 }
 }
 
+namespace Glib {
+    class ustring;
+}
 
 typedef enum {
     SP_NO_EXCEPTION,
@@ -703,7 +706,9 @@ public:
      */
     void setKeyValue(unsigned int key, char const *value);
 
-    void setAttribute(char const *key, char const *value, SPException *ex=NULL);
+    void setAttribute(         char const *key,          char const *value, SPException *ex=NULL);
+    void setAttribute(         char const *key, Glib::ustring const &value, SPException *ex=NULL);
+    void setAttribute(Glib::ustring const &key, Glib::ustring const &value, SPException *ex=NULL);
 
     /**
      * Read value of key attribute from XML node into object.