From 3f48b1e71962fead537279409f4a70b0be41cc3e Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 24 Aug 2017 22:31:42 -0400
Subject: [PATCH] fix up 2 canvas items with APIs that conflict with
 Item::clear (temporarily named Item::clear_children()

---
 libs/canvas/canvas/line_set.h | 4 ++--
 libs/canvas/canvas/meter.h    | 2 +-
 libs/canvas/line_set.cc       | 4 ++--
 libs/canvas/meter.cc          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/canvas/canvas/line_set.h b/libs/canvas/canvas/line_set.h
index ccce24aa89..ee47bc19cd 100644
--- a/libs/canvas/canvas/line_set.h
+++ b/libs/canvas/canvas/line_set.h
@@ -46,8 +46,8 @@ public:
 	void set_extent (Distance);
 	Distance extent() const { return _extent; }
 
-	void add (Coord, Distance, Gtkmm2ext::Color);
-	void clear ();
+	void add_line (Coord, Distance, Gtkmm2ext::Color);
+	void clear_lines ();
 
 	struct Line {
 		Line (Coord p, Distance width_, Gtkmm2ext::Color color_) : pos (p), width (width_), color (color_) {}
diff --git a/libs/canvas/canvas/meter.h b/libs/canvas/canvas/meter.h
index 3a1a46cab2..7a409f24dd 100644
--- a/libs/canvas/canvas/meter.h
+++ b/libs/canvas/canvas/meter.h
@@ -75,7 +75,7 @@ class Meter : public Item {
 	static void flush_pattern_cache();
 
 	void set (float level, float peak = -1);
-	void clear ();
+	void clear_display ();
 
 	float get_level() { return current_level; }
 	float get_user_level() { return current_user_level; }
diff --git a/libs/canvas/line_set.cc b/libs/canvas/line_set.cc
index d58cb900b6..bbcfdf9ee5 100644
--- a/libs/canvas/line_set.cc
+++ b/libs/canvas/line_set.cc
@@ -130,7 +130,7 @@ LineSet::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
 }
 
 void
-LineSet::add (Coord y, Distance width, Gtkmm2ext::Color color)
+LineSet::add_line (Coord y, Distance width, Gtkmm2ext::Color color)
 {
 	begin_change ();
 
@@ -142,7 +142,7 @@ LineSet::add (Coord y, Distance width, Gtkmm2ext::Color color)
 }
 
 void
-LineSet::clear ()
+LineSet::clear_lines ()
 {
 	begin_change ();
 	_lines.clear ();
diff --git a/libs/canvas/meter.cc b/libs/canvas/meter.cc
index b539a1b4ae..13caaf9f0c 100644
--- a/libs/canvas/meter.cc
+++ b/libs/canvas/meter.cc
@@ -930,7 +930,7 @@ Meter::set_highlight (bool onoff)
 }
 
 void
-Meter::clear ()
+Meter::clear_display ()
 {
 	current_level = 0;
 	current_peak = 0;