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)

1 files changed, 4 insertions, 4 deletions

diff --git a/src/document.h b/src/document.h
index 74dcfa75e..16b9bb28d 100644
--- a/src/document.h
+++ b/src/document.h
@@ -232,7 +232,7 @@ public:
     /**
      * Returns the bottommost item from the list which is at the point, or NULL if none.
      */
-    static SPItem *getItemFromListAtPointBottom(unsigned int dkey, SPGroup *group, const GSList *list, Geom::Point const &p, bool take_insensitive = false);
+    static SPItem *getItemFromListAtPointBottom(unsigned int dkey, SPGroup *group, const std::vector<SPItem*> &list, Geom::Point const &p, bool take_insensitive = false);
 
     static SPDocument *createDoc(Inkscape::XML::Document *rdoc, char const *uri,
             char const *base, char const *name, unsigned int keepalive,
@@ -259,10 +259,10 @@ public:
     bool addResource(char const *key, SPObject *object);
     bool removeResource(char const *key, SPObject *object);
     const GSList *getResourceList(char const *key) const;
-    GSList *getItemsInBox(unsigned int dkey, Geom::Rect const &box) const;
-    GSList *getItemsPartiallyInBox(unsigned int dkey, Geom::Rect const &box) const;
+    std::vector<SPItem*> getItemsInBox(unsigned int dkey, Geom::Rect const &box) const;
+    std::vector<SPItem*> getItemsPartiallyInBox(unsigned int dkey, Geom::Rect const &box) const;
     SPItem *getItemAtPoint(unsigned int key, Geom::Point const &p, bool into_groups, SPItem *upto = NULL) const;
-    GSList *getItemsAtPoints(unsigned const key, std::vector<Geom::Point> points) const;
+    std::vector<SPItem*> getItemsAtPoints(unsigned const key, std::vector<Geom::Point> points) const;
     SPItem *getGroupAtPoint(unsigned int key,  Geom::Point const &p) const;
 
     void changeUriAndHrefs(char const *uri);