summaryrefslogtreecommitdiffstats
path: root/src/nodepath.h
diff options
context:
space:
mode:
authorMaximilian Albert <maximilian.albert@gmail.com>2008-09-18 17:48:42 +0000
committercilix42 <cilix42@users.sourceforge.net>2008-09-18 17:48:42 +0000
commit07a2c5b0db916ac9e5dee3bcbafcb12d8e767fa8 (patch)
tree3a4c8c7f4f8de2878adbe5eabaf75460d35b8bcb /src/nodepath.h
parentNR ==> Geom conversion in sp-canvas (diff)
downloadinkscape-07a2c5b0db916ac9e5dee3bcbafcb12d8e767fa8.tar.gz
inkscape-07a2c5b0db916ac9e5dee3bcbafcb12d8e767fa8.zip
Next roud of NR ==> Geom conversion
(bzr r6839)
Diffstat (limited to 'src/nodepath.h')
-rw-r--r--src/nodepath.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/nodepath.h b/src/nodepath.h
index 551bf7df1..907d47be4 100644
--- a/src/nodepath.h
+++ b/src/nodepath.h
@@ -19,6 +19,9 @@
#include <glibmm/ustring.h>
#include <gdk/gdkevents.h>
#include <list>
+#include <2geom/forward.h>
+#include <boost/optional.hpp>
+
struct SPCanvasItem;
class SPCurve;
@@ -61,9 +64,9 @@ class Radial{
*/
Radial(Geom::Point const &p)
{
- r = NR::L2(p);
+ r = Geom::L2(p);
if (r > 0) {
- a = NR::atan2 (p);
+ a = Geom::atan2 (p);
} else {
a = HUGE_VAL; //undefined
}
@@ -283,7 +286,7 @@ void sp_nodepath_select_all (Inkscape::NodePath::Path *nodepath, bool invert);
void sp_nodepath_select_all_from_subpath(Inkscape::NodePath::Path *nodepath, bool invert);
void sp_nodepath_select_next (Inkscape::NodePath::Path *nodepath);
void sp_nodepath_select_prev (Inkscape::NodePath::Path *nodepath);
-void sp_nodepath_select_rect (Inkscape::NodePath::Path * nodepath, NR::Rect const &b, gboolean incremental);
+void sp_nodepath_select_rect (Inkscape::NodePath::Path * nodepath, Geom::Rect const &b, gboolean incremental);
GList *save_nodepath_selection (Inkscape::NodePath::Path *nodepath);
void restore_nodepath_selection (Inkscape::NodePath::Path *nodepath, GList *r);
gboolean nodepath_repr_d_changed (Inkscape::NodePath::Path * np, const char *newd);