From 6e2c3c855dff36f6e946e2a54d576bea699f4a61 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Sat, 13 Dec 2014 15:35:47 +0000
Subject: [PATCH] RowItemOwner: Renamed appearance_changed to
 row_item_appearance_changed

---
 pv/view/decodetrace.cpp  | 4 ++--
 pv/view/logicsignal.cpp  | 2 +-
 pv/view/rowitem.cpp      | 2 +-
 pv/view/rowitemowner.hpp | 2 +-
 pv/view/trace.cpp        | 2 +-
 pv/view/tracegroup.cpp   | 4 ++--
 pv/view/tracegroup.hpp   | 2 +-
 pv/view/view.cpp         | 2 +-
 pv/view/view.hpp         | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 669a1d95..745cf29b 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -774,7 +774,7 @@ void DecodeTrace::commit_channels()
 void DecodeTrace::on_new_decode_data()
 {
 	if (owner_)
-		owner_->appearance_changed(false, true);
+		owner_->row_item_appearance_changed(false, true);
 }
 
 void DecodeTrace::delete_pressed()
@@ -834,7 +834,7 @@ void DecodeTrace::on_show_hide_decoder(int index)
 	decoder_forms_[index]->set_decoder_visible(show);
 
 	if (owner_)
-		owner_->appearance_changed(false, true);
+		owner_->row_item_appearance_changed(false, true);
 }
 
 } // namespace view
diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 18619289..08a5225f 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -422,7 +422,7 @@ void LogicSignal::modify_trigger()
 		new_trigger->stages().empty() ? nullptr : new_trigger);
 
 	if (owner_)
-		owner_->appearance_changed(false, true);
+		owner_->row_item_appearance_changed(false, true);
 }
 
 const QIcon* LogicSignal::get_icon(const char *path)
diff --git a/pv/view/rowitem.cpp b/pv/view/rowitem.cpp
index 5666168e..be694a97 100644
--- a/pv/view/rowitem.cpp
+++ b/pv/view/rowitem.cpp
@@ -61,7 +61,7 @@ void RowItem::set_visual_v_offset(int v_offset)
 	visual_v_offset_ = v_offset;
 
 	if (owner_)
-		owner_->appearance_changed(true, true);
+		owner_->row_item_appearance_changed(true, true);
 }
 
 void RowItem::force_to_v_offset(int v_offset)
diff --git a/pv/view/rowitemowner.hpp b/pv/view/rowitemowner.hpp
index 10d6e99b..42335195 100644
--- a/pv/view/rowitemowner.hpp
+++ b/pv/view/rowitemowner.hpp
@@ -127,7 +127,7 @@ public:
 	virtual void restack_items();
 
 public:
-	virtual void appearance_changed(bool label, bool content) = 0;
+	virtual void row_item_appearance_changed(bool label, bool content) = 0;
 
 	virtual void extents_changed(bool horz, bool vert) = 0;
 
diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 1464b5ee..8411612b 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -228,7 +228,7 @@ void Trace::on_colour_changed(const QColor &colour)
 	set_colour(colour);
 
 	if (owner_)
-		owner_->appearance_changed(true, false);
+		owner_->row_item_appearance_changed(true, false);
 }
 
 } // namespace view
diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 13ba025f..b155778b 100644
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -212,10 +212,10 @@ void TraceGroup::on_ungroup()
 	ungroup();
 }
 
-void TraceGroup::appearance_changed(bool label, bool content)
+void TraceGroup::row_item_appearance_changed(bool label, bool content)
 {
 	if (owner_)
-		owner_->appearance_changed(label, content);
+		owner_->row_item_appearance_changed(label, content);
 }
 
 void TraceGroup::extents_changed(bool horz, bool vert)
diff --git a/pv/view/tracegroup.hpp b/pv/view/tracegroup.hpp
index 4f631d0d..2a78f22c 100644
--- a/pv/view/tracegroup.hpp
+++ b/pv/view/tracegroup.hpp
@@ -119,7 +119,7 @@ public:
 	void ungroup();
 
 public:
-	void appearance_changed(bool label, bool content);
+	void row_item_appearance_changed(bool label, bool content);
 
 	void extents_changed(bool horz, bool vert);
 
diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 6cd274b0..c53c02e3 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -607,7 +607,7 @@ void View::resizeEvent(QResizeEvent*)
 	update_layout();
 }
 
-void View::appearance_changed(bool label, bool content)
+void View::row_item_appearance_changed(bool label, bool content)
 {
 	if (label)
 		header_->update();
diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 59d51d18..9ba86b72 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -231,7 +231,7 @@ private:
 	void resizeEvent(QResizeEvent *e);
 
 public:
-	void appearance_changed(bool label, bool content);
+	void row_item_appearance_changed(bool label, bool content);
 
 	void extents_changed(bool horz, bool vert);
 
-- 
2.30.2