summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/color-profile.cpp4
-rw-r--r--src/document-private.h2
-rw-r--r--src/document.cpp17
-rw-r--r--src/document.h2
-rw-r--r--src/gradient-chemistry.cpp4
-rw-r--r--src/gradient-drag.cpp4
-rw-r--r--src/layer-manager.cpp10
-rw-r--r--src/profile-manager.cpp5
-rw-r--r--src/resource-manager.cpp8
-rw-r--r--src/sp-guide.cpp2
-rw-r--r--src/ui/dialog/document-properties.cpp32
-rw-r--r--src/ui/dialog/filter-effects-dialog.cpp4
-rw-r--r--src/ui/dialog/svg-fonts-dialog.cpp4
-rw-r--r--src/ui/dialog/swatches.cpp16
-rw-r--r--src/ui/interface.cpp4
-rw-r--r--src/ui/widget/color-icc-selector.cpp4
-rw-r--r--src/widgets/desktop-widget.cpp4
-rw-r--r--src/widgets/gradient-toolbar.cpp4
-rw-r--r--src/widgets/gradient-vector.cpp4
-rw-r--r--src/widgets/paint-selector.cpp4
-rw-r--r--src/xml/rebase-hrefs.cpp4
21 files changed, 71 insertions, 71 deletions
diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index bcefe994a..523026aa5 100644
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -489,8 +489,8 @@ static int getLcmsIntent( guint svgIntent )
static SPObject* bruteFind( SPDocument* document, gchar const* name )
{
SPObject* result = 0;
- std::set<SPObject *> current = document->getResourceList("iccprofile");
- for (std::set<SPObject *>::const_iterator it = current.begin(); (!result) && (it != current.end()); ++it) {
+ std::vector<SPObject *> current = document->getResourceList("iccprofile");
+ for (std::vector<SPObject *>::const_iterator it = current.begin(); (!result) && (it != current.end()); ++it) {
if ( IS_COLORPROFILE(*it) ) {
ColorProfile* prof = COLORPROFILE(*it);
if ( prof ) {
diff --git a/src/document-private.h b/src/document-private.h
index eaed0020e..9cac8fac6 100644
--- a/src/document-private.h
+++ b/src/document-private.h
@@ -49,7 +49,7 @@ struct SPDocumentPrivate {
IDChangedSignalMap id_changed_signals;
/* Resources */
- std::map<std::string, std::set<SPObject *> > resources;
+ std::map<std::string, std::vector<SPObject *> > resources;
ResourcesChangedSignalMap resources_changed_signals;
sigc::signal<void> destroySignal;
diff --git a/src/document.cpp b/src/document.cpp
index 7086fc0be..2500a5cee 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -1541,9 +1541,9 @@ bool SPDocument::addResource(gchar const *key, SPObject *object)
bool result = false;
if ( !object->cloned ) {
- std::set<SPObject *> rlist = priv->resources[key];
- g_return_val_if_fail(rlist.find(object) == rlist.end(), false);
- priv->resources[key].insert(object);
+ std::vector<SPObject *> rlist = priv->resources[key];
+ g_return_val_if_fail(std::find(rlist.begin(),rlist.end(),object) == rlist.end(), false);
+ priv->resources[key].insert(priv->resources[key].begin(),object);
GQuark q = g_quark_from_string(key);
@@ -1572,10 +1572,11 @@ bool SPDocument::removeResource(gchar const *key, SPObject *object)
bool result = false;
if ( !object->cloned ) {
- std::set<SPObject *> rlist = priv->resources[key];
+ std::vector<SPObject *> rlist = priv->resources[key];
g_return_val_if_fail(!rlist.empty(), false);
- g_return_val_if_fail(rlist.find(object) != rlist.end(), false);
- priv->resources[key].erase(object);
+ std::vector<SPObject*>::iterator it = std::find(priv->resources[key].begin(),priv->resources[key].end(),object);
+ g_return_val_if_fail(it != rlist.end(), false);
+ priv->resources[key].erase(it);
GQuark q = g_quark_from_string(key);
priv->resources_changed_signals[q].emit();
@@ -1586,9 +1587,9 @@ bool SPDocument::removeResource(gchar const *key, SPObject *object)
return result;
}
-std::set<SPObject *> const SPDocument::getResourceList(gchar const *key) const
+std::vector<SPObject *> const SPDocument::getResourceList(gchar const *key) const
{
- std::set<SPObject *> emptyset;
+ std::vector<SPObject *> emptyset;
g_return_val_if_fail(key != NULL, emptyset);
g_return_val_if_fail(*key != '\0', emptyset);
diff --git a/src/document.h b/src/document.h
index 825049cd5..653e9d0db 100644
--- a/src/document.h
+++ b/src/document.h
@@ -260,7 +260,7 @@ public:
int ensureUpToDate();
bool addResource(char const *key, SPObject *object);
bool removeResource(char const *key, SPObject *object);
- const std::set<SPObject *> getResourceList(char const *key) const;
+ const std::vector<SPObject *> getResourceList(char const *key) const;
std::vector<SPItem*> getItemsInBox(unsigned int dkey, Geom::Rect const &box, bool into_groups = false) const;
std::vector<SPItem*> getItemsPartiallyInBox(unsigned int dkey, Geom::Rect const &box, bool into_groups = false) 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 7b4c0ac20..edeb523d7 100644
--- a/src/gradient-chemistry.cpp
+++ b/src/gradient-chemistry.cpp
@@ -1612,8 +1612,8 @@ void sp_gradient_unset_swatch(SPDesktop *desktop, std::string id)
SPDocument *doc = desktop ? desktop->doc() : 0;
if (doc) {
- const std::set<SPObject *> gradients = doc->getResourceList("gradient");
- for (std::set<SPObject *>::const_iterator i = gradients.begin(); i != gradients.end(); ++i) {
+ const std::vector<SPObject *> gradients = doc->getResourceList("gradient");
+ for (std::vector<SPObject *>::const_iterator i = gradients.begin(); i != gradients.end(); ++i) {
SPGradient* grad = SP_GRADIENT(*i);
if ( id == grad->getId() ) {
grad->setSwatch(false);
diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index 8fd997121..613dc2fc1 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -208,8 +208,8 @@ 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);
- std::set<SPObject *> gradients = desktop->doc()->getResourceList("gradient");
- for (std::set<SPObject *>::const_iterator it = gradients.begin(); it != gradients.end(); ++it) {
+ std::vector<SPObject *> gradients = desktop->doc()->getResourceList("gradient");
+ for (std::vector<SPObject *>::const_iterator it = gradients.begin(); it != gradients.end(); ++it) {
SPGradient* grad = SP_GRADIENT(*it);
if ( targetName == grad->getId() ) {
SPGradient *vect = grad->getVector();
diff --git a/src/layer-manager.cpp b/src/layer-manager.cpp
index c0fe95dd7..19c4b890c 100644
--- a/src/layer-manager.cpp
+++ b/src/layer-manager.cpp
@@ -191,10 +191,10 @@ Glib::ustring LayerManager::getNextLayerName( SPObject* obj, gchar const *label)
}
std::set<Glib::ustring> currentNames;
- std::set<SPObject *> layers = _document->getResourceList("layer");
+ std::vector<SPObject *> layers = _document->getResourceList("layer");
SPObject *root=_desktop->currentRoot();
if ( root ) {
- for (std::set<SPObject *>::const_iterator iter = layers.begin(); iter != layers.end(); ++iter) {
+ for (std::vector<SPObject *>::const_iterator iter = layers.begin(); iter != layers.end(); ++iter) {
if (*iter != obj)
currentNames.insert( (*iter)->label() ? Glib::ustring((*iter)->label()) : Glib::ustring() );
}
@@ -260,7 +260,7 @@ void LayerManager::_rebuild() {
if (!_document) // http://sourceforge.net/mailarchive/forum.php?thread_name=5747bce9a7ed077c1b4fc9f0f4f8a5e0%40localhost&forum_name=inkscape-devel
return;
- std::set<SPObject *> layers = _document->getResourceList("layer");
+ std::vector<SPObject *> layers = _document->getResourceList("layer");
SPObject *root=_desktop->currentRoot();
if ( root ) {
@@ -268,7 +268,7 @@ void LayerManager::_rebuild() {
std::set<SPGroup*> layersToAdd;
- for ( std::set<SPObject *>::const_iterator iter = layers.begin(); iter != layers.end(); ++iter ) {
+ for ( std::vector<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;
@@ -281,7 +281,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 &= ( layers.find(curr) != layers.end() );
+ needsAdd &= ( std::find(layers.begin(),layers.end(),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 035aa6051..26e1cd72c 100644
--- a/src/profile-manager.cpp
+++ b/src/profile-manager.cpp
@@ -34,9 +34,8 @@ void ProfileManager::_resourcesChanged()
{
std::vector<SPObject*> newList;
if (_doc) {
- std::set<SPObject *> current = _doc->getResourceList( "iccprofile" );
- for (std::set<SPObject *>::const_iterator i = current.begin(); i != current.end(); ++i)
- newList.push_back(*i);
+ std::vector<SPObject *> current = _doc->getResourceList( "iccprofile" );
+ newList = current;
}
sort( newList.begin(), newList.end() );
diff --git a/src/resource-manager.cpp b/src/resource-manager.cpp
index 18d7c6ba2..09b9364c6 100644
--- a/src/resource-manager.cpp
+++ b/src/resource-manager.cpp
@@ -179,8 +179,8 @@ std::vector<Glib::ustring> ResourceManagerImpl::findBrokenLinks( SPDocument *doc
std::set<Glib::ustring> uniques;
if ( doc ) {
- std::set<SPObject *> images = doc->getResourceList("image");
- for (std::set<SPObject *>::const_iterator it = images.begin(); it != images.end(); ++it) {
+ std::vector<SPObject *> images = doc->getResourceList("image");
+ for (std::vector<SPObject *>::const_iterator it = images.begin(); it != images.end(); ++it) {
Inkscape::XML::Node *ir = (*it)->getRepr();
gchar const *href = ir->attribute("xlink:href");
@@ -306,8 +306,8 @@ bool ResourceManagerImpl::fixupBrokenLinks(SPDocument *doc)
bool savedUndoState = DocumentUndo::getUndoSensitive(doc);
DocumentUndo::setUndoSensitive(doc, true);
- std::set<SPObject *> images = doc->getResourceList("image");
- for (std::set<SPObject *>::const_iterator it = images.begin(); it != images.end(); ++it) {
+ std::vector<SPObject *> images = doc->getResourceList("image");
+ for (std::vector<SPObject *>::const_iterator it = images.begin(); it != images.end(); ++it) {
Inkscape::XML::Node *ir = (*it)->getRepr();
gchar const *href = ir->attribute("xlink:href");
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index 17a1a9ff1..c80fc7122 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -264,7 +264,7 @@ void sp_guide_create_guides_around_page(SPDesktop *dt)
void sp_guide_delete_all_guides(SPDesktop *dt)
{
SPDocument *doc=dt->getDocument();
- std::set<SPObject *> current = doc->getResourceList("guide");
+ std::vector<SPObject *> current = doc->getResourceList("guide");
while (!current.empty()){
SPGuide* guide = SP_GUIDE(*(current.begin()));
sp_guide_remove(guide);
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);
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);
}
diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp
index 2bcae5d81..a8ac3b4cc 100644
--- a/src/xml/rebase-hrefs.cpp
+++ b/src/xml/rebase-hrefs.cpp
@@ -220,8 +220,8 @@ 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. */
- std::set<SPObject *> images = doc->getResourceList("image");
- for (std::set<SPObject *>::const_iterator it = images.begin(); it != images.end(); ++it) {
+ std::vector<SPObject *> images = doc->getResourceList("image");
+ for (std::vector<SPObject *>::const_iterator it = images.begin(); it != images.end(); ++it) {
Inkscape::XML::Node *ir = (*it)->getRepr();
std::string uri;
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 01:19:19 +0000