From: Soeren Apel <redacted>
Date: Thu, 14 Mar 2019 11:31:16 +0000 (+0100)
Subject: DecoderSelector: Properly name utility methods
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=8f7c2dce763c9d3439e99b0215a3654f6a18ef11;p=pulseview.git

DecoderSelector: Properly name utility methods
---

diff --git a/pv/subwindows/decoder_selector/subwindow.cpp b/pv/subwindows/decoder_selector/subwindow.cpp
index e6245ab4..e768a5fc 100644
--- a/pv/subwindows/decoder_selector/subwindow.cpp
+++ b/pv/subwindows/decoder_selector/subwindow.cpp
@@ -152,7 +152,7 @@ const srd_decoder* SubWindow::get_srd_decoder_from_id(QString id) const
 	return ret_val;
 }
 
-vector<const char*> SubWindow::decoder_inputs(const srd_decoder* d) const
+vector<const char*> SubWindow::get_decoder_inputs(const srd_decoder* d) const
 {
 	vector<const char*> ret_val;
 
@@ -162,7 +162,7 @@ vector<const char*> SubWindow::decoder_inputs(const srd_decoder* d) const
 	return ret_val;
 }
 
-vector<const srd_decoder*> SubWindow::decoders_providing(const char* output) const
+vector<const srd_decoder*> SubWindow::get_decoders_providing(const char* output) const
 {
 	vector<const srd_decoder*> ret_val;
 
@@ -229,7 +229,7 @@ void SubWindow::on_item_activated(const QModelIndex& index)
 	decoders.push_back(chosen_decoder);
 
 	// If the decoder only depends on logic inputs, we add it and are done
-	vector<const char*> inputs = decoder_inputs(decoders.front());
+	vector<const char*> inputs = get_decoder_inputs(decoders.front());
 	if (inputs.size() == 0) {
 		qWarning() << "Protocol decoder" << decoder_name << "cannot have 0 inputs!";
 		return;
@@ -242,7 +242,7 @@ void SubWindow::on_item_activated(const QModelIndex& index)
 
 	// Check if we can automatically fulfill the stacking requirements
 	while (strncmp(inputs.at(0), "logic", 5) != 0) {
-		vector<const srd_decoder*> prov_decoders = decoders_providing(inputs.at(0));
+		vector<const srd_decoder*> prov_decoders = get_decoders_providing(inputs.at(0));
 
 		if (prov_decoders.size() == 0) {
 			// Emit warning and add the stack that we could gather so far
@@ -273,7 +273,7 @@ void SubWindow::on_item_activated(const QModelIndex& index)
 			decoders.push_back(get_srd_decoder_from_id(d));
 		}
 
-		inputs = decoder_inputs(decoders.back());
+		inputs = get_decoder_inputs(decoders.back());
 	}
 
 	// Reverse decoder list and add the stack
diff --git a/pv/subwindows/decoder_selector/subwindow.hpp b/pv/subwindows/decoder_selector/subwindow.hpp
index 6f6456d3..6c3016e8 100644
--- a/pv/subwindows/decoder_selector/subwindow.hpp
+++ b/pv/subwindows/decoder_selector/subwindow.hpp
@@ -118,13 +118,13 @@ public:
 	 * Returns a list of input types that a given protocol decoder requires
 	 * ("logic", "uart", etc.)
 	 */
-	vector<const char*> decoder_inputs(const srd_decoder* d) const;
+	vector<const char*> get_decoder_inputs(const srd_decoder* d) const;
 
 	/**
 	 * Returns a list of protocol decoder IDs which provide a given output
 	 * ("uart", "spi", etc.)
 	 */
-	vector<const srd_decoder*> decoders_providing(const char* output) const;
+	vector<const srd_decoder*> get_decoders_providing(const char* output) const;
 
 Q_SIGNALS:
 	void new_decoders_selected(vector<const srd_decoder*> decoders);