fix conflicts caused by meterbridge merge

[ardour.git] / gtk2_ardour / hit.cc

diff --git a/gtk2_ardour/hit.cc b/gtk2_ardour/hit.cc
index a7d1a9b47b9212d381bcc4e31819538f3a4a8a32..257a3cd4f041ca94a9aaf91546ab7833bdd21b91 100644 (file)
--- a/gtk2_ardour/hit.cc
+++ b/gtk2_ardour/hit.cc
@@ -48,7 +48,7 @@ Hit::move_event (double dx, double dy)
 Coord
 Hit::x0 () const
 {
-       boost::optional<Rect> bbox = _polygon->bounding_box ();
+       boost::optional<ArdourCanvas::Rect> bbox = _polygon->bounding_box ();
        assert (bbox);
        return bbox.get().x0;
 }
@@ -56,7 +56,7 @@ Hit::x0 () const
 Coord
 Hit::x1 () const
 {
-       boost::optional<Rect> bbox = _polygon->bounding_box ();
+       boost::optional<ArdourCanvas::Rect> bbox = _polygon->bounding_box ();
        assert (bbox);
        return bbox.get().x1;
 }
@@ -64,7 +64,7 @@ Hit::x1 () const
 Coord
 Hit::y0 () const
 {
-       boost::optional<Rect> bbox = _polygon->bounding_box ();
+       boost::optional<ArdourCanvas::Rect> bbox = _polygon->bounding_box ();
        assert (bbox);
        return bbox.get().y0;
 }
@@ -72,7 +72,7 @@ Hit::y0 () const
 Coord
 Hit::y1 () const
 {
-       boost::optional<Rect> bbox = _polygon->bounding_box ();
+       boost::optional<ArdourCanvas::Rect> bbox = _polygon->bounding_box ();
        assert (bbox);
        return bbox.get().y1;
 }