From 30b6a43219b66aba1a9ebade8aca50910f2c25cc Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 21 Dec 2014 10:39:39 -0500
Subject: Deprecate and remove sp_desktop_selection in favor of
 SPDesktop::getSelection

(bzr r13809)
---
 src/selcue.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/selcue.cpp')

diff --git a/src/selcue.cpp b/src/selcue.cpp
index 805629636..84c131dde 100644
--- a/src/selcue.cpp
+++ b/src/selcue.cpp
@@ -13,6 +13,7 @@
 
 #include <string.h>
 
+#include "desktop.h"
 #include "desktop-handles.h"
 #include "selection.h"
 #include "display/sp-canvas-util.h"
@@ -40,7 +41,7 @@ Inkscape::SelCue::SelCue(SPDesktop *desktop)
     : _desktop(desktop),
       _bounding_box_prefs_observer(*this)
 {
-    _selection = sp_desktop_selection(_desktop);
+    _selection = _desktop->getSelection();
 
     _sel_changed_connection = _selection->connectChanged(
         sigc::hide(sigc::mem_fun(*this, &Inkscape::SelCue::_newItemBboxes))
-- 
cgit v1.2.3


From cc7cd3e3f64a8d6c1cc16cb5fa4fa76793d23caf Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 21 Dec 2014 16:12:46 -0500
Subject: Purge sp_desktop_controls

(bzr r13819)
---
 src/selcue.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/selcue.cpp')

diff --git a/src/selcue.cpp b/src/selcue.cpp
index 84c131dde..67744e1f8 100644
--- a/src/selcue.cpp
+++ b/src/selcue.cpp
@@ -155,7 +155,7 @@ void Inkscape::SelCue::_newItemBboxes()
 
         if (b) {
             if (mode == MARK) {
-                box = sp_canvas_item_new(sp_desktop_controls(_desktop),
+                box = sp_canvas_item_new(_desktop->getControls(),
                                          SP_TYPE_CTRL,
                                          "mode", SP_CTRL_MODE_XOR,
                                          "shape", SP_CTRL_SHAPE_DIAMOND,
@@ -171,7 +171,7 @@ void Inkscape::SelCue::_newItemBboxes()
                 sp_canvas_item_move_to_z(box, 0); // just low enough to not get in the way of other draggable knots
 
             } else if (mode == BBOX) {
-                box = sp_canvas_item_new(sp_desktop_controls(_desktop),
+                box = sp_canvas_item_new(_desktop->getControls(),
                                          SP_TYPE_CTRLRECT,
                                          NULL);
 
@@ -208,7 +208,7 @@ void Inkscape::SelCue::_newTextBaselines()
             if (layout != NULL && layout->outputExists()) {
                 boost::optional<Geom::Point> pt = layout->baselineAnchorPoint();
                 if (pt) {
-                    baseline_point = sp_canvas_item_new(sp_desktop_controls(_desktop), SP_TYPE_CTRL,
+                    baseline_point = sp_canvas_item_new(_desktop->getControls(), SP_TYPE_CTRL,
                         "mode", SP_CTRL_MODE_XOR,
                         "size", 4.0,
                         "filled", 0,
-- 
cgit v1.2.3


From 3dbf9a08680c6d7252c79397dbf12082ead61bd7 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 21 Dec 2014 16:58:32 -0500
Subject: Remove sp_desktop_document and finish cleanup of desktop-handles.h

(bzr r13820)
---
 src/selcue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/selcue.cpp')

diff --git a/src/selcue.cpp b/src/selcue.cpp
index 67744e1f8..d2fa0970a 100644
--- a/src/selcue.cpp
+++ b/src/selcue.cpp
@@ -14,7 +14,7 @@
 #include <string.h>
 
 #include "desktop.h"
-#include "desktop-handles.h"
+
 #include "selection.h"
 #include "display/sp-canvas-util.h"
 #include "display/sodipodi-ctrl.h"
-- 
cgit v1.2.3