From 1636c1dd1651780d01759676b194312529f211f7 Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Sat, 25 Jun 2016 22:24:26 +0200
Subject: Moved next functions, added namespace, renamed range functions

(bzr r14954.1.10)
---
 src/selection.cpp | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'src/selection.cpp')

diff --git a/src/selection.cpp b/src/selection.cpp
index 32e27f2d4..94b64a7bc 100644
--- a/src/selection.cpp
+++ b/src/selection.cpp
@@ -130,25 +130,13 @@ void Selection::setReprList(std::vector<XML::Node*> const &list) {
     _emitChanged();
 }
 
-std::vector<XML::Node*> Selection::reprList() {
-    std::vector<SPItem*> list = itemList();
-    std::vector<XML::Node*> result;
-    std::transform(list.begin(), list.end(), std::back_inserter(result), [](SPItem* item) { return item->getRepr(); });
-    return result;
-}
-
-Inkscape::XML::Node *Selection::singleRepr() {
-    SPObject *obj = single();
-    return obj ? obj->getRepr() : nullptr;
-}
-
 std::vector<Inkscape::SnapCandidatePoint> Selection::getSnapPoints(SnapPreferences const *snapprefs) const {
     std::vector<Inkscape::SnapCandidatePoint> p;
 
     if (snapprefs != NULL){
         SnapPreferences snapprefs_dummy = *snapprefs; // create a local copy of the snapping prefs
         snapprefs_dummy.setTargetSnappable(Inkscape::SNAPTARGET_ROTATION_CENTER, false); // locally disable snapping to the item center
-        std::vector<SPItem*> const items = const_cast<Selection *>(this)->itemList();
+        std::vector<SPItem*> const items = const_cast<Selection *>(this)->items();
         for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end(); ++iter) {
             SPItem *this_item = *iter;
             this_item->getSnappoints(p, &snapprefs_dummy);
@@ -174,7 +162,7 @@ SPObject *Selection::_objectForXMLNode(Inkscape::XML::Node *repr) const {
 }
 
 size_t Selection::numberOfLayers() {
-    std::vector<SPItem*> const items = const_cast<Selection *>(this)->itemList();
+    std::vector<SPItem*> const items = const_cast<Selection *>(this)->items();
     std::set<SPObject*> layers;
     for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end(); ++iter) {
         SPObject *layer = _layers->layerForObject(*iter);
@@ -185,7 +173,7 @@ size_t Selection::numberOfLayers() {
 }
 
 size_t Selection::numberOfParents() {
-    std::vector<SPItem*> const items = const_cast<Selection *>(this)->itemList();
+    std::vector<SPItem*> const items = const_cast<Selection *>(this)->items();
     std::set<SPObject*> parents;
     for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end(); ++iter) {
         SPObject *parent = (*iter)->parent;
-- 
cgit v1.2.3


From 3c593bb8da3357514ff5b4f3154d08c4508ad47e Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Wed, 20 Jul 2016 11:01:17 +0200
Subject: Changed arguments and names of selection chemistry functions

(bzr r14954.1.22)
---
 src/selection.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/selection.cpp')

diff --git a/src/selection.cpp b/src/selection.cpp
index 09eaf6c0e..bdd4f0dc7 100644
--- a/src/selection.cpp
+++ b/src/selection.cpp
@@ -27,15 +27,16 @@
 
 #include "sp-shape.h"
 #include "sp-path.h"
+#include "desktop.h"
 #include "document.h"
 
 #define SP_SELECTION_UPDATE_PRIORITY (G_PRIORITY_HIGH_IDLE + 1)
 
 namespace Inkscape {
 
-Selection::Selection(LayerModel *layers, SPDesktop *desktop) :
+Selection::Selection(LayerModel *layers, SPDesktop *desktop):
+    ObjectSet(desktop),
     _layers(layers),
-    _desktop(desktop),
     _selection_context(NULL),
     _flags(0),
     _idle(0)
-- 
cgit v1.2.3