From 0a47889b01386b1e55c7df73ca301046a195ff97 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Sun, 16 Nov 2014 18:55:24 +0000
Subject: [PATCH] Trace: Renamed get_name() to name()

---
 pv/popups/channels.cpp  | 2 +-
 pv/sigsession.cpp       | 2 +-
 pv/view/decodetrace.cpp | 2 +-
 pv/view/trace.cpp       | 2 +-
 pv/view/trace.h         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index f93734a..f6b5aa1 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -183,7 +183,7 @@ QGridLayout* Channels::create_channel_group_grid(
 	{
 		assert(sig);
 
-		QCheckBox *const checkbox = new QCheckBox(sig->get_name());
+		QCheckBox *const checkbox = new QCheckBox(sig->name());
 		_check_box_mapper.setMapping(checkbox, checkbox);
 		connect(checkbox, SIGNAL(toggled(bool)),
 			&_check_box_mapper, SLOT(map()));
diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 4f26842..d1f3a60 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -274,7 +274,7 @@ bool SigSession::add_decoder(srd_decoder *const dec)
 					dynamic_pointer_cast<view::LogicSignal>(s);
 				if (l && QString::fromUtf8(pdch->name).
 					toLower().contains(
-					l->get_name().toLower()))
+					l->name().toLower()))
 					channels[pdch] = l;
 			}
 
diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 2773297..ae2ec16 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -702,7 +702,7 @@ QComboBox* DecodeTrace::create_channel_selector(
 
 		if (dynamic_pointer_cast<LogicSignal>(s) && s->enabled())
 		{
-			selector->addItem(s->get_name(),
+			selector->addItem(s->name(),
 				qVariantFromValue((void*)s.get()));
 			if ((*channel_iter).second == s)
 				selector->setCurrentIndex(i + 1);
diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index aba5151..367891a 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -48,7 +48,7 @@ Trace::Trace(QString name) :
 {
 }
 
-QString Trace::get_name() const
+QString Trace::name() const
 {
 	return _name;
 }
diff --git a/pv/view/trace.h b/pv/view/trace.h
index ef327ed..7cfa3c2 100644
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -56,7 +56,7 @@ public:
 	/**
 	 * Gets the name of this signal.
 	 */
-	QString get_name() const;
+	QString name() const;
 
 	/**
 	 * Sets the name of the signal.
-- 
2.30.2