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/live_effects/parameter/originalpath.cpp | 4 ++--
 src/live_effects/parameter/path.cpp         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/live_effects/parameter')

diff --git a/src/live_effects/parameter/originalpath.cpp b/src/live_effects/parameter/originalpath.cpp
index 6c4f2a100..0884c4c9c 100644
--- a/src/live_effects/parameter/originalpath.cpp
+++ b/src/live_effects/parameter/originalpath.cpp
@@ -27,7 +27,7 @@
 #include "live_effects/effect.h"
 
 #include "inkscape.h"
-#include "desktop-handles.h"
+#include "desktop.h"
 #include "selection.h"
 #include "ui/icon-names.h"
 
@@ -128,7 +128,7 @@ OriginalPathParam::on_select_original_button_click()
     if (desktop == NULL || original == NULL) {
         return;
     }
-    Inkscape::Selection *selection = sp_desktop_selection(desktop);
+    Inkscape::Selection *selection = desktop->getSelection();
     selection->clear();
     selection->set(original);
 }
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index 2a14d4208..a6d2f1ea5 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -414,7 +414,7 @@ PathParam::linked_modified_callback(SPObject *linked_obj, guint /*flags*/)
 void
 PathParam::on_edit_button_click()
 {
-    SPItem * item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->singleItem();
+    SPItem * item = SP_ACTIVE_DESKTOP->getSelection()->singleItem();
     if (item != NULL) {
         param_editOncanvas(item, SP_ACTIVE_DESKTOP);
     }
-- 
cgit v1.2.3


From 6c78ab7deeea3b32791437ade35e8911e7c73c8e Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 21 Dec 2014 14:58:38 -0500
Subject: Purge sp_desktop_namedview in favor of SPDesktop::getNamedView

(bzr r13810)
---
 src/live_effects/parameter/text.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/live_effects/parameter')

diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp
index a88ac7d75..3b58a4c67 100644
--- a/src/live_effects/parameter/text.cpp
+++ b/src/live_effects/parameter/text.cpp
@@ -19,6 +19,7 @@
 #include "inkscape.h"
 #include "verbs.h"
 #include "display/canvas-text.h"
+#include "desktop-handles.h"
 #include <2geom/sbasis-geometric.h>
 
 namespace Inkscape {
-- 
cgit v1.2.3


From 9ae37e8df1124ebd67e3d6dc24429d03919144ea Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 21 Dec 2014 15:51:24 -0500
Subject: Purge sp_desktop_sketch and sp_desktop_tempgroup

(bzr r13816)
---
 src/live_effects/parameter/text.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/live_effects/parameter')

diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp
index 3b58a4c67..8a5f50145 100644
--- a/src/live_effects/parameter/text.cpp
+++ b/src/live_effects/parameter/text.cpp
@@ -34,7 +34,7 @@ TextParam::TextParam( const Glib::ustring& label, const Glib::ustring& tip,
       defvalue(default_value)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP; // FIXME: we shouldn't use this!
-    canvas_text = (SPCanvasText *) sp_canvastext_new(sp_desktop_tempgroup(desktop), desktop, Geom::Point(0,0), "");
+    canvas_text = (SPCanvasText *) sp_canvastext_new(desktop->getTempGroup(), desktop, Geom::Point(0,0), "");
     sp_canvastext_set_text (canvas_text, default_value.c_str());
     sp_canvastext_set_coords (canvas_text, 0, 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/live_effects/parameter/path.cpp | 2 +-
 src/live_effects/parameter/text.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/live_effects/parameter')

diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index a6d2f1ea5..ba95affd9 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -30,7 +30,7 @@
 // needed for on-canvas editting:
 #include "ui/tools-switch.h"
 #include "ui/shape-editor.h"
-#include "desktop-handles.h"
+
 #include "selection.h"
 // clipboard support
 #include "ui/clipboard.h"
diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp
index 8a5f50145..234a6174d 100644
--- a/src/live_effects/parameter/text.cpp
+++ b/src/live_effects/parameter/text.cpp
@@ -19,7 +19,7 @@
 #include "inkscape.h"
 #include "verbs.h"
 #include "display/canvas-text.h"
-#include "desktop-handles.h"
+
 #include <2geom/sbasis-geometric.h>
 
 namespace Inkscape {
-- 
cgit v1.2.3