From 45f373f3319b598d8e0222fb48e9d3a4760b2044 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Fri, 27 Jun 2014 15:23:06 -0400
Subject: 5. Refactoring of Application class: make copy/assignment operators
 private, disallow pointers to Application

(bzr r13341.5.9)
---
 src/ui/widget/panel.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/ui/widget/panel.cpp')

diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index b37137228..c96eac838 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -293,7 +293,7 @@ void Panel::_init()
 
     signalResponse().connect(sigc::mem_fun(*this, &Panel::_handleResponse));
 
-    signalActivateDesktop().connect(sigc::hide<0>(sigc::mem_fun(*this, &Panel::setDesktop)));
+    signalActivateDesktop().connect(sigc::mem_fun(*this, &Panel::setDesktop));
 
     show_all_children();
 
@@ -643,13 +643,13 @@ Panel::signalDocumentReplaced()
     return _signal_document_replaced;
 }
 
-sigc::signal<void, Inkscape::Application *, SPDesktop *> &
+sigc::signal<void, SPDesktop *> &
 Panel::signalActivateDesktop()
 {
     return _signal_activate_desktop;
 }
 
-sigc::signal<void, Inkscape::Application *, SPDesktop *> &
+sigc::signal<void, SPDesktop *> &
 Panel::signalDeactiveDesktop()
 {
     return _signal_deactive_desktop;
-- 
cgit v1.2.3


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/ui/widget/panel.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/ui/widget/panel.cpp')

diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index c96eac838..39aa6c584 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -33,6 +33,7 @@
 #include "panel.h"
 #include "icon-size.h"
 #include "preferences.h"
+#include "desktop.h"
 #include "desktop-handles.h"
 #include "inkscape.h"
 #include "widgets/eek-preview.h"
@@ -667,7 +668,7 @@ void Panel::_handleResponse(int response_id)
 
 Inkscape::Selection *Panel::_getSelection()
 {
-    return sp_desktop_selection(_desktop);
+    return _desktop->getSelection();
 }
 
 } // namespace Widget
-- 
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/ui/widget/panel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/widget/panel.cpp')

diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 39aa6c584..0cff25d88 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -34,7 +34,7 @@
 #include "icon-size.h"
 #include "preferences.h"
 #include "desktop.h"
-#include "desktop-handles.h"
+
 #include "inkscape.h"
 #include "widgets/eek-preview.h"
 #include "ui/previewfillable.h"
-- 
cgit v1.2.3