From da21d890c67eb751e12f0af89aac67ecb2629ca0 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Thu, 22 Nov 2018 06:59:31 +0100 Subject: Use std::unique_ptr for all MessageContext --- src/desktop.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 1936226d4..68eca8cdf 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -147,7 +147,7 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas, Inkscape::UI::View::EditWid Inkscape::ResourceManager::getManager(); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - _guides_message_context = new Inkscape::MessageContext(messageStack()); + _guides_message_context = std::unique_ptr(new Inkscape::MessageContext(messageStack())); current = prefs->getStyle("/desktop/style"); @@ -376,7 +376,6 @@ void SPDesktop::destroy() drawing = nullptr; } - delete _guides_message_context; _guides_message_context = nullptr; } @@ -685,7 +684,7 @@ void SPDesktop::setEventContext(const std::string& toolName) } else { event_context = ToolFactory::createObject(toolName); event_context->desktop = this; - event_context->message_context = new Inkscape::MessageContext(this->messageStack()); + event_context->message_context = std::unique_ptr(new Inkscape::MessageContext(this->messageStack())); event_context->setup(); // Make sure no delayed snapping events are carried over after switching tools -- cgit v1.2.3