From 51c2905fd3e99955db2d823b79abb763d8097028 Mon Sep 17 00:00:00 2001
From: Maximilian Albert <maximilian.albert@gmail.com>
Date: Thu, 6 Aug 2009 14:17:17 +0000
Subject: Revert recent refactoring changes by johnce because they break the
 build, which cannot be fixed easily.

(bzr r8422)
---
 src/layer-manager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/layer-manager.cpp')

diff --git a/src/layer-manager.cpp b/src/layer-manager.cpp
index fe0d41904..8c45c7e53 100644
--- a/src/layer-manager.cpp
+++ b/src/layer-manager.cpp
@@ -126,12 +126,12 @@ LayerManager::LayerManager(SPDesktop *desktop)
 {
     _layer_connection = desktop->connectCurrentLayerChanged( sigc::mem_fun(*this, &LayerManager::_selectedLayerChanged) );
 
-    sigc::bound_mem_functor1<void, Inkscape::LayerManager, Document*> first = sigc::mem_fun(*this, &LayerManager::_setDocument);
+    sigc::bound_mem_functor1<void, Inkscape::LayerManager, SPDocument*> first = sigc::mem_fun(*this, &LayerManager::_setDocument);
 
     // This next line has problems on gcc 4.0.2
-    sigc::slot<void, Document*> base2 = first;
+    sigc::slot<void, SPDocument*> base2 = first;
 
-    sigc::slot<void,SPDesktop*,Document*> slot2 = sigc::hide<0>( base2 );
+    sigc::slot<void,SPDesktop*,SPDocument*> slot2 = sigc::hide<0>( base2 );
     _document_connection = desktop->connectDocumentReplaced( slot2 );
 
     _setDocument(desktop->doc());
@@ -211,7 +211,7 @@ void LayerManager::renameLayer( SPObject* obj, gchar const *label, bool uniquify
 
 
 
-void LayerManager::_setDocument(Document *document) {
+void LayerManager::_setDocument(SPDocument *document) {
     if (_document) {
         _resource_connection.disconnect();
     }
-- 
cgit v1.2.3