Major code refactoring:

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

diff --git a/source/designer/manipulator.h b/source/designer/manipulator.h
index 3a8882e8f97f686405651774aa478c7b1289a237..9e17384e4ee39b90c178d8e55c402e81bc9ec601 100644 (file)
--- a/source/designer/manipulator.h
+++ b/source/designer/manipulator.h
@@ -42,7 +42,6 @@ private:
 
                MTrack(Marklin::Track *);
        };
-       typedef std::list<MTrack> MTrackSeq;
 
        struct TrackOrder
        {
@@ -51,7 +50,6 @@ private:
 
                TrackOrder(Marklin::Track *t, bool r): track(t), rev(r) { }
        };
-       typedef std::list<TrackOrder> TrackOrderSeq;
 
        struct TrackWrap
        {
@@ -63,7 +61,7 @@ private:
 
        Designer   &designer;
        Selection  *selection;
-       MTrackSeq  tracks;
+       std::vector<MTrack> tracks;
        Marklin::Point center;
 
        std::list<TrackWrap> wrap;
@@ -77,7 +75,7 @@ private:
        float          angle;
        float          rot_origin;
        int            elev_origin;
-       Marklin::TrackSeq neighbors;
+       std::set<Marklin::Track *> neighbors;
        sigc::connection selection_changed_conn;
 
        void selection_changed();