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/extension/dbus/application-interface.cpp    | 2 +-
 src/extension/dbus/document-interface.cpp       | 2 +-
 src/extension/effect.cpp                        | 2 +-
 src/extension/execution-env.cpp                 | 2 +-
 src/extension/implementation/implementation.cpp | 2 +-
 src/extension/implementation/script.cpp         | 2 +-
 src/extension/internal/bitmap/imagemagick.cpp   | 2 +-
 src/extension/internal/grid.cpp                 | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/extension')

diff --git a/src/extension/dbus/application-interface.cpp b/src/extension/dbus/application-interface.cpp
index 292832a4b..afaf9aedf 100644
--- a/src/extension/dbus/application-interface.cpp
+++ b/src/extension/dbus/application-interface.cpp
@@ -196,7 +196,7 @@ application_interface_document_close_all (ApplicationInterface *app_interface,
     SPDesktop  *desktop = SP_ACTIVE_DESKTOP;
     g_assert(desktop != NULL);
 
-    SPDocument *doc = sp_desktop_document(desktop);
+    SPDocument *doc = desktop->getDocument();
     g_assert(doc != NULL);
 
     Inkscape::XML::Node     *repr = doc->getReprRoot();
diff --git a/src/extension/dbus/document-interface.cpp b/src/extension/dbus/document-interface.cpp
index bd5f826d3..4fde6885f 100644
--- a/src/extension/dbus/document-interface.cpp
+++ b/src/extension/dbus/document-interface.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <dbus/dbus-glib.h>
 #include "desktop.h"
-#include "desktop-handles.h" //sp_desktop_document()
+ //sp_desktop_document()
 #include "desktop-style.h" //sp_desktop_get_style
 #include "display/canvas-text.h" //text
 #include "display/sp-canvas.h" //text
diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index c8f3b2ff9..e7299ba51 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -12,7 +12,7 @@
 #include "inkscape.h"
 #include "helper/action.h"
 #include "ui/view/view.h"
-#include "desktop-handles.h"
+
 #include "selection.h"
 #include "sp-namedview.h"
 #include "desktop.h"
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index 1495b7603..13b8d60c4 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -31,7 +31,7 @@
 #include "desktop.h"
 #include "ui/view/view.h"
 #include "sp-namedview.h"
-#include "desktop-handles.h"
+
 #include "display/sp-canvas.h"
 
 #include "util/glib-list-iterators.h"
diff --git a/src/extension/implementation/implementation.cpp b/src/extension/implementation/implementation.cpp
index e29aed308..52f63499a 100644
--- a/src/extension/implementation/implementation.cpp
+++ b/src/extension/implementation/implementation.cpp
@@ -21,7 +21,7 @@
 
 #include "selection.h"
 #include "desktop.h"
-#include "desktop-handles.h"
+
 #include "ui/view/view.h"
 #include "util/glib-list-iterators.h"
 
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index 6b1abe04c..bbc567f75 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <glib/gstdio.h>
 
-#include "desktop-handles.h"
+
 #include "desktop.h"
 #include "ui/dialog-events.h"
 #include "extension/effect.h"
diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp
index c92264858..76f35415e 100644
--- a/src/extension/internal/bitmap/imagemagick.cpp
+++ b/src/extension/internal/bitmap/imagemagick.cpp
@@ -25,7 +25,7 @@
 #include <glib/gstdio.h>
 
 #include "desktop.h"
-#include "desktop-handles.h"
+
 #include "selection.h"
 #include "sp-object.h"
 #include "util/glib-list-iterators.h"
diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp
index 2ce86c245..270edfe44 100644
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -24,7 +24,7 @@
 #include <gtkmm/spinbutton.h>
 
 #include "desktop.h"
-#include "desktop-handles.h"
+
 #include "document.h"
 #include "selection.h"
 #include "sp-object.h"
-- 
cgit v1.2.3