merged trunk

(bzr r14059.1.21)

3 files changed, 17 insertions, 21 deletions

diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 598a90e95..8acf083d0 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -125,8 +125,8 @@ ObjectCompositeSettings::_blendBlurValueChanged()
     const Glib::ustring blendmode = _fe_cb.get_blend_mode();
 
     //apply created filter to every selected item
-    std::vector<SPItem*> sel=_subject->getDesktop()->getSelection()->itemList();
-    for (std::vector<SPItem*>::const_iterator i = sel.begin() ; i != sel.end() ; ++i ) {
+    std::vector<SPObject*> sel=_subject->list();
+    for (std::vector<SPObject*>::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 95b89bf5f..da3bbcd20 100644
--- a/src/ui/widget/style-subject.cpp
+++ b/src/ui/widget/style-subject.cpp
@@ -54,15 +54,13 @@ Inkscape::Selection *StyleSubject::Selection::_getSelection() const {
         return NULL;
     }
 }
-/*
-StyleSubject::iterator StyleSubject::Selection::begin() {
+
+std::vector<SPObject*> StyleSubject::Selection::list(){
     Inkscape::Selection *selection = _getSelection();
-    if (selection) {
-        return iterator(selection->list());
-    } else {
-        return iterator(NULL);
-    }
-}*/
+    if(selection)
+        return selection->list();
+    else return std::vector<SPObject*>();
+}
 
 Geom::OptRect StyleSubject::Selection::getBounds(SPItem::BBoxType type) {
     Inkscape::Selection *selection = _getSelection();
@@ -133,10 +131,12 @@ SPObject *StyleSubject::CurrentLayer::_getLayerSList() const {
         return _element;
 
 }
-/*
-StyleSubject::iterator StyleSubject::CurrentLayer::begin() {
-    return iterator(_getLayerSList());
-}*/
+
+std::vector<SPObject*> StyleSubject::CurrentLayer::list(){
+    std::vector<SPObject*> list;
+    list.push_back(_element);
+    return list;
+}
 
 Geom::OptRect StyleSubject::CurrentLayer::getBounds(SPItem::BBoxType type) {
     SPObject *layer = _getLayer();
diff --git a/src/ui/widget/style-subject.h b/src/ui/widget/style-subject.h
index 60f979eb0..15a072f44 100644
--- a/src/ui/widget/style-subject.h
+++ b/src/ui/widget/style-subject.h
@@ -10,7 +10,6 @@
 #ifndef SEEN_INKSCAPE_UI_WIDGET_STYLE_SUBJECT_H
 #define SEEN_INKSCAPE_UI_WIDGET_STYLE_SUBJECT_H
 
-#include "util/glib-list-iterators.h"
 #include <boost/optional.hpp>
 #include <2geom/rect.h>
 #include "sp-item.h"
@@ -35,8 +34,6 @@ public:
     class Selection;
     class CurrentLayer;
 
-    //typedef Util::GSListConstIterator<SPObject *> iterator;
-    typedef std::list<SPObject*>::iterator iterator;
 
     StyleSubject();
     virtual ~StyleSubject();
@@ -44,11 +41,10 @@ public:
     void setDesktop(SPDesktop *desktop);
     SPDesktop *getDesktop() const { return _desktop; }
 
-//    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;
+    virtual std::vector<SPObject*> list(){return std::vector<SPObject*>();};
 
     sigc::connection connectChanged(sigc::signal<void>::slot_type slot) {
         return _changed_signal.connect(slot);
@@ -68,10 +64,10 @@ public:
     Selection();
     ~Selection();
 
-//    virtual iterator begin();
     virtual Geom::OptRect getBounds(SPItem::BBoxType type);
     virtual int queryStyle(SPStyle *query, int property);
     virtual void setCSS(SPCSSAttr *css);
+    virtual std::vector<SPObject*> list();
 
 protected:
     virtual void _afterDesktopSwitch(SPDesktop *desktop);
@@ -89,10 +85,10 @@ public:
     CurrentLayer();
     ~CurrentLayer();
 
-//    virtual iterator begin();
     virtual Geom::OptRect getBounds(SPItem::BBoxType type);
     virtual int queryStyle(SPStyle *query, int property);
     virtual void setCSS(SPCSSAttr *css);
+    virtual std::vector<SPObject*> list();
 
 protected:
     virtual void _afterDesktopSwitch(SPDesktop *desktop);