* Merge from trunk

* Update to new snapping API
* Modify the join action slightly

(bzr r8846.2.11)

1 files changed, 37 insertions, 0 deletions

diff --git a/src/connection-points.cpp b/src/connection-points.cpp
new file mode 100644
index 000000000..9ed98d211
--- /dev/null
+++ b/src/connection-points.cpp
@@ -0,0 +1,37 @@
+#include "connection-points.h"
+
+
+bool ConnectionPoint::operator!=(ConnectionPoint& cp)
+{
+    return (id!=cp.id || type!=cp.type || dir!=cp.dir || pos!=cp.pos);
+}
+
+bool ConnectionPoint::operator==(ConnectionPoint& cp)
+{
+    return (id==cp.id && type==cp.type && dir==cp.dir && pos==cp.pos);
+}
+
+
+namespace Inkscape{
+
+SVGIStringStream&
+operator>>(SVGIStringStream& istr, ConnectionPoint& cp)
+{
+    istr>>cp.id>>cp.dir>>cp.pos[Geom::X]>>cp.pos[Geom::Y];
+
+    return istr;
+}
+
+SVGOStringStream&
+operator<<(SVGOStringStream& ostr, const ConnectionPoint& cp)
+{
+    ostr<<cp.id<<' '<<cp.dir<<' ';
+    ::operator<<( ostr, cp.pos[Geom::X] );
+    ostr<<' ';
+    ::operator<<( ostr, cp.pos[Geom::Y] );
+
+    return ostr;
+}
+
+
+}