diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2009-08-06 14:17:17 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2009-08-06 14:17:17 +0000 |
| commit | 51c2905fd3e99955db2d823b79abb763d8097028 (patch) | |
| tree | 90128509479f5498e1125d1e4eb9cdc05bf6b6e6 /src/layer-manager.cpp | |
| parent | Adding one more control to Smart Jelly (diff) | |
| download | inkscape-51c2905fd3e99955db2d823b79abb763d8097028.tar.gz inkscape-51c2905fd3e99955db2d823b79abb763d8097028.zip | |
Revert recent refactoring changes by johnce because they break the build, which cannot be fixed easily.
(bzr r8422)
Diffstat (limited to 'src/layer-manager.cpp')
| -rw-r--r-- | src/layer-manager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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(); } |
