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)

3 files changed, 26 insertions, 26 deletions

diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 00a74c4fe..598a90e95 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -125,7 +125,8 @@ ObjectCompositeSettings::_blendBlurValueChanged()
     const Glib::ustring blendmode = _fe_cb.get_blend_mode();
 
     //apply created filter to every selected item
-    for (StyleSubject::iterator i = _subject->begin() ; i != _subject->end() ; ++i ) {
+    std::vector<SPItem*> sel=_subject->getDesktop()->getSelection()->itemList();
+    for (std::vector<SPItem*>::const_iterator i = sel.begin() ; i != sel.end() ; ++i ) {
         if (!SP_IS_ITEM(*i)) {
             continue;
         }
diff --git a/src/ui/widget/style-subject.cpp b/src/ui/widget/style-subject.cpp
index a48370d9b..95b89bf5f 100644
--- a/src/ui/widget/style-subject.cpp
+++ b/src/ui/widget/style-subject.cpp
@@ -54,7 +54,7 @@ Inkscape::Selection *StyleSubject::Selection::_getSelection() const {
         return NULL;
     }
 }
-
+/*
 StyleSubject::iterator StyleSubject::Selection::begin() {
     Inkscape::Selection *selection = _getSelection();
     if (selection) {
@@ -62,7 +62,7 @@ StyleSubject::iterator StyleSubject::Selection::begin() {
     } else {
         return iterator(NULL);
     }
-}
+}*/
 
 Geom::OptRect StyleSubject::Selection::getBounds(SPItem::BBoxType type) {
     Inkscape::Selection *selection = _getSelection();
@@ -104,8 +104,7 @@ void StyleSubject::Selection::setCSS(SPCSSAttr *css) {
 }
 
 StyleSubject::CurrentLayer::CurrentLayer() {
-    _element.data = NULL;
-    _element.next = NULL;
+    _element = NULL;
 }
 
 StyleSubject::CurrentLayer::~CurrentLayer() {
@@ -114,10 +113,10 @@ StyleSubject::CurrentLayer::~CurrentLayer() {
 void StyleSubject::CurrentLayer::_setLayer(SPObject *layer) {
     _layer_release.disconnect();
     _layer_modified.disconnect();
-    if (_element.data) {
-        sp_object_unref(static_cast<SPObject *>(_element.data), NULL);
+    if (_element) {
+        sp_object_unref(_element, NULL);
     }
-    _element.data = layer;
+    _element = layer;
     if (layer) {
         sp_object_ref(layer, NULL);
         _layer_release = layer->connectRelease(sigc::hide(sigc::bind(sigc::mem_fun(*this, &CurrentLayer::_setLayer), (SPObject *)NULL)));
@@ -127,20 +126,17 @@ void StyleSubject::CurrentLayer::_setLayer(SPObject *layer) {
 }
 
 SPObject *StyleSubject::CurrentLayer::_getLayer() const {
-    return static_cast<SPObject *>(_element.data);
+    return _element;
 }
 
-GSList *StyleSubject::CurrentLayer::_getLayerSList() const {
-    if (_element.data) {
-        return &_element;
-    } else {
-        return NULL;
-    }
-}
+SPObject *StyleSubject::CurrentLayer::_getLayerSList() const {
+        return _element;
 
+}
+/*
 StyleSubject::iterator StyleSubject::CurrentLayer::begin() {
     return iterator(_getLayerSList());
-}
+}*/
 
 Geom::OptRect StyleSubject::CurrentLayer::getBounds(SPItem::BBoxType type) {
     SPObject *layer = _getLayer();
@@ -152,8 +148,10 @@ Geom::OptRect StyleSubject::CurrentLayer::getBounds(SPItem::BBoxType type) {
 }
 
 int StyleSubject::CurrentLayer::queryStyle(SPStyle *query, int property) {
-    GSList *list = _getLayerSList();
-    if (list) {
+	std::vector<SPItem*> list;
+    SPObject* i=_getLayerSList();
+    if (i) {
+		list.push_back((SPItem*)i);
         return sp_desktop_query_style_from_list(list, query, property);
     } else {
         return QUERY_STYLE_NOTHING;
diff --git a/src/ui/widget/style-subject.h b/src/ui/widget/style-subject.h
index 47da91732..60f979eb0 100644
--- a/src/ui/widget/style-subject.h
+++ b/src/ui/widget/style-subject.h
@@ -35,7 +35,8 @@ public:
     class Selection;
     class CurrentLayer;
 
-    typedef Util::GSListConstIterator<SPObject *> iterator;
+    //typedef Util::GSListConstIterator<SPObject *> iterator;
+    typedef std::list<SPObject*>::iterator iterator;
 
     StyleSubject();
     virtual ~StyleSubject();
@@ -43,8 +44,8 @@ public:
     void setDesktop(SPDesktop *desktop);
     SPDesktop *getDesktop() const { return _desktop; }
 
-    virtual iterator begin() = 0;
-    virtual iterator end() { return iterator(NULL); }
+//    virtual iterator begin() = 0;
+//    virtual iterator end() { return iterator(NULL); }
     virtual Geom::OptRect getBounds(SPItem::BBoxType type) = 0;
     virtual int queryStyle(SPStyle *query, int property) = 0;
     virtual void setCSS(SPCSSAttr *css) = 0;
@@ -67,7 +68,7 @@ public:
     Selection();
     ~Selection();
 
-    virtual iterator begin();
+//    virtual iterator begin();
     virtual Geom::OptRect getBounds(SPItem::BBoxType type);
     virtual int queryStyle(SPStyle *query, int property);
     virtual void setCSS(SPCSSAttr *css);
@@ -88,7 +89,7 @@ public:
     CurrentLayer();
     ~CurrentLayer();
 
-    virtual iterator begin();
+//    virtual iterator begin();
     virtual Geom::OptRect getBounds(SPItem::BBoxType type);
     virtual int queryStyle(SPStyle *query, int property);
     virtual void setCSS(SPCSSAttr *css);
@@ -99,12 +100,12 @@ protected:
 private:
     SPObject *_getLayer() const;
     void _setLayer(SPObject *layer);
-    GSList *_getLayerSList() const;
+    SPObject *_getLayerSList() const;
 
     sigc::connection _layer_switched;
     sigc::connection _layer_release;
     sigc::connection _layer_modified;
-    mutable GSList _element;
+    mutable SPObject* _element;
 };
 
 }