cppification : GHashMaps replaced by stl maps. getResouceList now gives a std::set<SPObject *>.

Should give some performance improvements (quite a few linear lookups are now logarithmic)

(bzr r14504.1.6)

22 files changed, 162 insertions, 183 deletions

diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index 690a72654..34f1b0155 100644
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -488,18 +488,17 @@ static int getLcmsIntent( guint svgIntent )
 static SPObject* bruteFind( SPDocument* document, gchar const* name )
 {
     SPObject* result = 0;
-    const GSList * current = document->getResourceList("iccprofile");
-    while ( current && !result ) {
-        if ( IS_COLORPROFILE(current->data) ) {
-            ColorProfile* prof = COLORPROFILE(current->data);
+    std::set<SPObject *> current = document->getResourceList("iccprofile");
+    for (std::set<SPObject *>::const_iterator it = current.begin(); (!result) && (it != current.end()); ++it) {
+        if ( IS_COLORPROFILE(*it) ) {
+            ColorProfile* prof = COLORPROFILE(*it);
             if ( prof ) {
                 if ( prof->name && (strcmp(prof->name, name) == 0) ) {
-                    result = SP_OBJECT(current->data);
+                    result = SP_OBJECT(*it);
                     break;
                 }
             }
         }
-        current = g_slist_next(current);
     }
 
     return result;
diff --git a/src/document-private.h b/src/document-private.h
index a5033b3c2..a4a2abd77 100644
--- a/src/document-private.h
+++ b/src/document-private.h
@@ -15,6 +15,8 @@
  */
 
 #include <map>
+#include <set>
+#include <string>
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "xml/event-fns.h"
@@ -40,8 +42,10 @@ struct SPDocumentPrivate {
 	typedef std::map<GQuark, SPDocument::IDChangedSignal> IDChangedSignalMap;
 	typedef std::map<GQuark, SPDocument::ResourcesChangedSignal> ResourcesChangedSignalMap;
 
-	GHashTable *iddef;	/**< Dictionary of id -> SPObject mappings */
-	GHashTable *reprdef;   /**< Dictionary of Inkscape::XML::Node -> SPObject mappings */
+        std::map<std::string, SPObject *> iddef;
+        std::map<Inkscape::XML::Node *, SPObject *> reprdef;
+	//GHashTable *iddef;	/**< Dictionary of id -> SPObject mappings */
+	//GHashTable *reprdef;   /**< Dictionary of Inkscape::XML::Node -> SPObject mappings */
 
 	unsigned long serial;
 
@@ -50,7 +54,8 @@ struct SPDocumentPrivate {
 
 	/* Resources */
 	/* It is GHashTable of GSLists */
-	GHashTable *resources;
+        std::map<std::string, std::set<SPObject *> > resources;
+	//GHashTable *resources;
 	ResourcesChangedSignalMap resources_changed_signals;
 
         sigc::signal<void> destroySignal;
diff --git a/src/document.cpp b/src/document.cpp
index 23d99d78c..8c160be38 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -119,11 +119,6 @@ SPDocument::SPDocument() :
 
     p->serial = next_serial++;
 
-    p->iddef = g_hash_table_new(g_direct_hash, g_direct_equal);
-    p->reprdef = g_hash_table_new(g_direct_hash, g_direct_equal);
-
-    p->resources = g_hash_table_new(g_str_hash, g_str_equal);
-
     p->sensitive = false;
     p->partial = NULL;
     p->history_size = 0;
@@ -177,17 +172,10 @@ SPDocument::~SPDocument() {
             root = NULL;
         }
 
-        if (priv->iddef) g_hash_table_destroy(priv->iddef);
-        if (priv->reprdef) g_hash_table_destroy(priv->reprdef);
-
         if (rdoc) Inkscape::GC::release(rdoc);
 
         /* Free resources */
-        g_hash_table_foreach_remove(priv->resources, sp_document_resource_list_free, this);
-        g_hash_table_destroy(priv->resources);
-
-        delete priv;
-        priv = NULL;
+        priv->resources.clear();
     }
 
     cr_cascade_unref(style_cascade);
@@ -1008,11 +996,15 @@ void SPDocument::bindObjectToId(gchar const *id, SPObject *object) {
     GQuark idq = g_quark_from_string(id);
 
     if (object) {
-        g_assert(g_hash_table_lookup(priv->iddef, GINT_TO_POINTER(idq)) == NULL);
-        g_hash_table_insert(priv->iddef, GINT_TO_POINTER(idq), object);
+        g_assert(priv->iddef.find(id)==priv->iddef.end());
+        priv->iddef[id] = object;
+        //g_assert(g_hash_table_lookup(priv->iddef, GINT_TO_POINTER(idq)) == NULL);
+        //g_hash_table_insert(priv->iddef, GINT_TO_POINTER(idq), object);
     } else {
-        g_assert(g_hash_table_lookup(priv->iddef, GINT_TO_POINTER(idq)) != NULL);
-        g_hash_table_remove(priv->iddef, GINT_TO_POINTER(idq));
+        g_assert(priv->iddef.find(id)!=priv->iddef.end());
+        priv->iddef.erase(id);
+        //g_assert(g_hash_table_lookup(priv->iddef, GINT_TO_POINTER(idq)) != NULL);
+        //g_hash_table_remove(priv->iddef, GINT_TO_POINTER(idq));
     }
 
     SPDocumentPrivate::IDChangedSignalMap::iterator pos;
@@ -1047,15 +1039,16 @@ SPObject *SPDocument::getObjectById(Glib::ustring const &id) const
 SPObject *SPDocument::getObjectById(gchar const *id) const
 {
     g_return_val_if_fail(id != NULL, NULL);
-    if (!priv || !priv->iddef) {
+    if (!priv || priv->iddef.empty()) {
     	return NULL;
     }
 
     GQuark idq = g_quark_from_string(id);
-    gpointer rv = g_hash_table_lookup(priv->iddef, GINT_TO_POINTER(idq));
-    if(rv != NULL)
+    std::map<std::string, SPObject *>::iterator rv = priv->iddef.find(id);
+    //gpointer rv = g_hash_table_lookup(priv->iddef, GINT_TO_POINTER(idq));
+    if(rv != priv->iddef.end())
     {
-        return static_cast<SPObject*>(rv);
+        return (rv->second);
     }
     else
     {
@@ -1072,18 +1065,22 @@ sigc::connection SPDocument::connectIdChanged(gchar const *id,
 void SPDocument::bindObjectToRepr(Inkscape::XML::Node *repr, SPObject *object)
 {
     if (object) {
-        g_assert(g_hash_table_lookup(priv->reprdef, repr) == NULL);
-        g_hash_table_insert(priv->reprdef, repr, object);
+        g_assert(priv->reprdef.find(repr)==priv->reprdef.end());
+        priv->reprdef[repr] = object;
     } else {
-        g_assert(g_hash_table_lookup(priv->reprdef, repr) != NULL);
-        g_hash_table_remove(priv->reprdef, repr);
+        g_assert(priv->reprdef.find(repr)!=priv->reprdef.end());
+        priv->reprdef.erase(repr); 
     }
 }
 
 SPObject *SPDocument::getObjectByRepr(Inkscape::XML::Node *repr) const
 {
     g_return_val_if_fail(repr != NULL, NULL);
-    return static_cast<SPObject*>(g_hash_table_lookup(priv->reprdef, repr));
+    std::map<Inkscape::XML::Node *, SPObject *>::iterator rv = priv->reprdef.find(repr);
+    if(rv != priv->reprdef.end())
+        return (rv->second);
+    else
+        return NULL;
 }
 
 Glib::ustring SPDocument::getLanguage() const
@@ -1528,10 +1525,9 @@ bool SPDocument::addResource(gchar const *key, SPObject *object)
     bool result = false;
 
     if ( !object->cloned ) {
-        GSList *rlist = (GSList*)g_hash_table_lookup(priv->resources, key);
-        g_return_val_if_fail(!g_slist_find(rlist, object), false);
-        rlist = g_slist_prepend(rlist, object);
-        g_hash_table_insert(priv->resources, (gpointer) key, rlist);
+        std::set<SPObject *> rlist = priv->resources[key];
+        g_return_val_if_fail(rlist.find(object) == rlist.end(), false);
+        rlist.insert(object);
 
         GQuark q = g_quark_from_string(key);
 
@@ -1560,11 +1556,10 @@ bool SPDocument::removeResource(gchar const *key, SPObject *object)
     bool result = false;
 
     if ( !object->cloned ) {
-        GSList *rlist = (GSList*)g_hash_table_lookup(priv->resources, key);
-        g_return_val_if_fail(rlist != NULL, false);
-        g_return_val_if_fail(g_slist_find(rlist, object), false);
-        rlist = g_slist_remove(rlist, object);
-        g_hash_table_insert(priv->resources, (gpointer) key, rlist);
+        std::set<SPObject *> rlist = priv->resources[key];
+        g_return_val_if_fail(!rlist.empty(), false);
+        g_return_val_if_fail(rlist.find(object) != rlist.end(), false);
+        rlist.erase(object);
 
         GQuark q = g_quark_from_string(key);
         priv->resources_changed_signals[q].emit();
@@ -1575,12 +1570,13 @@ bool SPDocument::removeResource(gchar const *key, SPObject *object)
     return result;
 }
 
-GSList const *SPDocument::getResourceList(gchar const *key) const
+std::set<SPObject *> const SPDocument::getResourceList(gchar const *key) const
 {
-    g_return_val_if_fail(key != NULL, NULL);
-    g_return_val_if_fail(*key != '\0', NULL);
+    std::set<SPObject *> emptyset;
+    g_return_val_if_fail(key != NULL, emptyset);
+    g_return_val_if_fail(*key != '\0', emptyset);
 
-    return (GSList*)g_hash_table_lookup(this->priv->resources, key);
+    return this->priv->resources[key];
 }
 
 sigc::connection SPDocument::connectResourcesChanged(gchar const *key,
diff --git a/src/document.h b/src/document.h
index be3f106d8..c7d3abf90 100644
--- a/src/document.h
+++ b/src/document.h
@@ -27,6 +27,7 @@
 #include <glibmm/ustring.h>
 #include <boost/ptr_container/ptr_list.hpp>
 #include <vector>
+#include <set>
 
 namespace Avoid {
 class Router;
@@ -258,7 +259,7 @@ public:
     int ensureUpToDate();
     bool addResource(char const *key, SPObject *object);
     bool removeResource(char const *key, SPObject *object);
-    const GSList *getResourceList(char const *key) const;
+    const std::set<SPObject *> getResourceList(char const *key) const;
     std::vector<SPItem*> getItemsInBox(unsigned int dkey, Geom::Rect const &box) const;
     std::vector<SPItem*> getItemsPartiallyInBox(unsigned int dkey, Geom::Rect const &box) const;
     SPItem *getItemAtPoint(unsigned int key, Geom::Point const &p, bool into_groups, SPItem *upto = NULL) const;
diff --git a/src/gradient-chemistry.cpp b/src/gradient-chemistry.cpp
index 29522d7b1..9f2d030d4 100644
--- a/src/gradient-chemistry.cpp
+++ b/src/gradient-chemistry.cpp
@@ -1612,9 +1612,9 @@ void sp_gradient_unset_swatch(SPDesktop *desktop, std::string id)
     SPDocument *doc = desktop ? desktop->doc() : 0;
 
     if (doc) {
-        const GSList *gradients = doc->getResourceList("gradient");
-        for (const GSList *item = gradients; item; item = item->next) {
-            SPGradient* grad = SP_GRADIENT(item->data);
+        const std::set<SPObject *> gradients = doc->getResourceList("gradient");
+        for (std::set<SPObject *>::const_iterator i = gradients.begin(); i != gradients.end(); ++i) {
+            SPGradient* grad = SP_GRADIENT(*i);
             if ( id == grad->getId() ) {
                 grad->setSwatch(false);
                 DocumentUndo::done(doc, SP_VERB_CONTEXT_GRADIENT,
diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index 3e5fcd0f4..8fd997121 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -208,9 +208,9 @@ Glib::ustring GrDrag::makeStopSafeColor( gchar const *str, bool &isNull )
         Glib::ustring::size_type pos = colorStr.find("url(#");
         if ( pos != Glib::ustring::npos ) {
             Glib::ustring targetName = colorStr.substr(pos + 5, colorStr.length() - 6);
-            const GSList *gradients = desktop->doc()->getResourceList("gradient");
-            for (const GSList *item = gradients; item; item = item->next) {
-                SPGradient* grad = SP_GRADIENT(item->data);
+            std::set<SPObject *> gradients = desktop->doc()->getResourceList("gradient");
+            for (std::set<SPObject *>::const_iterator it = gradients.begin(); it != gradients.end(); ++it) {
+                SPGradient* grad = SP_GRADIENT(*it);
                 if ( targetName == grad->getId() ) {
                     SPGradient *vect = grad->getVector();
                     SPStop *firstStop = (vect) ? vect->getFirstStop() : grad->getFirstStop();
diff --git a/src/layer-manager.cpp b/src/layer-manager.cpp
index 3bbc831d5..5dae5f20a 100644
--- a/src/layer-manager.cpp
+++ b/src/layer-manager.cpp
@@ -191,15 +191,12 @@ Glib::ustring LayerManager::getNextLayerName( SPObject* obj, gchar const *label)
     }
 
     std::set<Glib::ustring> currentNames;
-    GSList const *layers=_document->getResourceList("layer");
+    std::set<SPObject *> layers = _document->getResourceList("layer");
     SPObject *root=_desktop->currentRoot();
     if ( root ) {
-        for ( GSList const *iter=layers ; iter ; iter = iter->next ) {
-            SPObject *layer=static_cast<SPObject *>(iter->data);
-            if ( layer != obj ) {
-                currentNames.insert( layer->label() ? Glib::ustring(layer->label()) : Glib::ustring() );
-            }
-        }
+        std::set<SPObject *>::iterator iter = layers.find(obj);
+        if (iter != layers.end())
+                currentNames.insert( (*iter)->label() ? Glib::ustring((*iter)->label()) : Glib::ustring() );
     }
 
     // Not sure if we need to cap it, but we'll just be paranoid for the moment
@@ -262,15 +259,16 @@ void LayerManager::_rebuild() {
     if (!_document) // http://sourceforge.net/mailarchive/forum.php?thread_name=5747bce9a7ed077c1b4fc9f0f4f8a5e0%40localhost&forum_name=inkscape-devel
         return;
 
-    GSList const *layers = _document->getResourceList("layer");
+    std::set<SPObject *> layers = _document->getResourceList("layer");
+
     SPObject *root=_desktop->currentRoot();
     if ( root ) {
         _addOne(root);
 
         std::set<SPGroup*> layersToAdd;
 
-        for ( GSList const *iter = layers; iter; iter = iter->next ) {
-            SPObject *layer = static_cast<SPObject *>(iter->data);
+        for ( std::set<SPObject *>::const_iterator iter = layers.begin(); iter != layers.end(); ++iter ) {
+            SPObject *layer = *iter;
 //             Debug::EventTracker<DebugLayerNote> tracker(Util::format("Examining %s", layer->label()));
             bool needsAdd = false;
             std::set<SPGroup*> additional;
@@ -282,7 +280,7 @@ void LayerManager::_rebuild() {
                         SPGroup* group = SP_GROUP(curr);
                         if ( group->layerMode() == SPGroup::LAYER ) {
                             // If we have a layer-group as the one or a parent, ensure it is listed as a valid layer.
-                            needsAdd &= ( g_slist_find(const_cast<GSList *>(layers), curr) != NULL );
+                            needsAdd &= ( layers.find(curr) != layers.end() );
 							// XML Tree being used here directly while it shouldn't be...
                             if ( (!(group->getRepr())) || (!(group->getRepr()->parent())) ) {
                                 needsAdd = false;
diff --git a/src/profile-manager.cpp b/src/profile-manager.cpp
index 90b124195..035aa6051 100644
--- a/src/profile-manager.cpp
+++ b/src/profile-manager.cpp
@@ -34,11 +34,9 @@ void ProfileManager::_resourcesChanged()
 {
     std::vector<SPObject*> newList;
     if (_doc) {
-        const GSList *current = _doc->getResourceList( "iccprofile" );
-        while ( current ) {
-            newList.push_back(SP_OBJECT(current->data));
-            current = g_slist_next(current);
-        }
+        std::set<SPObject *> current = _doc->getResourceList( "iccprofile" );
+        for (std::set<SPObject *>::const_iterator i = current.begin(); i != current.end(); ++i)
+            newList.push_back(*i);
     }
     sort( newList.begin(), newList.end() );
 
diff --git a/src/resource-manager.cpp b/src/resource-manager.cpp
index dbff27827..18d7c6ba2 100644
--- a/src/resource-manager.cpp
+++ b/src/resource-manager.cpp
@@ -179,9 +179,9 @@ std::vector<Glib::ustring> ResourceManagerImpl::findBrokenLinks( SPDocument *doc
     std::set<Glib::ustring> uniques;
 
     if ( doc ) {
-        GSList const *images = doc->getResourceList("image");
-        for (GSList const *it = images; it; it = it->next) {
-            Inkscape::XML::Node *ir = static_cast<SPObject *>(it->data)->getRepr();
+        std::set<SPObject *> images = doc->getResourceList("image");
+        for (std::set<SPObject *>::const_iterator it = images.begin(); it != images.end(); ++it) {
+            Inkscape::XML::Node *ir = (*it)->getRepr();
 
             gchar const *href = ir->attribute("xlink:href");
             if ( href &&  ( uniques.find(href) == uniques.end() ) ) {
@@ -305,10 +305,10 @@ bool ResourceManagerImpl::fixupBrokenLinks(SPDocument *doc)
 
         bool savedUndoState = DocumentUndo::getUndoSensitive(doc);
         DocumentUndo::setUndoSensitive(doc, true);
-
-        GSList const *images = doc->getResourceList("image");
-        for (GSList const *it = images; it; it = it->next) {
-            Inkscape::XML::Node *ir = static_cast<SPObject *>(it->data)->getRepr();
+        
+        std::set<SPObject *> images = doc->getResourceList("image");
+        for (std::set<SPObject *>::const_iterator it = images.begin(); it != images.end(); ++it) {
+            Inkscape::XML::Node *ir = (*it)->getRepr();
 
             gchar const *href = ir->attribute("xlink:href");
             if ( href ) {
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index 06eaee001..6038860f8 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -255,10 +255,11 @@ void sp_guide_create_guides_around_page(SPDesktop *dt)
 void sp_guide_delete_all_guides(SPDesktop *dt)
 {
     SPDocument *doc=dt->getDocument();
-    const GSList *current;
-    while ( (current = doc->getResourceList("guide")) ) {
-        SPGuide* guide = SP_GUIDE(current->data);
+    std::set<SPObject *> current = doc->getResourceList("guide");
+    while (!current.empty()){
+        SPGuide* guide = SP_GUIDE(*(current.begin()));
         sp_guide_remove(guide);
+        current = doc->getResourceList("guide");
     }
 
     DocumentUndo::done(doc, SP_VERB_NONE, _("Delete All Guides"));
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 5b63d14e1..8af744fd3 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -511,17 +511,16 @@ void DocumentProperties::linkSelectedProfile()
 void DocumentProperties::populate_linked_profiles_box()
 {
     _LinkedProfilesListStore->clear();
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" );
-    if (current) {
-        _emb_profiles_observer.set(SP_OBJECT(current->data)->parent);
+    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" );
+    if (! current.empty()) {
+        _emb_profiles_observer.set((*(current.begin()))->parent);
     }
-    while ( current ) {
-        SPObject* obj = SP_OBJECT(current->data);
+    for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+        SPObject* obj = *it;
         Inkscape::ColorProfile* prof = reinterpret_cast<Inkscape::ColorProfile*>(obj);
         Gtk::TreeModel::Row row = *(_LinkedProfilesListStore->append());
         row[_LinkedProfilesListColumns.nameColumn] = prof->name;
 //        row[_LinkedProfilesListColumns.previewColumn] = "Color Preview";
-        current = g_slist_next(current);
     }
 }
 
@@ -594,10 +593,9 @@ void DocumentProperties::removeSelectedProfile(){
             return;
         }
     }
-
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" );
-    while ( current ) {
-        SPObject* obj = SP_OBJECT(current->data);
+    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" );
+    for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+        SPObject* obj = *it;
         Inkscape::ColorProfile* prof = reinterpret_cast<Inkscape::ColorProfile*>(obj);
         if (!name.compare(prof->name)){
 
@@ -606,7 +604,6 @@ void DocumentProperties::removeSelectedProfile(){
             DocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_REMOVE_COLOR_PROFILE, _("Remove linked color profile"));
             break; // removing the color profile likely invalidates part of the traversed list, stop traversing here.
         }
-        current = g_slist_next(current);
     }
 
     populate_linked_profiles_box();
@@ -722,9 +719,9 @@ void DocumentProperties::build_cms()
     _LinkedProfilesList.signal_button_release_event().connect_notify(sigc::mem_fun(*this, &DocumentProperties::linked_profiles_list_button_release));
     cms_create_popup_menu(_LinkedProfilesList, sigc::mem_fun(*this, &DocumentProperties::removeSelectedProfile));
 
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "defs" );
-    if (current) {
-        _emb_profiles_observer.set(SP_OBJECT(current->data)->parent);
+    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "defs" );
+    if (!current.empty()) {
+        _emb_profiles_observer.set((*(current.begin()))->parent);
     }
     _emb_profiles_observer.signal_changed().connect(sigc::mem_fun(*this, &DocumentProperties::populate_linked_profiles_box));
     onColorProfileSelectRow();
@@ -959,9 +956,9 @@ void DocumentProperties::build_scripting()
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
 //TODO: review this observers code:
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
-    if (current) {
-        _scripts_observer.set(SP_OBJECT(current->data)->parent);
+    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
+    if (! current.empty()) {
+        _scripts_observer.set((*(current.begin()))->parent);
     }
     _scripts_observer.signal_changed().connect(sigc::mem_fun(*this, &DocumentProperties::populate_script_lists));
     onEmbeddedScriptSelectRow();
@@ -1174,9 +1171,9 @@ void DocumentProperties::removeExternalScript(){
         }
     }
 
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
-    while ( current ) {
-        SPObject* obj = reinterpret_cast<SPObject *>(current->data);
+    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
+    for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+        SPObject* obj = *it;
         if (obj) {
             SPScript* script = dynamic_cast<SPScript *>(obj);
             if (script && (name == script->xlinkhref)) {
@@ -1191,7 +1188,6 @@ void DocumentProperties::removeExternalScript(){
                 }
             }
         }
-        current = g_slist_next(current);
     }
 
     populate_script_lists();
@@ -1253,9 +1249,9 @@ void DocumentProperties::changeEmbeddedScript(){
     }
 
     bool voidscript=true;
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
-    while ( current ) {
-        SPObject* obj = SP_OBJECT(current->data);
+    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
+    for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+        SPObject* obj = *it;
         if (id == obj->getId()){
 
             int count=0;
@@ -1279,7 +1275,6 @@ void DocumentProperties::changeEmbeddedScript(){
                 }
             }
         }
-        current = g_slist_next(current);
     }
 
     if (voidscript)
@@ -1299,9 +1294,9 @@ void DocumentProperties::editEmbeddedScript(){
     }
 
     Inkscape::XML::Document *xml_doc = SP_ACTIVE_DOCUMENT->getReprDoc();
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
-    while ( current ) {
-        SPObject* obj = SP_OBJECT(current->data);
+    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
+    for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+        SPObject* obj = *it;
         if (id == obj->getId()){
 
             //XML Tree being used directly here while it shouldn't be.
@@ -1317,21 +1312,20 @@ void DocumentProperties::editEmbeddedScript(){
                 DocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_EMBEDDED_SCRIPT, _("Edit embedded script"));
             }
         }
-        current = g_slist_next(current);
     }
 }
 
 void DocumentProperties::populate_script_lists(){
     _ExternalScriptsListStore->clear();
     _EmbeddedScriptsListStore->clear();
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
-    if (current) {
-        SPObject *obj = reinterpret_cast<SPObject *>(current->data);
+    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
+    if (!current.empty()) {
+        SPObject *obj = *(current.begin());
         g_assert(obj != NULL);
         _scripts_observer.set(obj->parent);
     }
-    while ( current ) {
-        SPObject* obj = reinterpret_cast<SPObject *>(current->data);
+    for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+        SPObject* obj = *it;
         SPScript* script = dynamic_cast<SPScript *>(obj);
         g_assert(script != NULL);
         if (script->xlinkhref)
@@ -1344,8 +1338,6 @@ void DocumentProperties::populate_script_lists(){
             Gtk::TreeModel::Row row = *(_EmbeddedScriptsListStore->append());
             row[_EmbeddedScriptsListColumns.idColumn] = obj->getId();
         }
-
-        current = g_slist_next(current);
     }
 }
 
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 08a58291d..e3196bf59 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -1589,13 +1589,14 @@ void FilterEffectsDialog::FilterModifier::update_filters()
 {
     SPDesktop* desktop = _dialog.getDesktop();
     SPDocument* document = desktop->getDocument();
-    const GSList* filters = document->getResourceList("filter");
+
+    std::set<SPObject *> filters = document->getResourceList( "filter" );
 
     _model->clear();
 
-    for(const GSList *l = filters; l; l = l->next) {
+    for (std::set<SPObject *>::const_iterator it = filters.begin(); it != filters.end(); ++it) {
         Gtk::TreeModel::Row row = *_model->append();
-        SPFilter* f = SP_FILTER(l->data);
+        SPFilter* f = SP_FILTER(*it);
         row[_columns.filter] = f;
         const gchar* lbl = f->label();
         const gchar* id = f->getId();
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 3f5e80f8d..f4152e556 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -1040,14 +1040,6 @@ void LayersPanel::setDesktop( SPDesktop* desktop )
             _layersChanged();
         }
     }
-/*
-    GSList const *layers = _desktop->doc()->getResourceList( "layer" );
-    g_message( "layers list starts at %p", layers );
-    for ( GSList const *iter=layers ; iter ; iter = iter->next ) {
-        SPObject *layer=static_cast<SPObject *>(iter->data);
-        g_message("  {%s}   [%s]", layer->id, layer->label() );
-    }
-*/
     deskTrack.setBase(desktop);
 }
 
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 12b423602..46e045c14 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -266,12 +266,12 @@ void SvgFontsDialog::update_fonts()
 {
     SPDesktop* desktop = this->getDesktop();
     SPDocument* document = desktop->getDocument();
-    const GSList* fonts = document->getResourceList("font");
+    std::set<SPObject *> fonts = document->getResourceList( "fonts" );
 
     _model->clear();
-    for(const GSList *l = fonts; l; l = l->next) {
+    for (std::set<SPObject *>::const_iterator it = fonts.begin(); it != fonts.end(); ++it) {
         Gtk::TreeModel::Row row = *_model->append();
-        SPFont* f = SP_FONT(l->data);
+        SPFont* f = SP_FONT(*it);
         row[_columns.spfont] = f;
         row[_columns.svgfont] = new SvgFont(f);
         const gchar* lbl = f->label();
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 72677c07e..ed1cd2079 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -171,9 +171,9 @@ static void editGradient( GtkMenuItem */*menuitem*/, gpointer /*user_data*/ )
         SPDocument *doc = desktop ? desktop->doc() : 0;
         if (doc) {
             std::string targetName(bounceTarget->def.descr);
-            const GSList *gradients = doc->getResourceList("gradient");
-            for (const GSList *item = gradients; item; item = item->next) {
-                SPGradient* grad = SP_GRADIENT(item->data);
+            std::set<SPObject *> gradients = doc->getResourceList("gradient");
+            for (std::set<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) {
+                SPGradient* grad = SP_GRADIENT(*item);
                 if ( targetName == grad->getId() ) {
                     editGradientImpl( desktop, grad );
                     break;
@@ -192,10 +192,10 @@ void SwatchesPanelHook::convertGradient( GtkMenuItem * /*menuitem*/, gpointer us
         gint index = GPOINTER_TO_INT(userData);
         if ( doc && (index >= 0) && (static_cast<guint>(index) < popupItems.size()) ) {
             Glib::ustring targetName = popupItems[index];
+            std::set<SPObject *> gradients = doc->getResourceList("gradient");
+            for (std::set<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) {
+                SPGradient* grad = SP_GRADIENT(*item);
 
-            const GSList *gradients = doc->getResourceList("gradient");
-            for (const GSList *item = gradients; item; item = item->next) {
-                SPGradient* grad = SP_GRADIENT(item->data);
                 if ( targetName == grad->getId() ) {
                     grad->setSwatch();
                     DocumentUndo::done(doc, SP_VERB_CONTEXT_GRADIENT,
@@ -326,10 +326,10 @@ gboolean colorItemHandleButtonPress( GtkWidget* widget, GdkEventButton* event, g
                     SPDesktopWidget *dtw = SP_DESKTOP_WIDGET(wdgt);
                     if ( dtw && dtw->desktop ) {
                         // Pick up all gradients with vectors
-                        const GSList *gradients = (dtw->desktop->doc())->getResourceList("gradient");
+                        std::set<SPObject *> gradients = (dtw->desktop->doc())->getResourceList("gradient");
                         gint index = 0;
-                        for (const GSList *curr = gradients; curr; curr = curr->next) {
-                            SPGradient* grad = SP_GRADIENT(curr->data);
+                        for (std::set<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) {
+                            SPGradient* grad = SP_GRADIENT(*item);
                             if ( grad->hasStops() && !grad->isSwatch() ) {
                                 //gl = g_slist_prepend(gl, curr->data);
                                 processed = true;
@@ -923,12 +923,11 @@ static void recalcSwatchContents(SPDocument* doc,
                 std::map<ColorItem*, SPGradient*> &gradMappings)
 {
     std::vector<SPGradient*> newList;
-
-    const GSList *gradients = doc->getResourceList("gradient");
-    for (const GSList *item = gradients; item; item = item->next) {
-        SPGradient* grad = SP_GRADIENT(item->data);
+    std::set<SPObject *> gradients = doc->getResourceList("gradient");
+    for (std::set<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) {
+        SPGradient* grad = SP_GRADIENT(*item);
         if ( grad->isSwatch() ) {
-            newList.push_back(SP_GRADIENT(item->data));
+            newList.push_back(SP_GRADIENT(*item));
         }
     }
 
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 0f719b40f..9855b59a3 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -1113,9 +1113,9 @@ sp_ui_drag_data_received(GtkWidget *widget,
                         unsigned int b = color.getB();
 
                         SPGradient* matches = 0;
-                        const GSList *gradients = doc->getResourceList("gradient");
-                        for (const GSList *item = gradients; item; item = item->next) {
-                            SPGradient* grad = SP_GRADIENT(item->data);
+                        std::set<SPObject *> gradients = doc->getResourceList("gradient");
+                        for (std::set<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) {
+                            SPGradient* grad = SP_GRADIENT(*item);
                             if ( color.descr == grad->getId() ) {
                                 if ( grad->hasStops() ) {
                                     matches = grad;
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index 1c31ae33a..2fe4a0704 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -676,9 +676,9 @@ void ColorICCSelectorImpl::_profilesChanged(std::string const &name)
     gtk_combo_box_set_active(combo, 0);
 
     int index = 1;
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList("iccprofile");
-    while (current) {
-        SPObject *obj = SP_OBJECT(current->data);
+    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList("iccprofile");
+    for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+        SPObject *obj = *it;
         Inkscape::ColorProfile *prof = reinterpret_cast<Inkscape::ColorProfile *>(obj);
 
         gtk_list_store_append(store, &iter);
@@ -690,7 +690,6 @@ void ColorICCSelectorImpl::_profilesChanged(std::string const &name)
         }
 
         index++;
-        current = g_slist_next(current);
     }
 
     g_signal_handler_unblock(G_OBJECT(_profileSel), _profChangedID);
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index e19f56e48..71a19d962 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -1813,9 +1813,9 @@ bool SPDesktopWidget::onFocusInEvent(GdkEventFocus*)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if (prefs->getBool("/options/bitmapautoreload/value", true)) {
-        GSList const *imageList = (desktop->doc())->getResourceList("image");
-        for (GSList const *p = imageList; p; p = p->next) {
-            SPImage* image = SP_IMAGE(p->data);
+        std::set<SPObject *> imageList = (desktop->doc())->getResourceList("image");
+        for (std::set<SPObject *>::const_iterator it = imageList.begin(); it != imageList.end(); ++it) {
+            SPImage* image = SP_IMAGE(*it);
             sp_image_refresh_if_outdated( image );
         }
     }
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp
index e8ad09cd4..858aa05db 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -139,19 +139,18 @@ gboolean gr_vector_list(GtkWidget *combo_box, SPDesktop *desktop, bool selection
     /* Clear old list, if there is any */
     gtk_list_store_clear(store);
 
-    GSList *gl = NULL;
-    const GSList *gradients = document->getResourceList("gradient");
-    for (const GSList *i = gradients; i != NULL; i = i->next) {
-        SPGradient *grad = SP_GRADIENT(i->data);
+    std::vector<SPObject *> gl;
+    std::set<SPObject *> gradients = document->getResourceList( "gradient" );
+    for (std::set<SPObject *>::const_iterator it = gradients.begin(); it != gradients.end(); ++it) {
+        SPGradient *grad = SP_GRADIENT(*it);
         if ( grad->hasStops() && !grad->isSolid() ) {
-            gl = g_slist_prepend(gl, i->data);
+            gl.push_back(*it);
         }
     }
-    gl = g_slist_reverse(gl);
 
     guint pos = 0;
 
-    if (!gl) {
+    if (gl.empty()) {
         // The document has no gradients
         gtk_list_store_append(store, &iter);
         gtk_list_store_set(store, &iter, 0, _("No gradient"), 1, NULL, 2, NULL, -1);
@@ -180,9 +179,8 @@ gboolean gr_vector_list(GtkWidget *combo_box, SPDesktop *desktop, bool selection
         }
 
         guint idx = 0;
-        while (gl) {
-            SPGradient *gradient = SP_GRADIENT(gl->data);
-            gl = g_slist_remove(gl, gradient);
+        for (std::vector<SPObject *>::const_iterator it = gl.begin(); it != gl.end(); ++it) {
+            SPGradient *gradient = SP_GRADIENT(*it);
 
             Glib::ustring label = gr_prepare_label(gradient);
             GdkPixbuf *pixb = sp_gradient_to_pixbuf(gradient, 64, 16);
@@ -765,25 +763,25 @@ static gboolean update_stop_list( GtkWidget *stop_combo, SPGradient *gradient, S
     }
 
     /* Populate the combobox store */
-    GSList *sl = NULL;
+    std::vector<SPObject *> sl;
     if ( gradient->hasStops() ) {
         for ( SPObject *ochild = gradient->firstChild() ; ochild ; ochild = ochild->getNext() ) {
             if (SP_IS_STOP(ochild)) {
-                sl = g_slist_append(sl, ochild);
+                sl.push_back(ochild);
             }
         }
     }
-    if (!sl) {
+    if (sl.empty()) {
         gtk_list_store_append(store, &iter);
         gtk_list_store_set(store, &iter, 0, _("No stops in gradient"), 1, NULL, 2, NULL, -1);
         sensitive = FALSE;
 
     } else {
 
-        for (; sl != NULL; sl = sl->next){
-            if (SP_IS_STOP(sl->data)){
-                SPStop *stop = SP_STOP(sl->data);
-                Inkscape::XML::Node *repr = reinterpret_cast<SPItem *>(sl->data)->getRepr();
+        for (std::vector<SPObject *>::const_iterator it = sl.begin(); it != sl.end(); ++it) {
+            if (SP_IS_STOP(*it)){
+                SPStop *stop = SP_STOP(*it);
+                Inkscape::XML::Node *repr = reinterpret_cast<SPItem *>(*it)->getRepr();
                 Inkscape::UI::Widget::ColorPreview *cpv = Gtk::manage(new Inkscape::UI::Widget::ColorPreview(stop->get_rgba32()));
                 GdkPixbuf *pb = cpv->toPixbuf(32, 16);
                 Glib::ustring label = gr_ellipsize_text(repr->attribute("id"), 25);
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 8e92f589a..35c1e4a8d 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -298,11 +298,11 @@ static void sp_gvs_rebuild_gui_full(SPGradientVectorSelector *gvs)
     /* Pick up all gradients with vectors */
     GSList *gl = NULL;
     if (gvs->gr) {
-        const GSList *gradients = gvs->gr->document->getResourceList("gradient");
-        for (const GSList *curr = gradients; curr; curr = curr->next) {
-            SPGradient* grad = SP_GRADIENT(curr->data);
+        std::set<SPObject *> gradients = gvs->gr->document->getResourceList("gradient");
+        for (std::set<SPObject *>::const_iterator it = gradients.begin(); it != gradients.end(); ++it) {
+            SPGradient* grad = SP_GRADIENT(*it);
             if ( grad->hasStops() && (grad->isSwatch() == gvs->swatched) ) {
-                gl = g_slist_prepend(gl, curr->data);
+                gl = g_slist_prepend(gl, *it);
             }
         }
     }
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index d8d314834..602cad3c3 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -844,10 +844,10 @@ ink_pattern_list_get (SPDocument *source)
         return NULL;
 
     GSList *pl = NULL;
-    GSList const *patterns = source->getResourceList("pattern");
-    for (GSList *l = const_cast<GSList *>(patterns); l != NULL; l = l->next) {
-        if (SP_PATTERN(l->data) == SP_PATTERN(l->data)->rootPattern()) {  // only if this is a root pattern
-            pl = g_slist_prepend(pl, l->data);
+    std::set<SPObject *> patterns = source->getResourceList("pattern");
+    for (std::set<SPObject *>::const_iterator it = patterns.begin(); it != patterns.end(); ++it) {
+        if (SP_PATTERN(*it) == SP_PATTERN(*it)->rootPattern()) {  // only if this is a root pattern
+            pl = g_slist_prepend(pl, *it);
         }
     }
 
diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp
index 9d4f4f9fc..2bcae5d81 100644
--- a/src/xml/rebase-hrefs.cpp
+++ b/src/xml/rebase-hrefs.cpp
@@ -220,9 +220,9 @@ void Inkscape::XML::rebase_hrefs(SPDocument *const doc, gchar const *const new_b
      *
      * Note also that Inkscape only supports fragment hrefs (href="#pattern257") for many of these
      * cases. */
-    GSList const *images = doc->getResourceList("image");
-    for (GSList const *l = images; l != NULL; l = l->next) {
-        Inkscape::XML::Node *ir = static_cast<SPObject *>(l->data)->getRepr();
+    std::set<SPObject *> images = doc->getResourceList("image");
+    for (std::set<SPObject *>::const_iterator it = images.begin(); it != images.end(); ++it) {
+        Inkscape::XML::Node *ir = (*it)->getRepr();
 
         std::string uri;
         {