diff options
author | Robin Gareus <robin@gareus.org> | 2015-07-23 13:23:47 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2015-07-23 17:58:40 +0200 |
commit | e1f168de110322e7024dfa334b97f3b433907ae1 (patch) | |
tree | bd700545929b7aa5ec95c69b88a5a4e983845547 /gtk2_ardour/editor_drag.h | |
parent | 2cc64168d379790eb3d162cd59b7f1a8effb4156 (diff) |
rename Marker class
Classes are in the global namespace.
OSX has a flat namespace and OSX32bit/Carbon has a Marker too.
Diffstat (limited to 'gtk2_ardour/editor_drag.h')
-rw-r--r-- | gtk2_ardour/editor_drag.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index e5acbaad44..b9310c79fb 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -61,7 +61,7 @@ class RouteTimeAxisView; class RegionSelection; class MidiRegionView; class MeterMarker; -class Marker; +class ArdourMarker; class TempoMarker; class ControlPoint; class AudioRegionView; @@ -821,13 +821,13 @@ public: private: void update_item (ARDOUR::Location *); - Marker* _marker; ///< marker being dragged + ArdourMarker* _marker; ///< marker being dragged struct CopiedLocationMarkerInfo { ARDOUR::Location* location; - std::vector<Marker*> markers; + std::vector<ArdourMarker*> markers; bool move_both; - CopiedLocationMarkerInfo (ARDOUR::Location* l, Marker* m); + CopiedLocationMarkerInfo (ARDOUR::Location* l, ArdourMarker* m); }; typedef std::list<CopiedLocationMarkerInfo> CopiedLocationInfo; |