Merge SPCanvasArena caching layer work

(bzr r10451)

10 files changed, 13 insertions, 11 deletions

diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
index edd7c9431..cd1d65ba7 100644
--- a/src/ui/cache/svg_preview_cache.cpp
+++ b/src/ui/cache/svg_preview_cache.cpp
@@ -21,6 +21,7 @@
 
 #include <glib/gmem.h>
 #include <gtk/gtk.h>
+#include <2geom/transforms.h>
 #include "sp-namedview.h"
 #include "selection.h"
 #include "inkscape.h"
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index a2169c0b3..f7cb06263 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -20,8 +20,8 @@
 # include <config.h>
 #endif
 
+#include <2geom/transforms.h>
 #include "ui/widget/spinbutton.h"
-
 #include "desktop-handles.h"
 #include "unclump.h"
 #include "document.h"
@@ -357,7 +357,7 @@ private :
                   it < sorted.end();
                   it ++ )
             {
-                if (!NR_DF_TEST_CLOSE (pos, it->bbox.min()[_orientation], 1e-6)) {
+                if (!Geom::are_near(pos, it->bbox.min()[_orientation], 1e-6)) {
                     Geom::Point t(0.0, 0.0);
                     t[_orientation] = pos - it->bbox.min()[_orientation];
                     sp_item_move_rel(it->item, Geom::Translate(t));
@@ -380,7 +380,7 @@ private :
                 //new anchor position
                 float pos = sorted.front().anchor + i * step;
                 //Don't move if we are really close
-                if (!NR_DF_TEST_CLOSE (pos, it.anchor, 1e-6)) {
+                if (!Geom::are_near(pos, it.anchor, 1e-6)) {
                     //Compute translation
                     Geom::Point t(0.0, 0.0);
                     t[_orientation] = pos - it.anchor;
diff --git a/src/ui/dialog/align-and-distribute.h b/src/ui/dialog/align-and-distribute.h
index 7c99d67c7..99b96463c 100644
--- a/src/ui/dialog/align-and-distribute.h
+++ b/src/ui/dialog/align-and-distribute.h
@@ -25,7 +25,6 @@
 #include <gtkmm/table.h>
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/label.h>
-#include "libnr/nr-dim2.h"
 #include "libnr/nr-rect.h"
 
 
diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
index ae17214bf..7c7413ce5 100644
--- a/src/ui/dialog/tile.cpp
+++ b/src/ui/dialog/tile.cpp
@@ -21,6 +21,7 @@
 #include <gtk/gtk.h> //for GTK_RESPONSE* types
 #include <glibmm/i18n.h>
 #include <gtkmm/stock.h>
+#include <2geom/transforms.h>
 
 #include "verbs.h"
 #include "preferences.h"
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 901d02240..92c8bd349 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -16,6 +16,7 @@
 
 #include <gtkmm/stock.h>
 #include <gtkmm/dialog.h>
+#include <2geom/transforms.h>
 
 #include "document.h"
 #include "desktop-handles.h"
diff --git a/src/ui/view/edit-widget-interface.h b/src/ui/view/edit-widget-interface.h
index 4ff4f92f9..577beb5ce 100644
--- a/src/ui/view/edit-widget-interface.h
+++ b/src/ui/view/edit-widget-interface.h
@@ -16,9 +16,9 @@
 #ifndef INKSCAPE_UI_VIEW_EDIT_WIDGET_IFACE_H
 #define INKSCAPE_UI_VIEW_EDIT_WIDGET_IFACE_H
 
-#include "libnr/nr-point.h"
 #include "message.h"
 #include <gtkmm/window.h>
+#include <2geom/point.h>
 
 namespace Inkscape { namespace UI { namespace Widget { class Dock; } } }
 
diff --git a/src/ui/view/view.cpp b/src/ui/view/view.cpp
index f05e024d1..dc6307ab0 100644
--- a/src/ui/view/view.cpp
+++ b/src/ui/view/view.cpp
@@ -16,7 +16,7 @@
 # include "config.h"
 #endif
 
-#include "libnr/nr-point.h"
+#include <2geom/point.h>
 #include "document.h"
 #include "view.h"
 #include "message-stack.h"
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 5d71a4b38..f7759f103 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -24,6 +24,7 @@
 #include <string>
 #include <string.h>
 #include <vector>
+#include <2geom/transforms.h>
 
 #include "desktop-handles.h"
 #include "document.h"
diff --git a/src/ui/widget/rotateable.cpp b/src/ui/widget/rotateable.cpp
index 396280aee..23d5363ef 100644
--- a/src/ui/widget/rotateable.cpp
+++ b/src/ui/widget/rotateable.cpp
@@ -9,13 +9,12 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#include "event-context.h"
-#include "rotateable.h"
-#include "libnr/nr-point.h"
-#include "libnr/nr-point-fns.h"
 #include <gtkmm/box.h>
 #include <gtkmm/eventbox.h>
 #include <glibmm/i18n.h>
+#include <2geom/point.h>
+#include "event-context.h"
+#include "rotateable.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/ruler.h b/src/ui/widget/ruler.h
index c315418d8..afe3a4ba7 100644
--- a/src/ui/widget/ruler.h
+++ b/src/ui/widget/ruler.h
@@ -13,7 +13,7 @@
  */
 
 #include <gtkmm/eventbox.h>
-#include "libnr/nr-point.h"
+#include <2geom/point.h>
 
 struct SPCanvasItem;
 struct SPDesktop;