summaryrefslogtreecommitdiffstats
path: root/src/desktop.cpp
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-11-22 04:17:27 +0000
committerTavmjong Bah <tavmjong@free.fr>2018-12-03 09:35:13 +0000
commit6af653ae04272a27390821842d3e8e23c6af3efe (patch)
tree33956cb2251979c6d3b06882d858a6c36f8c5dfc /src/desktop.cpp
parentAdd other sofwar binds to new keys, add missing one (diff)
downloadinkscape-6af653ae04272a27390821842d3e8e23c6af3efe.tar.gz
inkscape-6af653ae04272a27390821842d3e8e23c6af3efe.zip
Replace InkGC with std::shared_ptr for MessageStack
There are many places which still use this stack unmanaged (using desktop->getMessageStack()) but those are all leaf calls which make use of the stack and never store it anywhere, so this is fine.
Diffstat (limited to 'src/desktop.cpp')
-rw-r--r--src/desktop.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp
index c1d061702..1936226d4 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -24,8 +24,8 @@
#include <glibmm/i18n.h>
#include <2geom/transforms.h>
-
#include <2geom/rect.h>
+#include <memory>
#include "desktop.h"
@@ -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(const_cast<Inkscape::MessageStack*>(messageStack()));
+ _guides_message_context = new Inkscape::MessageContext(messageStack());
current = prefs->getStyle("/desktop/style");
@@ -433,7 +433,7 @@ SPCanvasGroup* SPDesktop::getTempGroup() const {
}
Inkscape::MessageStack* SPDesktop::getMessageStack() const {
- return messageStack();
+ return messageStack().get();
}
SPNamedView* SPDesktop::getNamedView() const {