bzr merge lp:~mc.../inkscape/SelContainer

The main change of this branch is that the container for selections is now a std::vector and not a GSList.
This change propagates in most of the codebase.

Normally, there are no changes of semantics, except the following: 

-> childList is now in the intuitive order (childList()[0] is now firstChild)
-> sp_selection_paste_impl is now in the opposite order (change is local to selection-chemistry.cpp, and simplify a few things there)
-> selection.setReprList now takes the list in the opposite order. It was always the case (the list was always reversed before handing to it)
-> a few comparison functions now work "the c++ way": the C way was to return -1 if a<b, 0 if a==b and 1 if a>b, now they return (bool)(a<b) so they can be used with std::sort

(bzr r14074)

2 files changed, 8 insertions, 7 deletions

diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp
index 7c5d2d6fc..3858f08a7 100644
--- a/src/xml/repr-util.cpp
+++ b/src/xml/repr-util.cpp
@@ -260,7 +260,7 @@ gchar const *sp_xml_ns_prefix_uri(gchar const *prefix)
  *   -1    first object's position is less than the second
  * @todo Rewrite this function's description to be understandable
  */
-int sp_repr_compare_position(Inkscape::XML::Node const *first, Inkscape::XML::Node const *second)
+bool sp_repr_compare_position(Inkscape::XML::Node const *first, Inkscape::XML::Node const *second)
 {
     int p1, p2;
     if (first->parent() == second->parent()) {
@@ -277,9 +277,9 @@ int sp_repr_compare_position(Inkscape::XML::Node const *first, Inkscape::XML::No
         g_assert(ancestor != NULL);
 
         if (ancestor == first) {
-            return 1;
+            return false;
         } else if (ancestor == second) {
-            return -1;
+            return true;
         } else {
             Inkscape::XML::Node const *to_first = AncetreFils(first, ancestor);
             Inkscape::XML::Node const *to_second = AncetreFils(second, ancestor);
@@ -289,9 +289,9 @@ int sp_repr_compare_position(Inkscape::XML::Node const *first, Inkscape::XML::No
         }
     }
 
-    if (p1 > p2) return 1;
-    if (p1 < p2) return -1;
-    return 0;
+    if (p1 > p2) return false;
+    if (p1 < p2) return true;
+    return false;
 
     /* effic: Assuming that the parent--child relationship is consistent
        (i.e. that the parent really does contain first and second among
diff --git a/src/xml/repr.h b/src/xml/repr.h
index c3ba40e45..fbe25ec12 100644
--- a/src/xml/repr.h
+++ b/src/xml/repr.h
@@ -120,7 +120,8 @@ unsigned sp_repr_set_svg_length(Inkscape::XML::Node *repr, char const *key, SVGL
 unsigned sp_repr_set_point(Inkscape::XML::Node *repr, char const *key, Geom::Point const & val);
 unsigned sp_repr_get_point(Inkscape::XML::Node *repr, char const *key, Geom::Point *val);
 
-int sp_repr_compare_position(Inkscape::XML::Node const *first, Inkscape::XML::Node const *second);
+//c++-style comparison : returns (bool)(a<b)
+bool sp_repr_compare_position(Inkscape::XML::Node const *first, Inkscape::XML::Node const *second);
 
 // Searching
 /**