Richard's patch for crash bug 402274

[inkscape.git] / src / conn-avoid-ref.h

diff --git a/src/conn-avoid-ref.h b/src/conn-avoid-ref.h
index c60cf7afd1c5a28ed742b37e68b4598bc79dd4eb..d34d8ca2e644be593e20589368326718dd51598a 100644 (file)
--- a/src/conn-avoid-ref.h
+++ b/src/conn-avoid-ref.h
@@ -1,9 +1,10 @@
 #ifndef SEEN_CONN_AVOID_REF
 #define SEEN_CONN_AVOID_REF
 
-/*
+/** \file
  * A class for handling shape interaction with libavoid.
- *
+ */
+/*
  * Authors:
  *   Michael Wybrow <mjwybrow@users.sourceforge.net>
  *
@@ -12,18 +13,17 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-
+#include <glib/gslist.h>
 #include <sigc++/connection.h>
 
+struct SPDesktop;
 struct SPItem;
-namespace Avoid {
-    class ShapeRef;
-}
+namespace Avoid { class ShapeRef; }
 
 class SPAvoidRef {
 public:
     SPAvoidRef(SPItem *spitem);
-    ~SPAvoidRef();
+    virtual ~SPAvoidRef();
 
     // libavoid's internal representation of the item.
     Avoid::ShapeRef *shapeRef;
@@ -52,10 +52,10 @@ private:
 
 extern GSList *get_avoided_items(GSList *list, SPObject *from,
         SPDesktop *desktop, bool initialised = true);
-extern void avoid_item_move(NR::Matrix const *mp, SPItem *moved_item);
+extern void avoid_item_move(Geom::Matrix const *mp, SPItem *moved_item);
 extern void init_avoided_shape_geometry(SPDesktop *desktop);
 
-static const double defaultConnSpacing = 10.0;
+static const double defaultConnSpacing = 3.0;
 
 #endif /* !SEEN_CONN_AVOID_REF */