Fixed SPObject ctor and dtor; removed singleton.h; some smaller changes.

(bzr r11608.1.110)

1 files changed, 1 insertions, 8 deletions

diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index 824c6e329..09a1d5742 100644
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
@@ -92,7 +92,6 @@ const std::string& SPFloodContext::getPrefsPath() {
 const std::string SPFloodContext::prefsPath = "/tools/paintbucket";
 
 SPFloodContext::SPFloodContext() : SPEventContext() {
-	this->_message_context = 0;
     this->cursor_shape = cursor_paintbucket_xpm;
     this->hot_x = 11;
     this->hot_y = 30;
@@ -115,10 +114,6 @@ SPFloodContext::~SPFloodContext() {
     if (this->item) {
         this->finishItem();
     }
-
-    if (this->_message_context) {
-        delete this->_message_context;
-    }
 }
 
 /**
@@ -145,8 +140,6 @@ void SPFloodContext::setup() {
     	sigc::mem_fun(this, &SPFloodContext::selection_changed)
     );
 
-    this->_message_context = new Inkscape::MessageContext((this->desktop)->messageStack());
-
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
     if (prefs->getBool("/tools/paintbucket/selcue")) {
@@ -1231,7 +1224,7 @@ bool SPFloodContext::root_handler(GdkEvent* event) {
 }
 
 void SPFloodContext::finishItem() {
-    this->_message_context->clear();
+    this->message_context->clear();
 
     if (this->item != NULL) {
         this->item->updateRepr();