Rename the project to R²C²

[r2c2.git] / source / designer / measure.h

diff --git a/source/designer/measure.h b/source/designer/measure.h
index e4f230f6b90c201de7c0222d20d4f17b47751ac2..6800ecce307826fa0bcc46d204e0ec84b539b4b4 100644 (file)
--- a/source/designer/measure.h
+++ b/source/designer/measure.h
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -22,9 +22,14 @@ private:
                ACTIVE
        };
 
+public:
+       sigc::signal<void> signal_done;
+       sigc::signal<void> signal_changed;
+
+private:
        Designer &designer;
-       Marklin::Point pointer;
-       Marklin::Point spoint;
+       R2C2::Point pointer;
+       R2C2::Point spoint;
        float sdir;
        float par_dist;
        float perp_dist;
@@ -32,19 +37,16 @@ private:
        State state;
 
 public:
-       sigc::signal<void> signal_done;
-       sigc::signal<void> signal_changed;
-
        Measure(Designer &);
-       float get_parallel_distance() const      { return par_dist; }
+       float get_parallel_distance() const { return par_dist; }
        float get_perpendicular_distance() const { return perp_dist; }
-       float get_angle_difference() const       { return adiff; }
+       float get_angle_difference() const { return adiff; }
        void start();
        void button_press(int, int, float, float, unsigned);
        void pointer_motion(int, int, float, float);
        void render();
 private:
-       void snap_to_tracks(Marklin::Point &, float &);
+       void snap_to_tracks(R2C2::Point &, float &);
 };
 
 #endif