Update to trunk

(bzr r12588.1.26)

1 files changed, 6 insertions, 6 deletions

diff --git a/src/widgets/connector-toolbar.cpp b/src/widgets/connector-toolbar.cpp
index 2e5c2ade1..7230f521c 100644
--- a/src/widgets/connector-toolbar.cpp
+++ b/src/widgets/connector-toolbar.cpp
@@ -55,10 +55,10 @@
 #include "../xml/repr.h"
 #include "ui/uxmanager.h"
 #include "../ui/icon-names.h"
-#include "../pen-context.h"
+#include "ui/tools/pen-tool.h"
 #include "../sp-namedview.h"
 #include "../conn-avoid-ref.h"
-#include "../connector-context.h"
+#include "ui/tools/connector-tool.h"
 #include "../graphlayout.h"
 #include "../sp-path.h"
 
@@ -76,13 +76,13 @@ using Inkscape::UI::PrefPusher;
 
 static void sp_connector_path_set_avoid(void)
 {
-    cc_selection_set_avoid(true);
+    Inkscape::UI::Tools::cc_selection_set_avoid(true);
 }
 
 
 static void sp_connector_path_set_ignore(void)
 {
-    cc_selection_set_avoid(false);
+    Inkscape::UI::Tools::cc_selection_set_avoid(false);
 }
 
 static void sp_connector_orthogonal_toggled( GtkToggleAction* act, GObject *tbl )
@@ -114,7 +114,7 @@ static void sp_connector_orthogonal_toggled( GtkToggleAction* act, GObject *tbl
     while (l) {
         SPItem *item = SP_ITEM(l->data);
 
-        if (cc_item_is_connector(item)) {
+        if (Inkscape::UI::Tools::cc_item_is_connector(item)) {
             item->setAttribute( "inkscape:connector-type",
                     value, NULL);
             item->avoidRef->handleSettingChange();
@@ -163,7 +163,7 @@ static void connector_curvature_changed(GtkAdjustment *adj, GObject* tbl)
     while (l) {
         SPItem *item = SP_ITEM(l->data);
 
-        if (cc_item_is_connector(item)) {
+        if (Inkscape::UI::Tools::cc_item_is_connector(item)) {
             item->setAttribute( "inkscape:connector-curvature",
                     value, NULL);
             item->avoidRef->handleSettingChange();