* src/libavoid/connector.cpp, src/libavoid/connector.h,

      src/libavoid/shape.cpp, src/libavoid/graph.cpp,
      src/libavoid/incremental.cpp, src/libavoid/incremental.h,
      src/libavoid/static.cpp, src/libavoid/visibility.cpp, 
      src/libavoid/makepath.cpp:

    Some minor upstream libavoid fixes.

(bzr r25)

1 files changed, 4 insertions, 6 deletions

diff --git a/src/libavoid/connector.h b/src/libavoid/connector.h
index 6abb01d49..71713ae41 100644
--- a/src/libavoid/connector.h
+++ b/src/libavoid/connector.h
@@ -30,8 +30,6 @@
 
 namespace Avoid {
 
-typedef unsigned int uint;
-    
 class ConnRef;
 
 typedef std::list<ConnRef *> ConnRefList;
@@ -40,8 +38,8 @@ typedef std::list<ConnRef *> ConnRefList;
 class ConnRef
 {
     public:
-        ConnRef(const uint id);
-        ConnRef(const uint id, const Point& src, const Point& dst);
+        ConnRef(const unsigned int id);
+        ConnRef(const unsigned int id, const Point& src, const Point& dst);
         ~ConnRef();
         
         PolyLine& route(void);
@@ -49,7 +47,7 @@ class ConnRef
         void moveRoute(const int& diff_x, const int& diff_y);
         void freeRoute(void);
         void calcRouteDist(void);
-        void updateEndPoint(const uint type, const Point& point);
+        void updateEndPoint(const unsigned int type, const Point& point);
         void makeActive(void);
         void makeInactive(void);
         void lateSetup(const Point& src, const Point& dst);
@@ -66,7 +64,7 @@ class ConnRef
         friend void markConnectors(ShapeRef *shape);
 
     private:
-        uint _id;
+        unsigned int _id;
         bool _needs_reroute_flag;
         bool _false_path;
         bool _active;