Merge and cleanup of GSoC C++-ification project.

[inkscape.git] / src / document-private.h

diff --git a/src/document-private.h b/src/document-private.h
index 549a4530f49985a752cc6a69f33ac18987afb3da..61e6bad67beff4b1f69070662badafd0b7949af0 100644 (file)
--- a/src/document-private.h
+++ b/src/document-private.h
@@ -1,11 +1,12 @@
-#ifndef __SP_DOCUMENT_PRIVATE_H__
-#define __SP_DOCUMENT_PRIVATE_H__
+#ifndef SEEN_SP_DOCUMENT_PRIVATE_H
+#define SEEN_SP_DOCUMENT_PRIVATE_H
 
 /*
  * Seldom needed document data
  *
  * Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
+ *   Jon A. Cruz <jon@joncruz.org>
  *
  * Copyright (C) 1999-2002 Lauris Kaplinski
  * Copyright (C) 2001-2002 Ximian, Inc.
@@ -22,10 +23,12 @@
 
 #include "composite-undo-stack-observer.h"
 
+#include "event-log.h"
+
 // XXX only for testing!
 #include "console-output-undo-observer.h"
 
-#define SP_DOCUMENT_DEFS(d) ((SPObject *) SP_ROOT (SP_DOCUMENT_ROOT (d))->defs)
+#define SP_DOCUMENT_DEFS(d) ((SPObject *) SP_ROOT(d->getRoot())->defs)
 
 namespace Inkscape {
 namespace XML {
@@ -41,6 +44,8 @@ struct SPDocumentPrivate {
        GHashTable *iddef;      /**< Dictionary of id -> SPObject mappings */
        GHashTable *reprdef;   /**< Dictionary of Inkscape::XML::Node -> SPObject mappings */
 
+       unsigned long serial;
+
        /** Dictionary of signals for id changes */
        IDChangedSignalMap id_changed_signals;
 
@@ -54,9 +59,10 @@ struct SPDocumentPrivate {
        SPDocument::ResizedSignal resized_signal;
        SPDocument::ReconstructionStart _reconstruction_start_signal;
        SPDocument::ReconstructionFinish  _reconstruction_finish_signal;
+  SPDocument::CommitSignal commit_signal;
 
        /* Undo/Redo state */
-       guint sensitive: 1; /* If we save actions to undo stack */
+       bool sensitive: true; /* If we save actions to undo stack */
        Inkscape::XML::Event * partial; /* partial undo log when interrupted */
        int history_size;
        GSList * undo; /* Undo stack of reprs */
@@ -67,6 +73,8 @@ struct SPDocumentPrivate {
 
        // XXX only for testing!
        Inkscape::ConsoleOutputUndoObserver console_output_undo_observer;
+
+       bool seeking;
 };
 
-#endif
+#endif // SEEN_SP_DOCUMENT_PRIVATE_H