From 45f373f3319b598d8e0222fb48e9d3a4760b2044 Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Fri, 27 Jun 2014 15:23:06 -0400 Subject: 5. Refactoring of Application class: make copy/assignment operators private, disallow pointers to Application (bzr r13341.5.9) --- src/helper/stock-items.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/helper/stock-items.cpp') diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp index a12fa377a..58a8a7dfc 100644 --- a/src/helper/stock-items.cpp +++ b/src/helper/stock-items.cpp @@ -195,7 +195,7 @@ SPObject *get_stock_item(gchar const *urn, gboolean stock) gchar * base = g_strndup(e, a); - SPDesktop *desktop = inkscape_active_desktop(); + SPDesktop *desktop = INKSCAPE.active_desktop(); SPDocument *doc = sp_desktop_document(desktop); SPDefs *defs = doc->getDefs(); if (!defs) { @@ -265,7 +265,7 @@ SPObject *get_stock_item(gchar const *urn, gboolean stock) else { - SPDesktop *desktop = inkscape_active_desktop(); + SPDesktop *desktop = INKSCAPE.active_desktop(); SPDocument *doc = sp_desktop_document(desktop); SPObject *object = doc->getObjectById(urn); -- cgit v1.2.3 From 8edb6edfedc2665a4fa72045ae7faedd0aaed958 Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Tue, 25 Nov 2014 20:35:57 -0500 Subject: Replace INKSCAPE.active_desktop() by SP_ACTIVE_DESKTOP for easier grepability (bzr r13768) --- src/helper/stock-items.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/helper/stock-items.cpp') diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp index 17c4c53a7..99dc21e58 100644 --- a/src/helper/stock-items.cpp +++ b/src/helper/stock-items.cpp @@ -195,7 +195,7 @@ SPObject *get_stock_item(gchar const *urn, gboolean stock) gchar * base = g_strndup(e, a); - SPDesktop *desktop = INKSCAPE.active_desktop(); + SPDesktop *desktop = SP_ACTIVE_DESKTOP; SPDocument *doc = sp_desktop_document(desktop); SPDefs *defs = doc->getDefs(); if (!defs) { @@ -265,7 +265,7 @@ SPObject *get_stock_item(gchar const *urn, gboolean stock) else { - SPDesktop *desktop = INKSCAPE.active_desktop(); + SPDesktop *desktop = SP_ACTIVE_DESKTOP; SPDocument *doc = sp_desktop_document(desktop); SPObject *object = doc->getObjectById(urn); -- cgit v1.2.3