Merge experimental

(bzr r13641)

1 files changed, 0 insertions, 95 deletions

diff --git a/src/shape-editor.h b/src/shape-editor.h
deleted file mode 100644
index ec4b50fa3..000000000
--- a/src/shape-editor.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef SEEN_SHAPE_EDITOR_H
-#define SEEN_SHAPE_EDITOR_H
-
-/*
- * Inkscape::ShapeEditor
- *
- * This is a container class which contains either knotholder (for shapes) or nodepath (for
- * paths). It is attached to a single item so only one of these is active at a time.
- *
- * Authors:
- *   bulia byak <buliabyak@users.sf.net>
- *
- */
-
-#include <glib.h>
-
-#include <2geom/forward.h>
-
-
-namespace Inkscape { namespace NodePath { class Path; } }
-namespace Inkscape { namespace XML { class Node; } }
-
-class KnotHolder;
-class LivePathEffectObject;
-class SPDesktop;
-class SPItem;
-class SPNodeContext;
-class ShapeEditorsCollective;
-
-#include <2geom/point.h>
-#include <boost/optional.hpp>
-#include <vector>
-
-enum SubType{
-    SH_NODEPATH,
-    SH_KNOTHOLDER
-};
-
-class ShapeEditor {
-public:
-
-    ShapeEditor(SPDesktop *desktop);
-    ~ShapeEditor();
-
-    void set_item (SPItem *item, SubType type, bool keep_knotholder = false);
-    void unset_item (SubType type, bool keep_knotholder = false);
-
-    bool has_nodepath (); //((deprecated))
-    void update_knotholder (); //((deprecated))
-
-    bool has_local_change (SubType type);
-    void decrement_local_change (SubType type);
-
-    GList *save_nodepath_selection ();
-    void restore_nodepath_selection (GList *saved);
-
-    void nodepath_destroyed ();
-
-    bool has_selection ();
-
-    Inkscape::NodePath::Path *get_nodepath() {return NULL;} //((deprecated))
-    ShapeEditorsCollective *get_container() {return NULL;}
-
-    // this one is only public because it's called from non-C++ repr changed callback
-    void shapeeditor_event_attr_changed(gchar const *name);
-
-    bool knot_mouseover() const;
-    
-    static void blockSetItem(bool b) {_blockSetItem = b;}
-
-private:
-    bool has_knotholder ();
-    void reset_item (SubType type, bool keep_knotholder = true);
-    const SPItem *get_item (SubType type);
-    static bool _blockSetItem;
-
-    SPDesktop *desktop;
-    KnotHolder *knotholder;
-    Inkscape::XML::Node *knotholder_listener_attached_for;
-};
-
-#endif // SEEN_SHAPE_EDITOR_H
-
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
-