Split SPCanvasItem and SPCanvasGroup to individual .h files. Removed forward header.

[inkscape.git] / src / rubberband.cpp

diff --git a/src/rubberband.cpp b/src/rubberband.cpp
index 7c43da9ea28dfa1114576b5679264a4d5acbc533..398f01d3e38e971acf40339432b8796c9326268f 100644 (file)
--- a/src/rubberband.cpp
+++ b/src/rubberband.cpp
@@ -1,5 +1,3 @@
-#define __RUBBERBAND_C__
-
 /**
  * \file src/rubberband.cpp
  * \brief Rubberbanding selector
@@ -16,6 +14,8 @@
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "rubberband.h"
+#include "display/sp-canvas.h"
+#include "display/sp-canvas-item.h"
 #include "display/canvas-bpath.h"
 #include "display/curve.h"
 
@@ -124,10 +124,10 @@ void Inkscape::Rubberband::setMode(int mode)
     _mode = mode;
 }
 
-boost::optional<Geom::Rect> Inkscape::Rubberband::getRectangle() const
+Geom::OptRect Inkscape::Rubberband::getRectangle() const
 {
     if (!_started) {
-        return boost::optional<Geom::Rect>();
+        return Geom::OptRect();
     }
 
     return Geom::Rect(_start, _end);
@@ -156,4 +156,4 @@ bool Inkscape::Rubberband::is_started()
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :