diff --git a/src/inkview.cpp b/src/inkview.cpp
index 0278d3029faaf0e860bd1d791279d9197b7c1f67..c151991dd8f469721d6c6b6bd9176f944bc0fbf0 100644 (file)
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
#include "svg-view-widget.h"
#ifdef WITH_INKJAR
-#include "inkjar/jar.h"
+#include "io/inkjar.h"
#endif
#include "inkscape-private.h"
int size;
int length;
int current;
- Document *doc;
+ SPDocument *doc;
GtkWidget *view;
GtkWidget *window;
bool fullscreen;
}
static void
-sp_svgview_set_document(struct SPSlideShow *ss, Document *doc, int current)
+sp_svgview_set_document(struct SPSlideShow *ss, SPDocument *doc, int current)
{
if (doc && doc != ss->doc) {
sp_document_ensure_up_to_date (doc);
reinterpret_cast<SPSVGView*>(SP_VIEW_WIDGET_VIEW (ss->view))->setDocument (doc);
- if (ss->doc) {
- delete ss->doc;
- }
ss->doc = doc;
ss->current = current;
}
{
sp_svgview_waiting_cursor(ss);
- Document *doc = NULL;
+ SPDocument *doc = NULL;
int current = ss->current;
while (!doc && (current < ss->length - 1)) {
doc = sp_document_new (ss->slides[++current], TRUE, false);
{
sp_svgview_waiting_cursor(ss);
- Document *doc = NULL;
+ SPDocument *doc = NULL;
int current = ss->current;
while (!doc && (current > 0)) {
doc = sp_document_new (ss->slides[--current], TRUE, false);
{
sp_svgview_waiting_cursor(ss);
- Document *doc = NULL;
+ SPDocument *doc = NULL;
int current = 0;
while ( !doc && (current < ss->length - 1)) {
if (current == ss->current)
{
sp_svgview_waiting_cursor(ss);
- Document *doc = NULL;
+ SPDocument *doc = NULL;
int current = ss->length - 1;
while (!doc && (current >= 0)) {
if (current == ss->current)
Inkscape::Application *inkscape_get_instance() { return NULL; }
void inkscape_ref (void) {}
void inkscape_unref (void) {}
-void inkscape_add_document (Document *document) {}
-void inkscape_remove_document (Document *document) {}
+void inkscape_add_document (SPDocument *document) {}
+void inkscape_remove_document (SPDocument *document) {}
#endif