X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.h;fp=source%2Fdesigner%2Fmanipulator.h;h=cb4759ac7ad1a671e757b598cc67945199ccbba0;hb=f950f5a77714a155e57c868101911e181a617818;hp=b4216eefd52354f1d6c6aedacc2cf87290afa49a;hpb=2910db1364914c0ab98a0f80250cc39137821577;p=r2c2.git

diff --git a/source/designer/manipulator.h b/source/designer/manipulator.h
index b4216ee..cb4759a 100644
--- a/source/designer/manipulator.h
+++ b/source/designer/manipulator.h
@@ -18,13 +18,13 @@ private:
 		EXTEND
 	};
 
-	struct MTrack
+	struct MObject
 	{
-		R2C2::Track *track;
+		R2C2::Object *object;
 		R2C2::Vector pos;
 		float rot;
 
-		MTrack(R2C2::Track *);
+		MObject(R2C2::Object *);
 	};
 
 	struct TrackOrder
@@ -43,7 +43,7 @@ private:
 	Designer &designer;
 	Msp::Input::Mouse &mouse;
 	Selection &selection;
-	std::vector<MTrack> tracks;
+	std::vector<MObject> objects;
 	R2C2::Vector center;
 
 	R2C2::Vector pointer;
@@ -72,7 +72,7 @@ private:
 	void button_press(unsigned);
 	void axis_motion(unsigned, float, float);
 	void selection_changed();
-	void update_tracks();
+	void update_objects();
 	void update_neighbors();
 	void set_slope(TrackOrder &, float, float);
 	std::vector<R2C2::Track *> create_straight(const R2C2::Vector &, float, float, float);