diff --git a/src/vanishing-point.h b/src/vanishing-point.h
index 47c11be186df74643e348ef43ac47ecb8152e3ea..9fcb6bb46d6440a0e35bf8b67311add2df68d78f 100644 (file)
--- a/src/vanishing-point.h
+++ b/src/vanishing-point.h
#define SEEN_VANISHING_POINT_H
#include <set>
-#include "libnr/nr-point.h"
+#include <2geom/point.h>
#include "knot.h"
#include "selection.h"
#include "axis-manip.h"
#include "box3d.h"
#include "persp3d-reference.h"
-#include "line-geometry.h" // TODO: Remove this include as soon as we don't need create_canvas_(point|line) any more.
-
class SPBox3D;
namespace Box3D {
g_return_val_if_fail (_persp, false);
return persp3d_get_VP (_persp, _axis).is_finite();
}
- inline NR::Point get_pos() const {
- g_return_val_if_fail (_persp, NR::Point (NR_HUGE, NR_HUGE));
+ inline Geom::Point get_pos() const {
+ g_return_val_if_fail (_persp, Geom::Point (NR_HUGE, NR_HUGE));
return persp3d_get_VP (_persp,_axis).affine();
}
inline Persp3D * get_perspective() const {
g_return_if_fail (_persp);
persp3d_get_VP (_persp, _axis).print("");
}
- inline gchar *axisString () { return Proj::string_from_axis (_axis); }
+ inline gchar const *axisString () { return Proj::string_from_axis(_axis); }
unsigned int my_counter;
static unsigned int global_counter; // FIXME: Only to implement operator< so that we can merge lists. Do this in a better way!!
@@ -124,16 +122,16 @@ struct less_ptr : public std::binary_function<VanishingPoint *, VanishingPoint *
struct VPDragger {
public:
- VPDragger(VPDrag *parent, NR::Point p, VanishingPoint &vp);
+ VPDragger(VPDrag *parent, Geom::Point p, VanishingPoint &vp);
~VPDragger();
VPDrag *parent;
SPKnot *knot;
// position of the knot, desktop coords
- NR::Point point;
+ Geom::Point point;
// position of the knot before it began to drag; updated when released
- NR::Point point_original;
+ Geom::Point point_original;
bool dragging_started;
void mergePerspectives(); // remove duplicate perspectives
void updateBoxDisplays();
- void updateVPs(NR::Point const &pt);
+ void updateVPs(Geom::Point const &pt);
void updateZOrders();
void printVPs();
private:
//void deselect_all();
- void addLine (NR::Point p1, NR::Point p2, guint32 rgba);
+ void addLine (Geom::Point p1, Geom::Point p2, guint32 rgba);
Inkscape::Selection *selection;
sigc::connection sel_changed_connection;