diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-05-21 22:13:06 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-05-21 22:13:06 +0000 |
| commit | eef0bdfef0bdbaa00c17067c601061d905974096 (patch) | |
| tree | 737c7efb116ec01e23e8d21ae9f9acc92923c708 /src/document.cpp | |
| parent | Fixing undo thing (diff) | |
| parent | Remove duplicated code (diff) | |
| download | inkscape-eef0bdfef0bdbaa00c17067c601061d905974096.tar.gz inkscape-eef0bdfef0bdbaa00c17067c601061d905974096.zip | |
update to trunk
(bzr r14865.1.6)
Diffstat (limited to 'src/document.cpp')
| -rw-r--r-- | src/document.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/document.cpp b/src/document.cpp index 87f13f749..2500a5cee 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -121,7 +121,6 @@ SPDocument::SPDocument() : p->serial = next_serial++; p->sensitive = false; - p->join_undo = false; p->partial = NULL; p->history_size = 0; p->seeking = false; @@ -1542,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); @@ -1573,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(); @@ -1587,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); |