Fix regression: restore order in resources (e.g. pattern list)

(bzr r14907)

6 files changed, 32 insertions, 32 deletions

diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index c2c5c5005..12eaba72a 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -492,8 +492,8 @@ void DocumentProperties::linkSelectedProfile()
 	std::vector<std::pair<Glib::ustring, Glib::ustring> > pairs = ColorProfile::getProfileFilesWithNames();
         Glib::ustring file = pairs[row].first;
         Glib::ustring name = pairs[row].second;
-        std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" );
-        for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+        std::vector<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" );
+        for (std::vector<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
             SPObject* obj = *it;
             Inkscape::ColorProfile* prof = reinterpret_cast<Inkscape::ColorProfile*>(obj);
             if (!strcmp(prof->href, file.c_str()))
@@ -532,11 +532,11 @@ void DocumentProperties::linkSelectedProfile()
 void DocumentProperties::populate_linked_profiles_box()
 {
     _LinkedProfilesListStore->clear();
-    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" );
+    std::vector<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" );
     if (! current.empty()) {
         _emb_profiles_observer.set((*(current.begin()))->parent);
     }
-    for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+    for (std::vector<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());
@@ -614,8 +614,8 @@ void DocumentProperties::removeSelectedProfile(){
             return;
         }
     }
-    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" );
-    for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+    std::vector<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" );
+    for (std::vector<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)){
@@ -738,7 +738,7 @@ 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));
 
-    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "defs" );
+    std::vector<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "defs" );
     if (!current.empty()) {
         _emb_profiles_observer.set((*(current.begin()))->parent);
     }
@@ -975,7 +975,7 @@ void DocumentProperties::build_scripting()
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
 //TODO: review this observers code:
-    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
+    std::vector<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
     if (! current.empty()) {
         _scripts_observer.set((*(current.begin()))->parent);
     }
@@ -1190,8 +1190,8 @@ void DocumentProperties::removeExternalScript(){
         }
     }
 
