Merge from trunk

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

diff --git a/src/layer-manager.h b/src/layer-manager.h
index d92946a4c3af0660a1db5b002d71571255de83cc..81f75e002aef5144ef16cbc8937a5a3d27b7ccb2 100644 (file)
--- a/src/layer-manager.h
+++ b/src/layer-manager.h
@@ -14,6 +14,7 @@
 #include "gc-finalized.h"
 #include "gc-soft-ptr.h"
 #include <vector>
+#include <map>
 
 class SPDesktop;
 class SPDocument;
@@ -25,6 +26,10 @@ class LayerManager : public DocumentSubset,
 {
 public:
     LayerManager(SPDesktop *desktop);
+    virtual ~LayerManager();
+
+    void setCurrentLayer( SPObject* obj );
+    void renameLayer( SPObject* obj, gchar const *label, bool uniquify );
 
     sigc::connection connectCurrentLayerChanged(const sigc::slot<void, SPObject *> & slot) {
        return _layer_changed_signal.connect(slot);
@@ -38,8 +43,6 @@ private:
     friend class LayerWatcher;
     class LayerWatcher;
 
-    static void _objectModifiedCB( SPObject* obj, guint flags, LayerManager* mgr );
-
     void _objectModified( SPObject* obj, guint flags );
     void _setDocument(SPDocument *document);
     void _rebuild();