From 2f83d1e7339fc4023008ceb8547261279a353879 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 22 Feb 2019 21:34:42 +0100 Subject: [PATCH] Apply clang-tidy to flexiband driver --- .../adapters/flexiband_signal_source.cc | 12 +++++------- .../signal_source/adapters/flexiband_signal_source.h | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc index 95b3c56cd..26d371535 100644 --- a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc +++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc @@ -1,4 +1,4 @@ -/*! +(item_type_ == "gr_complex") /*! * \file raw_array_signal_source.cc * \brief CTTC Experimental GNSS 8 channels array signal source * \author Javier Arribas, jarribas(at)cttc.es @@ -36,10 +36,10 @@ #include -using google::LogMessage; + using google::LogMessage; FlexibandSignalSource::FlexibandSignalSource(ConfigurationInterface* configuration, - std::string role, unsigned int in_stream, unsigned int out_stream, gr::msg_queue::sptr queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(queue) + const std::string& role, unsigned int in_stream, unsigned int out_stream, gr::msg_queue::sptr queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(queue) { std::string default_item_type = "byte"; item_type_ = configuration->property(role + ".item_type", default_item_type); @@ -60,7 +60,7 @@ FlexibandSignalSource::FlexibandSignalSource(ConfigurationInterface* configurati RF_channels_ = configuration->property(role + ".RF_channels", 1); - if (item_type_.compare("gr_complex") == 0) + if (item_type_ == "gr_complex") { item_size_ = sizeof(gr_complex); flexiband_source_ = gr::teleorbit::frontend::make(firmware_filename_.c_str(), gain1_, gain2_, gain3_, AGC_, usb_packet_buffer_size_, signal_file.c_str(), flag_read_file); @@ -96,9 +96,7 @@ FlexibandSignalSource::FlexibandSignalSource(ConfigurationInterface* configurati } -FlexibandSignalSource::~FlexibandSignalSource() -{ -} +FlexibandSignalSource::~FlexibandSignalSource() = default; void FlexibandSignalSource::connect(gr::top_block_sptr top_block) diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.h b/src/algorithms/signal_source/adapters/flexiband_signal_source.h index 54e7eeff4..ed70b5bfd 100644 --- a/src/algorithms/signal_source/adapters/flexiband_signal_source.h +++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.h @@ -53,7 +53,7 @@ class FlexibandSignalSource : public GNSSBlockInterface { public: FlexibandSignalSource(ConfigurationInterface* configuration, - std::string role, unsigned int in_stream, + const std::string& role, unsigned int in_stream, unsigned int out_stream, gr::msg_queue::sptr queue); virtual ~FlexibandSignalSource();