Make Designer::get_layout and get_layout_3d return references

[r2c2.git] / source / designer / manipulator.cpp

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index 7abe3d750650448b31989e09f082d8919888da3c..9af1e60a0aa94f7f506b3fa77357a7a8af6cbb3e 100644 (file)
--- 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);
@@ -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)
                {