From 1e3ef71825fa122062b626937848539cbb62f0ca Mon Sep 17 00:00:00 2001 From: "Joshua L. Blocher" Date: Sun, 28 Dec 2008 22:44:35 +0000 Subject: More NR ==> Geom changes (bzr r7032) --- src/interface.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/interface.cpp') diff --git a/src/interface.cpp b/src/interface.cpp index fbdb8a5f6..2242e6224 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -1146,9 +1146,9 @@ sp_ui_drag_data_received(GtkWidget *widget, int destX = 0; int destY = 0; gtk_widget_translate_coordinates( widget, &(desktop->canvas->widget), x, y, &destX, &destY ); - NR::Point where( sp_canvas_window_to_world( desktop->canvas, NR::Point( destX, destY ) ) ); - NR::Point const button_dt(desktop->w2d(where)); - NR::Point const button_doc(desktop->dt2doc(button_dt)); + Geom::Point where( sp_canvas_window_to_world( desktop->canvas, Geom::Point( destX, destY ) ) ); + Geom::Point const button_dt(desktop->w2d(where)); + Geom::Point const button_doc(desktop->dt2doc(button_dt)); if ( data->length == 8 ) { gchar c[64] = {0}; @@ -1190,8 +1190,8 @@ sp_ui_drag_data_received(GtkWidget *widget, boost::optional position = get_nearest_position_on_Path(livarot_path, button_doc); if (position) { - NR::Point nearest = get_point_on_Path(livarot_path, position->piece, position->t); - NR::Point delta = nearest - button_doc; + Geom::Point nearest = get_point_on_Path(livarot_path, position->piece, position->t); + Geom::Point delta = nearest - button_doc; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); delta = desktop->d2w(delta); double stroke_tolerance = @@ -1202,7 +1202,7 @@ sp_ui_drag_data_received(GtkWidget *widget, : 0.0) + prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); - if (NR::L2 (delta) < stroke_tolerance) { + if (Geom::L2 (delta) < stroke_tolerance) { fillnotstroke = false; } } -- cgit v1.2.3