Split SPCanvasItem and SPCanvasGroup to individual .h files. Removed forward header.

[inkscape.git] / src / connector-context.h

diff --git a/src/connector-context.h b/src/connector-context.h
index 640a03aaea67d8848439fc9009ed91fbaf17590b..b03d0fcf0935358b307b9b738983c356ac839b0f 100644 (file)
--- a/src/connector-context.h
+++ b/src/connector-context.h
@@ -16,7 +16,6 @@
 #include <sigc++/connection.h>
 #include "event-context.h"
 #include <forward.h>
-#include <display/display-forward.h>
 #include <2geom/point.h>
 #include "libavoid/connector.h"
 #include "connection-points.h"
@@ -29,6 +28,8 @@
 #define SP_IS_CONNECTOR_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), SP_TYPE_CONNECTOR_CONTEXT))
 
 struct SPKnot;
+struct SPCurve;
+
 namespace Inkscape
 {
   class Selection;
@@ -47,8 +48,6 @@ enum {
     SP_CONNECTOR_CONTEXT_DRAWING_MODE,
     SP_CONNECTOR_CONTEXT_EDITING_MODE
 };
-static char* cc_knot_tips[] = { _("<b>Connection point</b>: click or drag to create a new connector"),
-                           _("<b>Connection point</b>: click to select, drag to move") };
 
 typedef std::map<SPKnot *, ConnectionPoint>  ConnectionPointMap;
 
@@ -70,16 +69,16 @@ struct SPConnectorContext : public SPEventContext {
     SPCanvasItem *red_bpath;
     SPCurve *red_curve;
     guint32 red_color;
-    
+
     // Green curve
     SPCurve *green_curve;
-    
+
     // The new connector
     SPItem *newconn;
     Avoid::ConnRef *newConnRef;
     gdouble curvature;
     bool isOrthogonal;
-    
+
     // The active shape
     SPItem *active_shape;
     Inkscape::XML::Node *active_shape_repr;
@@ -90,7 +89,7 @@ struct SPConnectorContext : public SPEventContext {
     Inkscape::XML::Node *active_conn_repr;
     sigc::connection sel_changed_connection;
 
-    
+
     // The activehandle
     SPKnot *active_handle;
 
@@ -99,12 +98,14 @@ struct SPConnectorContext : public SPEventContext {
 
     SPItem *clickeditem;
     SPKnot *clickedhandle;
-    
+
     ConnectionPointMap connpthandles;
     SPKnot *endpt_handle[2];
     guint  endpt_handler_id[2];
-    gchar *sid;
-    gchar *eid;
+    gchar *shref;
+    gchar *scpid;
+    gchar *ehref;
+    gchar *ecpid;
     SPCanvasItem *c0, *c1, *cl0, *cl1;
 };
 
@@ -130,4 +131,4 @@ bool cc_item_is_connector(SPItem *item);
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :