X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Frubberband.h;h=6c857fb63aa701c31294b2c36c90e7246102e307;hb=6302669b796eadd6994ecdc2e70f0119b29194dd;hp=7734a65fa98d2c309d620189f57269f79437ca6c;hpb=8b9a820756fdf348239872236be2257f854e094a;p=inkscape.git

diff --git a/src/rubberband.h b/src/rubberband.h
index 7734a65fa..6c857fb63 100644
--- a/src/rubberband.h
+++ b/src/rubberband.h
@@ -1,5 +1,5 @@
-#ifndef __RUBBERBAND_H__
-#define __RUBBERBAND_H__
+#ifndef SEEN_RUBBERBAND_H
+#define SEEN_RUBBERBAND_H
 
 /**
  * \file src/rubberband.h
@@ -15,10 +15,10 @@
  */
 
 #include "forward.h"
-#include "libnr/nr-forward.h"
-#include "libnr/nr-point.h"
 #include <boost/optional.hpp>
 #include <vector>
+#include <2geom/point.h>
+#include <2geom/rect.h>
 
 /* fixme: do multidocument safe */
 
@@ -38,29 +38,29 @@ class Rubberband
 {
 public:
 
-    void start(SPDesktop *desktop, NR::Point const &p);
-    void move(NR::Point const &p);
-    boost::optional<NR::Rect> getRectangle() const;
+    void start(SPDesktop *desktop, Geom::Point const &p);
+    void move(Geom::Point const &p);
+    Geom::OptRect getRectangle() const;
     void stop();
     bool is_started();
 
     inline int getMode() {return _mode;}
-    inline std::vector<NR::Point> getPoints() {return _points;}
+    inline std::vector<Geom::Point> getPoints() {return _points;}
 
     void setMode(int mode);
 
-    static Rubberband* get();
+    static Rubberband* get(SPDesktop *desktop);
 
 private:
 
-    Rubberband();
+    Rubberband(SPDesktop *desktop);
     static Rubberband* _instance;
     
     SPDesktop *_desktop;
-    NR::Point _start;
-    NR::Point _end;
+    Geom::Point _start;
+    Geom::Point _end;
 
-    std::vector<NR::Point> _points;
+    std::vector<Geom::Point> _points;
 
     CtrlRect *_rect;
     SPCanvasItem *_touchpath;
@@ -74,7 +74,7 @@ private:
 
 }
 
-#endif
+#endif // SEEN_RUBBERBAND_H
 
 /*
   Local Variables:
@@ -85,4 +85,4 @@ private:
   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 :