From 9e9ce2c30be9d6af144ff07f69c15c508d84e776 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Sat, 21 May 2016 11:58:25 +0200
Subject: Fix regression: restore order in resources (e.g. pattern list)

(bzr r14907)
---
 src/widgets/desktop-widget.cpp   | 4 ++--
 src/widgets/gradient-toolbar.cpp | 4 ++--
 src/widgets/gradient-vector.cpp  | 4 ++--
 src/widgets/paint-selector.cpp   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/widgets')

diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 0cee426b6..164a06910 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -1902,8 +1902,8 @@ bool SPDesktopWidget::onFocusInEvent(GdkEventFocus*)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if (prefs->getBool("/options/bitmapautoreload/value", true)) {
-        std::set<SPObject *> imageList = (desktop->doc())->getResourceList("image");
-        for (std::set<SPObject *>::const_iterator it = imageList.begin(); it != imageList.end(); ++it) {
+        std::vector<SPObject *> imageList = (desktop->doc())->getResourceList("image");
+        for (std::vector<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 858aa05db..a44e9962e 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -140,8 +140,8 @@ gboolean gr_vector_list(GtkWidget *combo_box, SPDesktop *desktop, bool selection
     gtk_list_store_clear(store);
 
     std::vector<SPObject *> gl;
-    std::set<SPObject *> gradients = document->getResourceList( "gradient" );
-    for (std::set<SPObject *>::const_iterator it = gradients.begin(); it != gradients.end(); ++it) {
+    std::vector<SPObject *> gradients = document->getResourceList( "gradient" );
+    for (std::vector<SPObject *>::const_iterator it = gradients.begin(); it != gradients.end(); ++it) {
         SPGradient *grad = SP_GRADIENT(*it);
         if ( grad->hasStops() && !grad->isSolid() ) {
             gl.push_back(*it);
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 3aa44c90a..97e65141f 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -298,8 +298,8 @@ static void sp_gvs_rebuild_gui_full(SPGradientVectorSelector *gvs)
     /* Pick up all gradients with vectors */
     GSList *gl = NULL;
     if (gvs->gr) {
-        std::set<SPObject *> gradients = gvs->gr->document->getResourceList("gradient");
-        for (std::set<SPObject *>::const_iterator it = gradients.begin(); it != gradients.end(); ++it) {
+        std::vector<SPObject *> gradients = gvs->gr->document->getResourceList("gradient");
+        for (std::vector<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, *it);
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 602cad3c3..aafa6bd1e 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -844,8 +844,8 @@ ink_pattern_list_get (SPDocument *source)
         return NULL;
 
     GSList *pl = NULL;
-    std::set<SPObject *> patterns = source->getResourceList("pattern");
-    for (std::set<SPObject *>::const_iterator it = patterns.begin(); it != patterns.end(); ++it) {
+    std::vector<SPObject *> patterns = source->getResourceList("pattern");
+    for (std::vector<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);
         }
-- 
cgit v1.2.3