X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fslopetool.h;h=d319bb7715c90bc0aad77a29dd3e5a99bfd7dd09;hb=b78b49d85fbb9b2901c77e6450cfd41c0a818ac1;hp=b3b5e2b461e22d38e9a0689bd54c749d9e03e9b6;hpb=678982e7ddb22bb5fd44ce448d1c5cbf646b2573;p=r2c2.git

diff --git a/source/designer/slopetool.h b/source/designer/slopetool.h
index b3b5e2b..d319bb7 100644
--- a/source/designer/slopetool.h
+++ b/source/designer/slopetool.h
@@ -1,31 +1,23 @@
 #ifndef SLOPETOOL_H_
 #define SLOPETOOL_H_
 
+#include "libr2c2/object.h"
+#include "libr2c2/trackiter.h"
 #include "tool.h"
-#include "libr2c2/track.h"
 
 class SlopeTool: public Tool
 {
 private:
-	struct TrackOrder
-	{
-		R2C2::Track *track;
-		bool rev;
-
-		TrackOrder(R2C2::Track *t, bool r): track(t), rev(r) { }
-	};
-
-	std::list<R2C2::Track *> neighbors;
-	std::list<TrackOrder> tracks;
+	std::list<R2C2::TrackIter> tracks;
 	float total_length;
 
 public:
-	SlopeTool(Designer &, Msp::Input::Mouse &, const std::set<R2C2::Object *> &);
+	SlopeTool(Designer &, Msp::Input::Keyboard &, Msp::Input::Mouse &, const std::set<R2C2::Object *> &);
 
 	void even_slope(bool =false);
 	void flatten();
 private:
-	void set_slope(TrackOrder &, float, const R2C2::Angle &);
+	void set_slope(const R2C2::TrackIter &, float, const R2C2::Angle &);
 };
 
 #endif