diff --git a/src/document-private.h b/src/document-private.h
index 221cfa17c963f668c2be88af3c23336f413ae1ed..61e6bad67beff4b1f69070662badafd0b7949af0 100644 (file)
--- a/src/document-private.h
+++ b/src/document-private.h
-#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.
// 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 {
}
-struct DocumentPrivate {
- typedef std::map<GQuark, Document::IDChangedSignal> IDChangedSignalMap;
- typedef std::map<GQuark, Document::ResourcesChangedSignal> ResourcesChangedSignalMap;
+struct SPDocumentPrivate {
+ typedef std::map<GQuark, SPDocument::IDChangedSignal> IDChangedSignalMap;
+ typedef std::map<GQuark, SPDocument::ResourcesChangedSignal> ResourcesChangedSignalMap;
GHashTable *iddef; /**< Dictionary of id -> SPObject mappings */
GHashTable *reprdef; /**< Dictionary of Inkscape::XML::Node -> SPObject mappings */
GHashTable *resources;
ResourcesChangedSignalMap resources_changed_signals;
- Document::ModifiedSignal modified_signal;
- Document::URISetSignal uri_set_signal;
- Document::ResizedSignal resized_signal;
- Document::ReconstructionStart _reconstruction_start_signal;
- Document::ReconstructionFinish _reconstruction_finish_signal;
- Document::CommitSignal commit_signal;
+ SPDocument::ModifiedSignal modified_signal;
+ SPDocument::URISetSignal uri_set_signal;
+ SPDocument::ResizedSignal resized_signal;
+ SPDocument::ReconstructionStart _reconstruction_start_signal;
+ SPDocument::ReconstructionFinish _reconstruction_finish_signal;
+ SPDocument::CommitSignal commit_signal;
/* Undo/Redo state */
bool sensitive: true; /* If we save actions to undo stack */
bool seeking;
};
-#endif
+#endif // SEEN_SP_DOCUMENT_PRIVATE_H