- layout.signal_track_added.connect(sigc::mem_fun(this, &Layout3D::track_added));
- layout.signal_track_removed.connect(sigc::mem_fun(this, &Layout3D::track_removed));
- layout.signal_vehicle_added.connect(sigc::mem_fun(this, &Layout3D::vehicle_added));
- layout.signal_vehicle_removed.connect(sigc::mem_fun(this, &Layout3D::vehicle_removed));
- layout.signal_signal_added.connect(sigc::mem_fun(this, &Layout3D::signal_added));
- layout.signal_signal_removed.connect(sigc::mem_fun(this, &Layout3D::signal_removed));
-
- const set<Track *> <racks = layout.get_tracks();
- for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
- track_added(**i);
- const set<Signal *> &lsignals = layout.get_signals();
- for(set<Signal *>::iterator i=lsignals.begin(); i!=lsignals.end(); ++i)
- signal_added(**i);
+ layout.signal_object_added.connect(sigc::mem_fun(this, &Layout3D::object_added));
+ layout.signal_object_removed.connect(sigc::mem_fun(this, &Layout3D::object_removed));
+
+ const set<Object *> &lobjs = layout.get_all<Object>();
+ for(set<Object *>::iterator i=lobjs.begin(); i!=lobjs.end(); ++i)
+ object_added(**i);