From da21d890c67eb751e12f0af89aac67ecb2629ca0 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Thu, 22 Nov 2018 06:59:31 +0100
Subject: Use std::unique_ptr for all MessageContext

---
 src/ui/view/view.cpp | 3 +--
 src/ui/view/view.h   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/ui/view')

diff --git a/src/ui/view/view.cpp b/src/ui/view/view.cpp
index e15ea7780..b595ce1a7 100644
--- a/src/ui/view/view.cpp
+++ b/src/ui/view/view.cpp
@@ -59,7 +59,7 @@ View::View()
 :  _doc(nullptr)
 {
     _message_stack = std::make_shared<Inkscape::MessageStack>();
-    _tips_message_context = new Inkscape::MessageContext(_message_stack);
+    _tips_message_context = std::unique_ptr<Inkscape::MessageContext>(new Inkscape::MessageContext(_message_stack));
 
     _resized_connection = _resized_signal.connect (sigc::bind (sigc::ptr_fun (&_onResized), this));
     _redraw_requested_connection = _redraw_requested_signal.connect (sigc::bind (sigc::ptr_fun (&_onRedrawRequested), this));
@@ -75,7 +75,6 @@ View::~View()
 void View::_close() {
     _message_changed_connection.disconnect();
 
-    delete _tips_message_context;
     _tips_message_context = nullptr;
 
     _message_stack = nullptr;
diff --git a/src/ui/view/view.h b/src/ui/view/view.h
index 1134e727a..d3afc73c3 100644
--- a/src/ui/view/view.h
+++ b/src/ui/view/view.h
@@ -90,7 +90,7 @@ public:
       { return _message_stack; }
     /// Returns a pointer to the view's tipsMessageContext.
     Inkscape::MessageContext *tipsMessageContext() const
-      { return _tips_message_context; }
+      { return _tips_message_context.get(); }
 
     void emitResized(gdouble width, gdouble height);
     void requestRedraw();
@@ -110,7 +110,7 @@ public:
 protected:
     SPDocument *_doc;
     std::shared_ptr<Inkscape::MessageStack> _message_stack;
-    Inkscape::MessageContext *_tips_message_context;
+    std::unique_ptr<Inkscape::MessageContext> _tips_message_context;
 
     virtual void _close();
 
-- 
cgit v1.2.3