isolate the nodepath-or-knotholder unit into the new ShapeEditor class which handles listeners etc. and provides a single interface to work with nodepath or knotholder; later will add another layer, ShapeEditorsCollective, which will allow us to have any number of nodepaths and knotholders simultaneously

(bzr r2374)

1 files changed, 4 insertions, 5 deletions

diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 81bce14c3..b8f840520 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -46,7 +46,8 @@
 #include "sp-flowtext.h"
 #include "text-editing.h"
 
-#include "node-context.h" //For node align/distribute function
+#include "node-context.h"  //For access to ShapeEditor
+#include "shape-editor.h" //For node align/distribute methods
 
 #include "tools-switch.h"
 
@@ -413,12 +414,10 @@ private :
 	SPEventContext *event_context = sp_desktop_event_context(SP_ACTIVE_DESKTOP);
 	if (!SP_IS_NODE_CONTEXT (event_context)) return ;
 
-        Inkscape::NodePath::Path *nodepath = SP_NODE_CONTEXT (event_context)->nodepath;
-        if (!nodepath) return;
         if (_distribute)
-            sp_nodepath_selected_distribute(nodepath, _orientation);
+            SP_NODE_CONTEXT (event_context)->shape_editor->distribute(_orientation);
         else
-            sp_nodepath_selected_align(nodepath, _orientation);
+            SP_NODE_CONTEXT (event_context)->shape_editor->align(_orientation);
 
     }
 };