Update to trunk

(bzr r11950.1.195)

1 files changed, 5 insertions, 5 deletions

diff --git a/src/dyna-draw-context.cpp b/src/ui/tools/calligraphic-tool.cpp
index 8fc777712..2c5e6561c 100644
--- a/src/dyna-draw-context.cpp
+++ b/src/ui/tools/calligraphic-tool.cpp
@@ -68,7 +68,7 @@
 #include "livarot/Shape.h"
 #include "verbs.h"
 
-#include "dyna-draw-context.h"
+#include "ui/tools/calligraphic-tool.h"
 
 using Inkscape::DocumentUndo;
 
@@ -105,7 +105,7 @@ const std::string& CalligraphicTool::getPrefsPath() {
 
 const std::string CalligraphicTool::prefsPath = "/tools/calligraphic";
 
-CalligraphicTool::CalligraphicTool() : SPCommonContext() {
+CalligraphicTool::CalligraphicTool() : DynamicBase() {
     this->cursor_shape = cursor_calligraphy_xpm;
     this->hot_x = 4;
     this->hot_y = 4;
@@ -139,7 +139,7 @@ CalligraphicTool::~CalligraphicTool() {
 }
 
 void CalligraphicTool::setup() {
-    SPCommonContext::setup();
+    DynamicBase::setup();
 
     this->accumulated = new SPCurve();
     this->currentcurve = new SPCurve();
@@ -201,7 +201,7 @@ void CalligraphicTool::set(const Inkscape::Preferences::Entry& val) {
         this->keep_selected = val.getBool();
     } else {
         //pass on up to parent class to handle common attributes.
-    	SPCommonContext::set(val);
+    	DynamicBase::set(val);
     }
 
     //g_print("DDC: %g %g %g %g\n", ddc->mass, ddc->drag, ddc->angle, ddc->width);
@@ -903,7 +903,7 @@ bool CalligraphicTool::root_handler(GdkEvent* event) {
 //        if ((SP_EVENT_CONTEXT_CLASS(sp_dyna_draw_context_parent_class))->root_handler) {
 //            ret = (SP_EVENT_CONTEXT_CLASS(sp_dyna_draw_context_parent_class))->root_handler(event_context, event);
 //        }
-    	ret = SPCommonContext::root_handler(event);
+    	ret = DynamicBase::root_handler(event);
     }
 
     return ret;