From 8f7c2dce763c9d3439e99b0215a3654f6a18ef11 Mon Sep 17 00:00:00 2001 From: Soeren Apel Date: Thu, 14 Mar 2019 12:31:16 +0100 Subject: [PATCH] DecoderSelector: Properly name utility methods --- pv/subwindows/decoder_selector/subwindow.cpp | 10 +++++----- pv/subwindows/decoder_selector/subwindow.hpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) 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 SubWindow::decoder_inputs(const srd_decoder* d) const +vector SubWindow::get_decoder_inputs(const srd_decoder* d) const { vector ret_val; @@ -162,7 +162,7 @@ vector SubWindow::decoder_inputs(const srd_decoder* d) const return ret_val; } -vector SubWindow::decoders_providing(const char* output) const +vector SubWindow::get_decoders_providing(const char* output) const { vector 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 inputs = decoder_inputs(decoders.front()); + vector 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 prov_decoders = decoders_providing(inputs.at(0)); + vector 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 decoder_inputs(const srd_decoder* d) const; + vector get_decoder_inputs(const srd_decoder* d) const; /** * Returns a list of protocol decoder IDs which provide a given output * ("uart", "spi", etc.) */ - vector decoders_providing(const char* output) const; + vector get_decoders_providing(const char* output) const; Q_SIGNALS: void new_decoders_selected(vector decoders); -- 2.30.2