Merge from branch

(bzr r11950.1.18)

1 files changed, 3 insertions, 13 deletions

diff --git a/src/conn-avoid-ref.h b/src/conn-avoid-ref.h
index 4d38f2845..30b380eb7 100644
--- a/src/conn-avoid-ref.h
+++ b/src/conn-avoid-ref.h
@@ -13,14 +13,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <2geom/point.h>
 #include <glib.h>
 #include <stddef.h>
 #include <sigc++/connection.h>
 
 class  SPDesktop;
 class  SPItem;
-struct ConnectionPoint;
-typedef std::map<int, ConnectionPoint> IdConnectionPointMap;
 namespace Avoid { class ShapeRef; }
 
 class SPAvoidRef {
@@ -31,16 +30,11 @@ public:
     // libavoid's internal representation of the item.
     Avoid::ShapeRef *shapeRef;
 
-    // Used for holding connection points for item
-    IdConnectionPointMap connection_points;
-
     void setAvoid(char const *value);
-    void setConnectionPoints(gchar const *value);
-    void addConnectionPoint(ConnectionPoint &cp);
-    void updateConnectionPoint(ConnectionPoint &cp);
-    void deleteConnectionPoint(ConnectionPoint &cp);
     void handleSettingChange(void);
 
+    Geom::Point getConnectionPointPos(void);
+
     // Returns a list of SPItems of all connectors/shapes attached to
     // this object.  Pass one of the following for 'type':
     //     Avoid::runningTo
@@ -48,9 +42,6 @@ public:
     //     Avoid::runningToAndFrom
     GSList *getAttachedShapes(const unsigned int type);
     GSList *getAttachedConnectors(const unsigned int type);
-    Geom::Point getConnectionPointPos(const int type, const int id);
-
-    bool isValidConnPointId( const int type, const int id );
 
 private:
     SPItem *item;
@@ -61,7 +52,6 @@ private:
 
     // A sigc connection for transformed signal.
     sigc::connection _transformed_connection;
-    void setConnectionPointsAttrUndoable(const gchar* value, const gchar* action);
 };
 
 extern GSList *get_avoided_items(GSList *list, SPObject *from,