Translations. po files update; fix Ahmaric header.

[inkscape.git] / src / proj_pt.h

diff --git a/src/proj_pt.h b/src/proj_pt.h
index 30f375aa52d745d90893a2c9c8fdf1464c58d1fc..90f4af6529638bd35801eeca3f310b3a7fefc899 100644 (file)
--- a/src/proj_pt.h
+++ b/src/proj_pt.h
@@ -12,7 +12,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "libnr/nr-point.h"
+#include <2geom/point.h>
 #include "libnr/nr-values.h"
 #include <gtk/gtk.h>
 
@@ -25,7 +25,7 @@ class Pt2 {
 public:
     Pt2 () { pt[0] = 0; pt[1] = 0; pt[2] = 1.0; } // we default to (0 : 0 : 1)
     Pt2 (double x, double y, double w) { pt[0] = x; pt[1] = y; pt[2] = w; }
-    Pt2 (NR::Point const &point) { pt[0] = point[NR::X]; pt[1] = point[NR::Y]; pt[2] = 1; }
+    Pt2 (Geom::Point const &point) { pt[0] = point[Geom::X]; pt[1] = point[Geom::Y]; pt[2] = 1; }
     Pt2 (const gchar *coord_str);
 
     inline double operator[] (unsigned int index) const {
@@ -80,10 +80,10 @@ public:
     }
 
     void normalize();
-    NR::Point affine();
+    Geom::Point affine();
     inline bool is_finite() { return pt[2] != 0; } // FIXME: Should we allow for some tolerance?
     gchar *coord_string();
-    inline void print(gchar *s) const { g_print ("%s(%8.2f : %8.2f : %8.2f)\n", s, pt[0], pt[1], pt[2]); }
+    inline void print(gchar const *s) const { g_print ("%s(%8.2f : %8.2f : %8.2f)\n", s, pt[0], pt[1], pt[2]); }
 
 private:
     double pt[3];
@@ -148,7 +148,7 @@ public:
     void normalize();
     inline bool is_finite() { return pt[3] != 0; } // FIXME: Should we allow for some tolerance?
     gchar *coord_string();
-    inline void print(gchar *s) const {
+    inline void print(gchar const *s) const {
         g_print ("%s(%8.2f : %8.2f : %8.2f : %8.2f)\n", s, pt[0], pt[1], pt[2], pt[3]);
     }
 
@@ -169,4 +169,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 :