Various snapping cleanups and bug fixes.

[inkscape.git] / src / libavoid / vertices.h

diff --git a/src/libavoid/vertices.h b/src/libavoid/vertices.h
index c2ff6977fc8ddc8c17cce078ea72102d987da3b3..de2e30ae36f0ed7904f5ac2d47cb5795f2225c20 100644 (file)
--- a/src/libavoid/vertices.h
+++ b/src/libavoid/vertices.h
@@ -2,7 +2,7 @@
  * vim: ts=4 sw=4 et tw=0 wm=0
  *
  * libavoid - Fast, Incremental, Object-avoiding Line Router
- * Copyright (C) 2004-2005  Michael Wybrow <mjwybrow@users.sourceforge.net>
+ * Copyright (C) 2004-2006  Michael Wybrow <mjwybrow@users.sourceforge.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -32,6 +32,7 @@
 namespace Avoid {
 
 class EdgeInf;
+class Router;
 
 typedef std::list<EdgeInf *> EdgeInfList;
 
@@ -64,10 +65,11 @@ class VertID
 class VertInf
 {
     public:
-        VertInf(const VertID& vid, const Point& vpoint);
+        VertInf(Router *router, const VertID& vid, const Point& vpoint);
         void Reset(const Point& vpoint);
         void removeFromGraph(const bool isConnVert = true);
 
+        Router *_router;
         VertID id;
         Point  point;
         VertInf *lstPrev;
@@ -112,9 +114,6 @@ class VertInfList
 typedef std::set<unsigned int> ShapeSet;
 typedef std::map<VertID, ShapeSet> ContainsMap;
 
-extern ContainsMap contains;
-extern VertInfList vertices;
-
 
 }