1 files changed, 10 insertions, 8 deletions
diff --git a/src/pen-context.cpp b/src/ui/tools/pen-tool.cpp
index bb263382a..32b1b47ef 100644
--- a/src/pen-context.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -19,7 +19,9 @@
 #include <gdk/gdkkeysyms.h>
 #include <cstring>
 #include <string>
-#include "pen-context.h"
+
+
+#include "ui/tools/pen-tool.h"
 #include "sp-namedview.h"
 #include "desktop.h"
 #include "desktop-handles.h"
@@ -149,7 +151,7 @@ const std::string& PenTool::getPrefsPath() {
 
 const std::string PenTool::prefsPath = "/tools/freehand/pen";
 
-PenTool::PenTool() : SPDrawContext() {
+PenTool::PenTool() : FreehandBase() {
 	this->polylines_only = false;
 	this->polylines_paraxial = false;
 	this->expecting_clicks_for_LPE = 0;
@@ -224,7 +226,7 @@ void sp_pen_context_set_mode(PenTool *const pc, guint mode) {
  * Callback to initialize PenTool object.
  */
 void PenTool::setup() {
-    SPDrawContext::setup();
+    FreehandBase::setup();
 
     ControlManager &mgr = ControlManager::getManager();
 
@@ -280,7 +282,7 @@ void PenTool::finish() {
         pen_cancel(this);
     }
 
-    SPDrawContext::finish();
+    FreehandBase::finish();
 }
 
 /**
@@ -355,7 +357,7 @@ bool PenTool::item_handler(SPItem* item, GdkEvent* event) {
     }
 
     if (!ret) {
-    	ret = SPDrawContext::item_handler(item, event);
+    	ret = FreehandBase::item_handler(item, event);
     }
 
     return ret;
@@ -393,7 +395,7 @@ bool PenTool::root_handler(GdkEvent* event) {
     }
 
     if (!ret) {
-    	ret = SPDrawContext::root_handler(event);
+    	ret = FreehandBase::root_handler(event);
     }
 
     return ret;
@@ -409,7 +411,7 @@ static gint pen_handle_button_press(PenTool *const pc, GdkEventButton const &bev
         return FALSE;
     }
 
-    SPDrawContext * const dc = SP_DRAW_CONTEXT(pc);
+    FreehandBase * const dc = SP_DRAW_CONTEXT(pc);
     SPDesktop * const desktop = SP_EVENT_CONTEXT_DESKTOP(dc);
     Geom::Point const event_w(bevent.x, bevent.y);
     Geom::Point event_dt(desktop->w2d(event_w));
@@ -765,7 +767,7 @@ static gint pen_handle_button_release(PenTool *const pc, GdkEventButton const &r
     ToolBase *event_context = SP_EVENT_CONTEXT(pc);
     if ( revent.button == 1  && !event_context->space_panning) {
 
-        SPDrawContext *dc = SP_DRAW_CONTEXT (pc);
+        FreehandBase *dc = SP_DRAW_CONTEXT (pc);
 
         Geom::Point const event_w(revent.x,
                                 revent.y);