Warning cleanup.

[inkscape.git] / src / document.h

diff --git a/src/document.h b/src/document.h
index b0d6afecb1be9b8dafce41b7afe1c778ac4af2be..3ede5a3d0bdc7b4946162b7799595582ca3bec74 100644 (file)
--- a/src/document.h
+++ b/src/document.h
@@ -21,7 +21,7 @@
 #include <sigc++/class_slot.h>
 
 #include "libcroco/cr-cascade.h"
-#include "libnr/nr-forward.h"
+#include <2geom/forward.h>
 
 #include "gc-managed.h"
 #include "gc-finalized.h"
@@ -108,6 +108,10 @@ struct SPDocument : public Inkscape::GC::Managed<>,
 
     Persp3D *current_persp3d; // "currently active" perspective (e.g., newly created boxes are attached to this one)
 
+    GSList *_collection_queue;
+
+    bool oldSignalsConnected;
+
     void add_persp3d (Persp3D * const persp);
     void remove_persp3d (Persp3D * const persp);
 
@@ -130,8 +134,6 @@ sigc::connection connectCommit(CommitSignal::slot_type slot);
 
     void _emitModified();
 
-    GSList *_collection_queue;
-
     void addUndoObserver(Inkscape::UndoStackObserver& observer);
     void removeUndoObserver(Inkscape::UndoStackObserver& observer);
 
@@ -141,7 +143,7 @@ sigc::connection connectCommit(CommitSignal::slot_type slot);
     bool isSeeking() const;
 
     bool isModifiedSinceSave() const { return modified_since_save; }
-    void setModifiedSinceSave(bool modified=true) {
+    void setModifiedSinceSave(bool modified = true) {
         modified_since_save = modified;
     }
 
@@ -160,7 +162,7 @@ public:
     sigc::connection _selection_changed_connection;
     sigc::connection _desktop_activated_connection;
 
-    void fitToRect(NR::Rect const &rect);
+    void fitToRect(Geom::Rect const &rect);
 };
 
 SPDocument *sp_document_new (const gchar *uri, unsigned int keepalive, bool make_new = false);
@@ -183,6 +185,7 @@ SPDocument *sp_document_create(Inkscape::XML::Document *rdoc, gchar const *uri,
 
 gdouble sp_document_width (SPDocument * document);
 gdouble sp_document_height (SPDocument * document);
+Geom::Point sp_document_dimensions (SPDocument * document);
 
 struct SPUnit;
 
@@ -254,12 +257,12 @@ sigc::connection sp_document_resources_changed_connect(SPDocument *document, con
  * Misc
  */
 
-GSList * sp_document_items_in_box(SPDocument *document, unsigned int dkey, NR::Rect const &box);
-GSList * sp_document_partial_items_in_box(SPDocument *document, unsigned int dkey, NR::Rect const &box);
-SPItem* sp_document_item_from_list_at_point_bottom (unsigned int dkey, SPGroup *group, const GSList *list, NR::Point const p, bool take_insensitive = false);
-SPItem * sp_document_item_at_point (SPDocument *document, unsigned int key, NR::Point const p, gboolean into_groups, SPItem *upto = NULL);
-GSList *sp_document_items_at_points(SPDocument *document, unsigned const key, std::vector<NR::Point> points);
-SPItem *sp_document_group_at_point (SPDocument *document, unsigned int key,  NR::Point const p);
+GSList * sp_document_items_in_box(SPDocument *document, unsigned int dkey, Geom::Rect const &box);
+GSList * sp_document_partial_items_in_box(SPDocument *document, unsigned int dkey, Geom::Rect const &box);
+SPItem* sp_document_item_from_list_at_point_bottom (unsigned int dkey, SPGroup *group, const GSList *list, Geom::Point const p, bool take_insensitive = false);
+SPItem * sp_document_item_at_point (SPDocument *document, unsigned int key, Geom::Point const p, gboolean into_groups, SPItem *upto = NULL);
+GSList *sp_document_items_at_points(SPDocument *document, unsigned const key, std::vector<Geom::Point> points);
+SPItem *sp_document_group_at_point (SPDocument *document, unsigned int key,  Geom::Point const p);
 
 void sp_document_set_uri (SPDocument *document, const gchar *uri);
 void sp_document_resized_signal_emit (SPDocument *doc, gdouble width, gdouble height);