diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp
index d832a34b4b81491a31d3c9ea234cf1cbc3868090..d90eca49b1ac20c5e1007517557295736e4bf043 100644 (file)
--- a/src/conn-avoid-ref.cpp
+++ b/src/conn-avoid-ref.cpp
#include "conn-avoid-ref.h"
#include "libnr/nr-rect-ops.h"
#include "libavoid/polyutil.h"
-#include "libavoid/incremental.h"
+#include "libavoid/router.h"
#include "libavoid/connector.h"
#include "xml/simple-node.cpp"
#include "document.h"
#include "inkscape.h"
+using Avoid::Router;
+
static Avoid::Polygn avoid_item_poly(SPItem const *item);
{
_transformed_connection.disconnect();
if (shapeRef) {
+ Router *router = shapeRef->router();
// shapeRef is finalised by delShape,
// so no memory is lost here.
- Avoid::delShape(shapeRef);
+ router->delShape(shapeRef);
shapeRef = NULL;
}
}
if (desktop == NULL) {
return;
}
+
+ Router *router = item->document->router;
if (new_setting == setting) {
// Don't need to make any changes
// Get a unique ID for the item.
GQuark itemID = g_quark_from_string(id);
- shapeRef = new Avoid::ShapeRef(itemID, poly);
+ shapeRef = new Avoid::ShapeRef(router, itemID, poly);
Avoid::freePoly(poly);
- Avoid::addShape(shapeRef);
+ router->addShape(shapeRef);
}
}
else
// shapeRef is finalised by delShape,
// so no memory is lost here.
- Avoid::delShape(shapeRef);
+ router->delShape(shapeRef);
shapeRef = NULL;
}
setting = new_setting;
Avoid::IntList shapes;
GQuark shapeId = g_quark_from_string(item->id);
- Avoid::attachedShapes(shapes, shapeId, type);
+ item->document->router->attachedShapes(shapes, shapeId, type);
Avoid::IntList::iterator finish = shapes.end();
for (Avoid::IntList::iterator i = shapes.begin(); i != finish; ++i) {
Avoid::IntList conns;
GQuark shapeId = g_quark_from_string(item->id);
- Avoid::attachedConns(conns, shapeId, type);
+ item->document->router->attachedConns(conns, shapeId, type);
Avoid::IntList::iterator finish = conns.end();
for (Avoid::IntList::iterator i = conns.begin(); i != finish; ++i) {
Avoid::ShapeRef *shapeRef = moved_item->avoidRef->shapeRef;
g_assert(shapeRef);
+ Router *router = moved_item->document->router;
Avoid::Polygn poly = avoid_item_poly(moved_item);
if (poly.pn > 0) {
- // moveShape actually destroys the old shapeRef and returns a new one.
- moved_item->avoidRef->shapeRef = Avoid::moveShape(shapeRef, &poly);
+ router->moveShape(shapeRef, &poly);
Avoid::freePoly(poly);
}
}
{
// Don't count this as changes to the document,
// it is basically just llate initialisation.
- SPDocument *document = SP_DT_DOCUMENT(desktop);
+ SPDocument *document = sp_desktop_document(desktop);
gboolean saved = sp_document_get_undo_sensitive(document);
sp_document_set_undo_sensitive(document, FALSE);