Merge from fe-moved

(bzr r6891)

1 files changed, 9 insertions, 12 deletions

diff --git a/src/dialogs/tiledialog.cpp b/src/ui/dialog/tile.cpp
index f597c601b..7f45901c3 100644
--- a/src/dialogs/tiledialog.cpp
+++ b/src/ui/dialog/tile.cpp
@@ -17,7 +17,6 @@
 # include <config.h>
 #endif
 
-
 #include <gtk/gtkdialog.h> //for GTK_RESPONSE* types
 #include <gtk/gtksizegroup.h>
 #include <glibmm/i18n.h>
@@ -31,9 +30,7 @@
 #include "document.h"
 #include "sp-item.h"
 #include "widgets/icon.h"
-#include "tiledialog.h"
-
-
+#include "tile.h"
 
 /*
  *    Sort items by their x co-ordinates, taking account of y (keeps rows intact)
@@ -48,8 +45,8 @@ sp_compare_x_position(SPItem *first, SPItem *second)
     using Geom::X;
     using Geom::Y;
 
-    boost::optional<Geom::Rect> a = first->getBounds(sp_item_i2doc_affine(first));
-    boost::optional<Geom::Rect> b = second->getBounds(sp_item_i2doc_affine(second));
+    Geom::OptRect a = first->getBounds(sp_item_i2doc_affine(first));
+    Geom::OptRect b = second->getBounds(sp_item_i2doc_affine(second));
 
     if ( !a || !b ) {
         // FIXME?
@@ -88,8 +85,8 @@ sp_compare_x_position(SPItem *first, SPItem *second)
 int
 sp_compare_y_position(SPItem *first, SPItem *second)
 {
-    boost::optional<Geom::Rect> a = first->getBounds(sp_item_i2doc_affine(first));
-    boost::optional<Geom::Rect> b = second->getBounds(sp_item_i2doc_affine(second));
+    Geom::OptRect a = first->getBounds(sp_item_i2doc_affine(first));
+    Geom::OptRect b = second->getBounds(sp_item_i2doc_affine(second));
 
     if ( !a || !b ) {
         // FIXME?
@@ -168,7 +165,7 @@ void TileDialog::Grid_Arrange ()
     cnt=0;
     for (; items != NULL; items = items->next) {
         SPItem *item = SP_ITEM(items->data);
-        boost::optional<Geom::Rect> b = item->getBounds(sp_item_i2doc_affine(item));
+        Geom::OptRect b = item->getBounds(sp_item_i2doc_affine(item));
         if (!b) {
             continue;
         }
@@ -210,7 +207,7 @@ void TileDialog::Grid_Arrange ()
         const GSList *sizes = sorted;
         for (; sizes != NULL; sizes = sizes->next) {
             SPItem *item = SP_ITEM(sizes->data);
-            boost::optional<Geom::Rect> b = item->getBounds(sp_item_i2doc_affine(item));
+            Geom::OptRect b = item->getBounds(sp_item_i2doc_affine(item));
             if (b) {
                 width = b->dimensions()[Geom::X];
                 height = b->dimensions()[Geom::Y];
@@ -267,7 +264,7 @@ void TileDialog::Grid_Arrange ()
     }
 
 
-    boost::optional<Geom::Rect> sel_bbox = selection->bounds();
+    Geom::OptRect sel_bbox = selection->bounds();
     // Fit to bbox, calculate padding between rows accordingly.
     if ( sel_bbox && !SpaceManualRadioButton.get_active() ){
 #ifdef DEBUG_GRID_ARRANGE
@@ -317,7 +314,7 @@ g_print("\n row = %f     col = %f selection x= %f selection y = %f", total_row_h
              for (; current_row != NULL; current_row = current_row->next) {
                  SPItem *item=SP_ITEM(current_row->data);
                  Inkscape::XML::Node *repr = SP_OBJECT_REPR(item);
-                 boost::optional<Geom::Rect> b = item->getBounds(sp_item_i2doc_affine(item));
+                 Geom::OptRect b = item->getBounds(sp_item_i2doc_affine(item));
                  Geom::Point min;
                  if (b) {
                      width = b->dimensions()[Geom::X];