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/ui/dialog/xml-tree.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/ui/dialog/xml-tree.cpp') diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index b430c17be..d6173c7b6 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -96,7 +96,7 @@ XmlTree::XmlTree() : contents->pack_start(*notebook_content, true, true, 0); _message_stack = std::make_shared(); - _message_context = new Inkscape::MessageContext(_message_stack); + _message_context = std::unique_ptr(new Inkscape::MessageContext(_message_stack)); _message_changed_connection = _message_stack->connectChanged( sigc::bind(sigc::ptr_fun(_set_status_message), GTK_WIDGET(status.gobj()))); @@ -235,7 +235,6 @@ XmlTree::~XmlTree () set_tree_desktop(nullptr); _message_changed_connection.disconnect(); - delete _message_context; _message_context = nullptr; _message_stack = nullptr; _message_changed_connection.~connection(); @@ -268,9 +267,8 @@ void XmlTree::attr_reset_context(gint attr) } else { const gchar *name = g_quark_to_string(attr); - gchar *message = g_strdup_printf(_("Attribute %s selected. Press Ctrl+Enter when done editing to commit changes."), name); - _message_context->set(Inkscape::NORMAL_MESSAGE, message); - g_free(message); + _message_context->setF(Inkscape::NORMAL_MESSAGE, + _("Attribute %s selected. Press Ctrl+Enter when done editing to commit changes."), name); } } -- cgit v1.2.3