Merge from trunk.

[inkscape.git] / src / layer-manager.h

diff --git a/src/layer-manager.h b/src/layer-manager.h
index bbd5ccafbf40dfd63fc41182d0205ba0a0fa01ce..fbb22d40511dd85d7f5608fe1907af905d0e5198 100644 (file)
--- a/src/layer-manager.h
+++ b/src/layer-manager.h
@@ -17,7 +17,7 @@
 #include <map>
 
 class SPDesktop;
-class Document;
+class SPDocument;
 
 namespace Inkscape {
 
@@ -32,11 +32,11 @@ public:
     void renameLayer( SPObject* obj, gchar const *label, bool uniquify );
 
     sigc::connection connectCurrentLayerChanged(const sigc::slot<void, SPObject *> & slot) {
-       return _layer_changed_signal.connect(slot);
+        return _layer_changed_signal.connect(slot);
     }
 
     sigc::connection connectLayerDetailsChanged(const sigc::slot<void, SPObject *> & slot) {
-       return _details_changed_signal.connect(slot);
+        return _details_changed_signal.connect(slot);
     }
 
 private:
@@ -44,7 +44,7 @@ private:
     class LayerWatcher;
 
     void _objectModified( SPObject* obj, guint flags );
-    void _setDocument(Document *document);
+    void _setDocument(SPDocument *document);
     void _rebuild();
     void _selectedLayerChanged(SPObject *layer);
 
@@ -53,7 +53,7 @@ private:
     sigc::connection _resource_connection;
 
     GC::soft_ptr<SPDesktop> _desktop;
-    Document *_document;
+    SPDocument *_document;
 
     std::vector<LayerWatcher*> _watchers;
 
@@ -73,4 +73,4 @@ private:
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :