From e1f168de110322e7024dfa334b97f3b433907ae1 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Thu, 23 Jul 2015 13:23:47 +0200
Subject: rename Marker class

Classes are in the global namespace.
OSX has a flat namespace and OSX32bit/Carbon has a Marker too.
---
 gtk2_ardour/editor_drag.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gtk2_ardour/editor_drag.h')

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;
-- 
cgit v1.2.3