X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.cpp;h=850f79f8be25d857721757004b4ab2a3b8535ebf;hb=293bfd4d1a5dbd57c7d3c657e5f6467d9f2e3300;hp=7abe3d750650448b31989e09f082d8919888da3c;hpb=e392d397f6b86a49a05e9738357ccbfc2a922f01;p=r2c2.git

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index 7abe3d7..850f79f 100644
--- a/source/designer/manipulator.cpp
+++ b/source/designer/manipulator.cpp
@@ -64,7 +64,7 @@ void Manipulator::duplicate()
 	list<Track *> new_tracks;
 	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
-		Track *track = new Track(*designer.get_layout(), i->track->get_type());
+		Track *track = new Track(designer.get_layout(), i->track->get_type());
 		track->set_position(i->track->get_position());
 		track->set_rotation(i->track->get_rotation());
 		new_tracks.push_back(track);
@@ -227,7 +227,7 @@ void Manipulator::connect()
 	float dir1;
 	Track *track2 = tracks.back().track;
 	bool ok = false;
-	float gap;
+	float gap = 0;
 	for(unsigned i=0; i<track1->get_type().get_endpoints().size(); ++i)
 	{
 		if(track1->get_link(i))
@@ -348,7 +348,7 @@ void Manipulator::connect()
 		if(j==types_by_length.end())
 			throw LogicError("Internal error");
 
-		Track *track = new Track(*designer.get_layout(), *j->second);
+		Track *track = new Track(designer.get_layout(), *j->second);
 		track->set_position(pos1);
 		track->set_rotation(dir1);
 
@@ -375,7 +375,7 @@ void Manipulator::button_press(int, int, float, float, unsigned btn)
 			for(vector<MTrack>::iterator j=tracks.begin(); j!=tracks.end(); ++j)
 				j->track->break_link(**i);
 
-		const set<Track *> &ltracks = designer.get_layout()->get_tracks();
+		const set<Track *> &ltracks = designer.get_layout().get_tracks();
 		for(set<Track *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
 		{
 			bool ok = true;
@@ -409,7 +409,7 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy)
 			i->track->set_rotation(i->rot);
 		}
 
-		const set<Track *> &ltracks = designer.get_layout()->get_tracks();
+		const set<Track *> &ltracks = designer.get_layout().get_tracks();
 		MTrack *snapped = 0;
 		for(set<Track *>::const_iterator i=ltracks.begin(); (i!=ltracks.end() && !snapped); ++i)
 		{