summaryrefslogtreecommitdiffstats
path: root/src/trace/trace.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-02-02 20:08:49 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-02-02 20:08:49 +0000
commit1d3b98e5f5311479cd87f20e3656b0133bff73bd (patch)
tree95eea2fcac18f236b31053e4d1493aa644760df0 /src/trace/trace.cpp
parentupdate to trunk (diff)
parentTranslations. Arabic translation update. (diff)
downloadinkscape-1d3b98e5f5311479cd87f20e3656b0133bff73bd.tar.gz
inkscape-1d3b98e5f5311479cd87f20e3656b0133bff73bd.zip
update to trunk
(bzr r13645.1.4)
Diffstat (limited to 'src/trace/trace.cpp')
-rw-r--r--src/trace/trace.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp
index cb83541e3..cc3d000a3 100644
--- a/src/trace/trace.cpp
+++ b/src/trace/trace.cpp
@@ -16,7 +16,7 @@
#include "inkscape.h"
#include "desktop.h"
-#include "desktop-handles.h"
+
#include "document.h"
#include "document-undo.h"
#include "message-stack.h"
@@ -51,9 +51,9 @@ SPImage *Tracer::getSelectedSPImage()
return NULL;
}
- Inkscape::MessageStack *msgStack = sp_desktop_message_stack(desktop);
+ Inkscape::MessageStack *msgStack = desktop->getMessageStack();
- Inkscape::Selection *sel = sp_desktop_selection(desktop);
+ Inkscape::Selection *sel = desktop->getSelection();
if (!sel)
{
char *msg = _("Select an <b>image</b> to trace");
@@ -217,9 +217,9 @@ Glib::RefPtr<Gdk::Pixbuf> Tracer::sioxProcessImage(SPImage *img, Glib::RefPtr<Gd
return Glib::RefPtr<Gdk::Pixbuf>(NULL);
}
- Inkscape::MessageStack *msgStack = sp_desktop_message_stack(desktop);
+ Inkscape::MessageStack *msgStack = desktop->getMessageStack();
- Inkscape::Selection *sel = sp_desktop_selection(desktop);
+ Inkscape::Selection *sel = desktop->getSelection();
if (!sel)
{
char *msg = _("Select an <b>image</b> to trace");
@@ -397,9 +397,9 @@ void Tracer::traceThread()
return;
}
- Inkscape::MessageStack *msgStack = sp_desktop_message_stack(desktop);
+ Inkscape::MessageStack *msgStack = desktop->getMessageStack();
- Inkscape::Selection *selection = sp_desktop_selection (desktop);
+ Inkscape::Selection *selection = desktop->getSelection();
if (!SP_ACTIVE_DOCUMENT)
{