-    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
-    for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+    std::vector<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
+    for (std::vector<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
         SPObject* obj = *it;
         if (obj) {
             SPScript* script = dynamic_cast<SPScript *>(obj);
@@ -1268,8 +1268,8 @@ void DocumentProperties::changeEmbeddedScript(){
     }
 
     bool voidscript=true;
-    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
-    for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+    std::vector<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
+    for (std::vector<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
         SPObject* obj = *it;
         if (id == obj->getId()){
 
@@ -1313,8 +1313,8 @@ void DocumentProperties::editEmbeddedScript(){
     }
 
     Inkscape::XML::Document *xml_doc = SP_ACTIVE_DOCUMENT->getReprDoc();
-    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
-    for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+    std::vector<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
+    for (std::vector<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
         SPObject* obj = *it;
         if (id == obj->getId()){
 
@@ -1337,13 +1337,13 @@ void DocumentProperties::editEmbeddedScript(){
 void DocumentProperties::populate_script_lists(){
     _ExternalScriptsListStore->clear();
     _EmbeddedScriptsListStore->clear();
-    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
+    std::vector<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
     if (!current.empty()) {
         SPObject *obj = *(current.begin());
         g_assert(obj != NULL);
         _scripts_observer.set(obj->parent);
     }
-    for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+    for (std::vector<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
         SPObject* obj = *it;
         SPScript* script = dynamic_cast<SPScript *>(obj);
         g_assert(script != NULL);
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index ce08ed1f7..d3ad5d1da 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -1591,11 +1591,11 @@ void FilterEffectsDialog::FilterModifier::update_filters()
     SPDesktop* desktop = _dialog.getDesktop();
     SPDocument* document = desktop->getDocument();
 
-    std::set<SPObject *> filters = document->getResourceList( "filter" );
+    std::vector<SPObject *> filters = document->getResourceList( "filter" );
 
     _model->clear();
 
-    for (std::set<SPObject *>::const_iterator it = filters.begin(); it != filters.end(); ++it) {
+    for (std::vector<SPObject *>::const_iterator it = filters.begin(); it != filters.end(); ++it) {
         Gtk::TreeModel::Row row = *_model->append();
         SPFilter* f = SP_FILTER(*it);
         row[_columns.filter] = f;
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 46e045c14..790c0e5fb 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -266,10 +266,10 @@ void SvgFontsDialog::update_fonts()
 {
     SPDesktop* desktop = this->getDesktop();
     SPDocument* document = desktop->getDocument();
-    std::set<SPObject *> fonts = document->getResourceList( "fonts" );
+    std::vector<SPObject *> fonts = document->getResourceList( "fonts" );
 
     _model->clear();
-    for (std::set<SPObject *>::const_iterator it = fonts.begin(); it != fonts.end(); ++it) {
+    for (std::vector<SPObject *>::const_iterator it = fonts.begin(); it != fonts.end(); ++it) {
         Gtk::TreeModel::Row row = *_model->append();
         SPFont* f = SP_FONT(*it);
         row[_columns.spfont] = f;
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index f2298b59b..6577c8d4e 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -171,8 +171,8 @@ static void editGradient( GtkMenuItem */*menuitem*/, gpointer /*user_data*/ )
         SPDocument *doc = desktop ? desktop->doc() : 0;
         if (doc) {
             std::string targetName(bounceTarget->def.descr);
-            std::set<SPObject *> gradients = doc->getResourceList("gradient");
-            for (std::set<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) {
+            std::vector<SPObject *> gradients = doc->getResourceList("gradient");
+            for (std::vector<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) {
                 SPGradient* grad = SP_GRADIENT(*item);
                 if ( targetName == grad->getId() ) {
                     editGradientImpl( desktop, grad );
@@ -192,8 +192,8 @@ 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) {
+            std::vector<SPObject *> gradients = doc->getResourceList("gradient");
+            for (std::vector<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) {
                 SPGradient* grad = SP_GRADIENT(*item);
 
                 if ( targetName == grad->getId() ) {
@@ -326,9 +326,9 @@ gboolean colorItemHandleButtonPress( GtkWidget* widget, GdkEventButton* event, g
                     SPDesktopWidget *dtw = SP_DESKTOP_WIDGET(wdgt);
                     if ( dtw && dtw->desktop ) {
                         // Pick up all gradients with vectors
-                        std::set<SPObject *> gradients = (dtw->desktop->doc())->getResourceList("gradient");
+                        std::vector<SPObject *> gradients = (dtw->desktop->doc())->getResourceList("gradient");
                         gint index = 0;
-                        for (std::set<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) {
+                        for (std::vector<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);
@@ -925,8 +925,8 @@ static void recalcSwatchContents(SPDocument* doc,
                 std::map<ColorItem*, SPGradient*> &gradMappings)
 {
     std::vector<SPGradient*> newList;
-    std::set<SPObject *> gradients = doc->getResourceList("gradient");
-    for (std::set<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) {
+    std::vector<SPObject *> gradients = doc->getResourceList("gradient");
+    for (std::vector<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) {
         SPGradient* grad = SP_GRADIENT(*item);
         if ( grad->isSwatch() ) {
             newList.push_back(SP_GRADIENT(*item));
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 3e2a2004c..ab29471ed 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -1128,8 +1128,8 @@ sp_ui_drag_data_received(GtkWidget *widget,
                         unsigned int b = color.getB();
 
                         SPGradient* matches = 0;
-                        std::set<SPObject *> gradients = doc->getResourceList("gradient");
-                        for (std::set<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) {
+                        std::vector<SPObject *> gradients = doc->getResourceList("gradient");
+                        for (std::vector<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) {
                             SPGradient* grad = SP_GRADIENT(*item);
                             if ( color.descr == grad->getId() ) {
                                 if ( grad->hasStops() ) {
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index ec2e69fb3..2e30a48b5 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -687,8 +687,8 @@ void ColorICCSelectorImpl::_profilesChanged(std::string const &name)
     gtk_combo_box_set_active(combo, 0);
 
     int index = 1;
-    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList("iccprofile");
-    for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+    std::vector<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList("iccprofile");
+    for (std::vector<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
         SPObject *obj = *it;
         Inkscape::ColorProfile *prof = reinterpret_cast<Inkscape::ColorProfile *>(obj);