X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Flayer-manager.cpp;fp=src%2Flayer-manager.cpp;h=8c45c7e53642fdebabb75b930ce24efb09909ab2;hb=09ba3247163582bf2e30e17c4c154aa259ce038a;hp=fe0d4190484ee637ff9927f93250dd5344aa8ff7;hpb=68578c45a00ff7f867d1f798d28db040bc1be157;p=inkscape.git 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 first = sigc::mem_fun(*this, &LayerManager::_setDocument); + sigc::bound_mem_functor1 first = sigc::mem_fun(*this, &LayerManager::_setDocument); // This next line has problems on gcc 4.0.2 - sigc::slot base2 = first; + sigc::slot base2 = first; - sigc::slot slot2 = sigc::hide<0>( base2 ); + sigc::slot 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(); }