From 2af3266fc2db760a1c8771e5945a0c94587d18e8 Mon Sep 17 00:00:00 2001
From: Markus Engel <markus.engel@tum.de>
Date: Wed, 26 Mar 2014 22:14:16 +0100
Subject: Cleaned up includes of tools / revert experimental casting macro
 replacements from r13061

(bzr r13216)
---
 src/widgets/connector-toolbar.cpp |  3 +++
 src/widgets/pencil-toolbar.cpp    | 12 ++----------
 2 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/widgets')

diff --git a/src/widgets/connector-toolbar.cpp b/src/widgets/connector-toolbar.cpp
index a0965721f..9bbc1bbb4 100644
--- a/src/widgets/connector-toolbar.cpp
+++ b/src/widgets/connector-toolbar.cpp
@@ -28,12 +28,15 @@
 # include "config.h"
 #endif
 
+#include <glibmm/i18n.h>
+
 #include "connector-toolbar.h"
 #include "conn-avoid-ref.h"
 #include "desktop-handles.h"
 #include "desktop.h"
 #include "document-undo.h"
 #include "ege-adjustment-action.h"
+#include "enums.h"
 #include "graphlayout.h"
 #include "ink-action.h"
 #include "inkscape.h"
diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp
index 6598e995a..682de8594 100644
--- a/src/widgets/pencil-toolbar.cpp
+++ b/src/widgets/pencil-toolbar.cpp
@@ -73,16 +73,8 @@ static void freehand_mode_changed(EgeSelectOneAction* act, GObject* tbl)
 
     // in pen tool we have more options than in pencil tool; if one of them was chosen, we do any
     // preparatory work here
-    //if (SP_IS_PEN_CONTEXT(desktop->event_context)) {
-    //    Inkscape::UI::Tools::PenTool *pc = SP_PEN_CONTEXT(desktop->event_context);
-    //    sp_pen_context_set_polyline_mode(pc);
-    //}
-
-    using namespace Inkscape::UI;
-    using Inkscape::UI::Tools::PenTool;
-
-    if (Tool::is_a<PenTool>(desktop->event_context)) {
-        PenTool* pc = Tool::to<PenTool>(desktop->event_context);
+    if (SP_IS_PEN_CONTEXT(desktop->event_context)) {
+        Inkscape::UI::Tools::PenTool *pc = SP_PEN_CONTEXT(desktop->event_context);
         pc->setPolylineMode();
     }
 }
-- 
cgit v1.2.3