diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-06-01 21:47:04 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-06-01 21:47:04 +0000 |
| commit | 6c85e7bc3b136ad5f831a4c289e04fdbe7451297 (patch) | |
| tree | a026eaf58deb09da7b04db6a266dfb7516f21c9a /src/sp-object.cpp | |
| parent | opening kaleidscope (diff) | |
| parent | Mark user-visible messages for translation (diff) | |
| download | inkscape-6c85e7bc3b136ad5f831a4c289e04fdbe7451297.tar.gz inkscape-6c85e7bc3b136ad5f831a4c289e04fdbe7451297.zip | |
update to trunk
(bzr r13708.1.29)
Diffstat (limited to 'src/sp-object.cpp')
| -rw-r--r-- | src/sp-object.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/sp-object.cpp b/src/sp-object.cpp index 343db435e..0bb8c240f 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -357,6 +357,10 @@ int sp_object_compare_position(SPObject const *first, SPObject const *second) return result; } +bool sp_object_compare_position_bool(SPObject const *first, SPObject const *second){ + return sp_object_compare_position(first,second)<0; +} + SPObject *SPObject::appendChildRepr(Inkscape::XML::Node *repr) { if ( !cloned ) { @@ -380,14 +384,14 @@ void SPObject::changeCSS(SPCSSAttr *css, gchar const *attr) sp_repr_css_change(this->getRepr(), css, attr); } -GSList *SPObject::childList(bool add_ref, Action) { - GSList *l = NULL; +std::vector<SPObject*> SPObject::childList(bool add_ref, Action) { + std::vector<SPObject*> l; for ( SPObject *child = firstChild() ; child; child = child->getNext() ) { if (add_ref) { sp_object_ref (child); } - l = g_slist_prepend (l, child); + l.push_back(child); } return l; |