diff options
47 files changed, 194 insertions, 233 deletions
diff --git a/gnuradio-runtime/include/gnuradio/block_gateway.h b/gnuradio-runtime/include/gnuradio/block_gateway.h index 7756841a3a..daeed75cfb 100644 --- a/gnuradio-runtime/include/gnuradio/block_gateway.h +++ b/gnuradio-runtime/include/gnuradio/block_gateway.h @@ -150,15 +150,15 @@ public: return gr::block::set_min_output_buffer(size); } - long block__max_output_buffer(size_t i) { - return gr::block::max_output_buffer(i); - } + long block__max_output_buffer(size_t i) { return gr::block::max_output_buffer(i); } - void block__set_max_output_buffer(long max_output_buffer) { + void block__set_max_output_buffer(long max_output_buffer) + { gr::block::set_max_output_buffer(max_output_buffer); } - void block__set_max_output_buffer(int port, long max_output_buffer) { + void block__set_max_output_buffer(int port, long max_output_buffer) + { gr::block::set_max_output_buffer(port, max_output_buffer); } diff --git a/gnuradio-runtime/include/gnuradio/logger.h b/gnuradio-runtime/include/gnuradio/logger.h index 138fb004de..83c1f070bf 100644 --- a/gnuradio-runtime/include/gnuradio/logger.h +++ b/gnuradio-runtime/include/gnuradio/logger.h @@ -167,136 +167,136 @@ typedef log4cpp::Category* logger_ptr; #define GR_RESET_CONFIGURATION() gr::logger_config::reset_config(); /* Logger name referenced macros */ -#define GR_DEBUG(name, msg) \ - { \ - gr::logger_ptr logger = gr::logger_get_logger(name); \ +#define GR_DEBUG(name, msg) \ + { \ + gr::logger_ptr logger = gr::logger_get_logger(name); \ *logger << log4cpp::Priority::DEBUG << (msg) << log4cpp::eol; \ } -#define GR_INFO(name, msg) \ - { \ - gr::logger_ptr logger = gr::logger_get_logger(name); \ +#define GR_INFO(name, msg) \ + { \ + gr::logger_ptr logger = gr::logger_get_logger(name); \ *logger << log4cpp::Priority::INFO << (msg) << log4cpp::eol; \ } #define GR_NOTICE(name, msg) \ { \ gr::logger_ptr logger = gr::logger_get_logger(name); \ - *logger << log4cpp::Priority::NOTICE << (msg); \ + *logger << log4cpp::Priority::NOTICE << (msg); \ } -#define GR_WARN(name, msg) \ - { \ - gr::logger_ptr logger = gr::logger_get_logger(name); \ +#define GR_WARN(name, msg) \ + { \ + gr::logger_ptr logger = gr::logger_get_logger(name); \ *logger << log4cpp::Priority::WARN << (msg) << log4cpp::eol; \ } -#define GR_ERROR(name, msg) \ - { \ - gr::logger_ptr logger = gr::logger_get_logger(name); \ +#define GR_ERROR(name, msg) \ + { \ + gr::logger_ptr logger = gr::logger_get_logger(name); \ *logger << log4cpp::Priority::ERROR << (msg) << log4cpp::eol; \ } -#define GR_CRIT(name, msg) \ - { \ - gr::logger_ptr logger = gr::logger_get_logger(name); \ +#define GR_CRIT(name, msg) \ + { \ + gr::logger_ptr logger = gr::logger_get_logger(name); \ *logger << log4cpp::Priority::CRIT << (msg) << log4cpp::eol; \ } -#define GR_ALERT(name, msg) \ - { \ - gr::logger_ptr logger = gr::logger_get_logger(name); \ +#define GR_ALERT(name, msg) \ + { \ + gr::logger_ptr logger = gr::logger_get_logger(name); \ *logger << log4cpp::Priority::ALERT << (msg) << log4cpp::eol; \ } -#define GR_FATAL(name, msg) \ - { \ - gr::logger_ptr logger = gr::logger_get_logger(name); \ +#define GR_FATAL(name, msg) \ + { \ + gr::logger_ptr logger = gr::logger_get_logger(name); \ *logger << log4cpp::Priority::FATAL << (msg) << log4cpp::eol; \ } -#define GR_EMERG(name, msg) \ - { \ - gr::logger_ptr logger = gr::logger_get_logger(name); \ +#define GR_EMERG(name, msg) \ + { \ + gr::logger_ptr logger = gr::logger_get_logger(name); \ *logger << log4cpp::Priority::EMERG << (msg) << log4cpp::eol; \ } -#define GR_ERRORIF(name, cond, msg) \ - { \ - if ((cond)) { \ - gr::logger_ptr logger = gr::logger_get_logger(name); \ +#define GR_ERRORIF(name, cond, msg) \ + { \ + if ((cond)) { \ + gr::logger_ptr logger = gr::logger_get_logger(name); \ *logger << log4cpp::Priority::ERROR << (msg) << log4cpp::eol; \ - } \ + } \ } -#define GR_ASSERT(name, cond, msg) \ - { \ - if (!(cond)) { \ - gr::logger_ptr logger = gr::logger_get_logger(name); \ +#define GR_ASSERT(name, cond, msg) \ + { \ + if (!(cond)) { \ + gr::logger_ptr logger = gr::logger_get_logger(name); \ *logger << log4cpp::Priority::EMERG << (msg) << log4cpp::eol; \ - } \ - assert(0); \ + } \ + assert(0); \ } /* LoggerPtr Referenced Macros */ -#define GR_LOG_DEBUG(logger, msg) \ - { \ +#define GR_LOG_DEBUG(logger, msg) \ + { \ *logger << log4cpp::Priority::DEBUG << (msg) << log4cpp::eol; \ } -#define GR_LOG_INFO(logger, msg) \ - { \ +#define GR_LOG_INFO(logger, msg) \ + { \ *logger << log4cpp::Priority::INFO << (msg) << log4cpp::eol; \ } -#define GR_LOG_NOTICE(logger, msg) \ - { \ +#define GR_LOG_NOTICE(logger, msg) \ + { \ *logger << log4cpp::Priority::NOTICE << (msg) << log4cpp::eol; \ } -#define GR_LOG_WARN(logger, msg) \ - { \ +#define GR_LOG_WARN(logger, msg) \ + { \ *logger << log4cpp::Priority::WARN << (msg) << log4cpp::eol; \ } -#define GR_LOG_ERROR(logger, msg) \ - { \ +#define GR_LOG_ERROR(logger, msg) \ + { \ *logger << log4cpp::Priority::ERROR << (msg) << log4cpp::eol; \ } -#define GR_LOG_CRIT(logger, msg) \ - { \ +#define GR_LOG_CRIT(logger, msg) \ + { \ *logger << log4cpp::Priority::CRIT << (msg) << log4cpp::eol; \ } -#define GR_LOG_ALERT(logger, msg) \ - { \ +#define GR_LOG_ALERT(logger, msg) \ + { \ *logger << log4cpp::Priority::ALERT << (msg) << log4cpp::eol; \ } -#define GR_LOG_FATAL(logger, msg) \ - { \ +#define GR_LOG_FATAL(logger, msg) \ + { \ *logger << log4cpp::Priority::FATAL << (msg) << log4cpp::eol; \ } -#define GR_LOG_EMERG(logger, msg) \ - { \ +#define GR_LOG_EMERG(logger, msg) \ + { \ *logger << log4cpp::Priority::EMERG << (msg) << log4cpp::eol; \ } -#define GR_LOG_ERRORIF(logger, cond, msg) \ - { \ - if ((cond)) { \ +#define GR_LOG_ERRORIF(logger, cond, msg) \ + { \ + if ((cond)) { \ *logger << log4cpp::Priority::ERROR << (msg) << log4cpp::eol; \ - } \ + } \ } -#define GR_LOG_ASSERT(logger, cond, msg) \ - { \ - if (!(cond)) { \ +#define GR_LOG_ASSERT(logger, cond, msg) \ + { \ + if (!(cond)) { \ *logger << log4cpp::Priority::EMERG << (msg) << log4cpp::eol; \ - assert(0); \ - } \ + assert(0); \ + } \ } namespace gr { diff --git a/gnuradio-runtime/lib/buffer.cc b/gnuradio-runtime/lib/buffer.cc index 77c761085b..13f0a8c78b 100644 --- a/gnuradio-runtime/lib/buffer.cc +++ b/gnuradio-runtime/lib/buffer.cc @@ -341,11 +341,11 @@ void buffer_reader::get_tags_in_range(std::vector<tag_t>& v, uint64_t lower_bound = abs_start - d_attr_delay; // check for underflow and if so saturate at 0 if (lower_bound > abs_start) - lower_bound = 0; + lower_bound = 0; uint64_t upper_bound = abs_end - d_attr_delay; // check for underflow and if so saturate at 0 if (upper_bound > abs_end) - upper_bound = 0; + upper_bound = 0; v.clear(); std::multimap<uint64_t, tag_t>::iterator itr = diff --git a/gnuradio-runtime/lib/local_sighandler.cc b/gnuradio-runtime/lib/local_sighandler.cc index 7f96b2460d..ca16fe05e6 100644 --- a/gnuradio-runtime/lib/local_sighandler.cc +++ b/gnuradio-runtime/lib/local_sighandler.cc @@ -27,8 +27,8 @@ #include "local_sighandler.h" #include <stdio.h> #include <string.h> -#include <stdexcept> #include <boost/format.hpp> +#include <stdexcept> namespace gr { diff --git a/gnuradio-runtime/lib/logger.cc b/gnuradio-runtime/lib/logger.cc index 6b1ce7939b..63138851ee 100644 --- a/gnuradio-runtime/lib/logger.cc +++ b/gnuradio-runtime/lib/logger.cc @@ -263,10 +263,7 @@ void logger_add_file_appender(logger_ptr logger, { log4cpp::PatternLayout* layout = new log4cpp::PatternLayout(); log4cpp::Appender* app = - new log4cpp::FileAppender( - "FileAppender::" + filename, - filename, - append); + new log4cpp::FileAppender("FileAppender::" + filename, filename, append); layout->setConversionPattern(pattern); app->setLayout(layout); logger->setAppender(app); diff --git a/gnuradio-runtime/lib/prefs.cc b/gnuradio-runtime/lib/prefs.cc index 777d64211f..4173973c2e 100644 --- a/gnuradio-runtime/lib/prefs.cc +++ b/gnuradio-runtime/lib/prefs.cc @@ -102,7 +102,8 @@ void prefs::_read_files(const std::vector<std::string>& filenames) section = "default"; key = okey; } - std::transform(section.begin(), section.end(), section.begin(), ::tolower); + std::transform( + section.begin(), section.end(), section.begin(), ::tolower); std::transform(key.begin(), key.end(), key.begin(), ::tolower); // value of a basic_option is always a std::vector<string>; we only // allow single values, so: diff --git a/gnuradio-runtime/lib/sys_paths.cc b/gnuradio-runtime/lib/sys_paths.cc index 2f26724e7c..b9c3fc964f 100644 --- a/gnuradio-runtime/lib/sys_paths.cc +++ b/gnuradio-runtime/lib/sys_paths.cc @@ -73,12 +73,11 @@ std::string __userconf_path() boost::filesystem::path p; if (path) { p = path; - } - else { + } else { p = appdata_path(); p = p / ".gnuradio"; } - + return p.string(); } diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc index 7d63dc08d1..da71aafc52 100644 --- a/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc +++ b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc @@ -74,8 +74,8 @@ vmcircbuf_mmap_shm_open::vmcircbuf_mmap_shm_open(int size) : gr::vmcircbuf(size) // Where the "portable format" doesn't work, we try building // a full filesystem pathname pointing into a suitable temporary directory. - seg_name = str(boost::format("%s/gnuradio-%d-%d") % - gr::tmp_path() % getpid() % s_seg_counter); + seg_name = str(boost::format("%s/gnuradio-%d-%d") % gr::tmp_path() % + getpid() % s_seg_counter); } shm_fd = shm_open(seg_name.c_str(), O_RDWR | O_CREAT | O_EXCL, 0600); @@ -91,9 +91,8 @@ vmcircbuf_mmap_shm_open::vmcircbuf_mmap_shm_open(int size) : gr::vmcircbuf(size) EEXIST) // Named segment already exists (shouldn't happen). Try again continue; - static std::string msg = - str(boost::format("gr::vmcircbuf_mmap_shm_open: shm_open [%s]") % - seg_name); + static std::string msg = str( + boost::format("gr::vmcircbuf_mmap_shm_open: shm_open [%s]") % seg_name); perror(msg.c_str()); throw std::runtime_error("gr::vmcircbuf_mmap_shm_open"); } diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc index f6c1777013..f7fd5e3d35 100644 --- a/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc +++ b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc @@ -65,11 +65,8 @@ vmcircbuf_mmap_tmpfile::vmcircbuf_mmap_tmpfile(int size) : gr::vmcircbuf(size) // open a temporary file that we'll map in a bit later while (1) { - seg_name = str(boost::format( - "%s/gnuradio-%d-%d-XXXXXX") % - gr::tmp_path() % - getpid() % - s_seg_counter); + seg_name = str(boost::format("%s/gnuradio-%d-%d-XXXXXX") % gr::tmp_path() % + getpid() % s_seg_counter); s_seg_counter++; seg_fd = open(seg_name.c_str(), O_RDWR | O_CREAT | O_EXCL, 0600); diff --git a/gr-blocks/lib/file_descriptor_source_impl.cc b/gr-blocks/lib/file_descriptor_source_impl.cc index 3bba4b9aa0..52cb3114c1 100644 --- a/gr-blocks/lib/file_descriptor_source_impl.cc +++ b/gr-blocks/lib/file_descriptor_source_impl.cc @@ -63,10 +63,7 @@ file_descriptor_source_impl::file_descriptor_source_impl(size_t itemsize, { } -file_descriptor_source_impl::~file_descriptor_source_impl() -{ - close(d_fd); -} +file_descriptor_source_impl::~file_descriptor_source_impl() { close(d_fd); } int file_descriptor_source_impl::read_items(char* buf, int nitems) { diff --git a/gr-blocks/lib/pack_k_bits_bb_impl.cc b/gr-blocks/lib/pack_k_bits_bb_impl.cc index 7757e62d34..e27793aef6 100644 --- a/gr-blocks/lib/pack_k_bits_bb_impl.cc +++ b/gr-blocks/lib/pack_k_bits_bb_impl.cc @@ -42,7 +42,7 @@ pack_k_bits_bb_impl::pack_k_bits_bb_impl(unsigned k) io_signature::make(1, 1, sizeof(unsigned char)), io_signature::make(1, 1, sizeof(unsigned char)), k), - d_pack(k) + d_pack(k) { } diff --git a/gr-blocks/lib/packed_to_unpacked_impl.cc b/gr-blocks/lib/packed_to_unpacked_impl.cc index bcd9008809..c377063c53 100644 --- a/gr-blocks/lib/packed_to_unpacked_impl.cc +++ b/gr-blocks/lib/packed_to_unpacked_impl.cc @@ -66,7 +66,7 @@ void packed_to_unpacked_impl<T>::forecast(int noutput_items, gr_vector_int& ninput_items_required) { const int input_required = (int)ceil((d_index + noutput_items * d_bits_per_chunk) / - (1.0 * this->d_bits_per_type)); + (1.0 * this->d_bits_per_type)); const unsigned ninputs = ninput_items_required.size(); for (unsigned int i = 0; i < ninputs; i++) { ninput_items_required[i] = input_required; diff --git a/gr-blocks/lib/tag_debug_impl.cc b/gr-blocks/lib/tag_debug_impl.cc index f6550e0ba3..f7f7d23fa0 100644 --- a/gr-blocks/lib/tag_debug_impl.cc +++ b/gr-blocks/lib/tag_debug_impl.cc @@ -114,9 +114,8 @@ int tag_debug_impl::work(int noutput_items, for (const auto& tag : d_tags) { sout << std::setw(10) << "Offset: " << tag.offset << std::setw(10) << "Source: " - << (pmt::is_symbol(tag.srcid) - ? pmt::symbol_to_string(tag.srcid) - : "n/a") + << (pmt::is_symbol(tag.srcid) ? pmt::symbol_to_string(tag.srcid) + : "n/a") << std::setw(10) << "Key: " << pmt::symbol_to_string(tag.key) << std::setw(10) << "Value: "; sout << tag.value << std::endl; diff --git a/gr-blocks/lib/unpack_k_bits_bb_impl.cc b/gr-blocks/lib/unpack_k_bits_bb_impl.cc index b81d4a8fa5..a671d66e02 100644 --- a/gr-blocks/lib/unpack_k_bits_bb_impl.cc +++ b/gr-blocks/lib/unpack_k_bits_bb_impl.cc @@ -42,7 +42,7 @@ unpack_k_bits_bb_impl::unpack_k_bits_bb_impl(unsigned k) io_signature::make(1, 1, sizeof(unsigned char)), io_signature::make(1, 1, sizeof(unsigned char)), k), - d_unpack(k) + d_unpack(k) { } diff --git a/gr-digital/lib/chunks_to_symbols_impl.cc b/gr-digital/lib/chunks_to_symbols_impl.cc index b4302b12de..a8b9d9b05e 100644 --- a/gr-digital/lib/chunks_to_symbols_impl.cc +++ b/gr-digital/lib/chunks_to_symbols_impl.cc @@ -33,16 +33,15 @@ namespace gr { namespace digital { -void set_vector_from_pmt( - std::vector<gr_complex>& symbol_table, pmt::pmt_t& symbol_table_pmt) +void set_vector_from_pmt(std::vector<gr_complex>& symbol_table, + pmt::pmt_t& symbol_table_pmt) { size_t length; const gr_complex* elements = pmt::c32vector_elements(symbol_table_pmt, length); symbol_table.assign(elements, elements + length); } -void set_vector_from_pmt( - std::vector<float>& symbol_table, pmt::pmt_t& symbol_table_pmt) +void set_vector_from_pmt(std::vector<float>& symbol_table, pmt::pmt_t& symbol_table_pmt) { size_t length; const float* elements = pmt::f32vector_elements(symbol_table_pmt, length); diff --git a/gr-digital/lib/costas_loop_cc_impl.cc b/gr-digital/lib/costas_loop_cc_impl.cc index 5fb040d93d..cdec707cd4 100644 --- a/gr-digital/lib/costas_loop_cc_impl.cc +++ b/gr-digital/lib/costas_loop_cc_impl.cc @@ -59,28 +59,29 @@ costas_loop_cc_impl::costas_loop_cc_impl(float loop_bw, unsigned int order, bool costas_loop_cc_impl::~costas_loop_cc_impl() {} -costas_loop_cc_impl::d_phase_detector_t costas_loop_cc_impl::choose_phase_detector(unsigned int order, bool use_snr) +costas_loop_cc_impl::d_phase_detector_t +costas_loop_cc_impl::choose_phase_detector(unsigned int order, bool use_snr) { - switch (order) { - case 2: - if (use_snr) { - return &costas_loop_cc_impl::phase_detector_snr_2; - } - return &costas_loop_cc_impl::phase_detector_2; + switch (order) { + case 2: + if (use_snr) { + return &costas_loop_cc_impl::phase_detector_snr_2; + } + return &costas_loop_cc_impl::phase_detector_2; - case 4: - if (use_snr) { - return &costas_loop_cc_impl::phase_detector_snr_4; - } - return &costas_loop_cc_impl::phase_detector_4; + case 4: + if (use_snr) { + return &costas_loop_cc_impl::phase_detector_snr_4; + } + return &costas_loop_cc_impl::phase_detector_4; - case 8: - if (use_snr) { - return &costas_loop_cc_impl::phase_detector_snr_8; + case 8: + if (use_snr) { + return &costas_loop_cc_impl::phase_detector_snr_8; + } + return &costas_loop_cc_impl::phase_detector_8; } - return &costas_loop_cc_impl::phase_detector_8; - } - throw std::invalid_argument("order must be 2, 4, or 8"); + throw std::invalid_argument("order must be 2, 4, or 8"); } float costas_loop_cc_impl::phase_detector_8(gr_complex sample) const diff --git a/gr-digital/lib/fll_band_edge_cc_impl.cc b/gr-digital/lib/fll_band_edge_cc_impl.cc index 7bbe661ce7..079595d0a9 100644 --- a/gr-digital/lib/fll_band_edge_cc_impl.cc +++ b/gr-digital/lib/fll_band_edge_cc_impl.cc @@ -174,8 +174,10 @@ void fll_band_edge_cc_impl::design_filter(float samps_per_sym, // Set the history to ensure enough input items for each filter set_history(filter_size + 1); - d_filter_upper.reset(new gr::filter::kernel::fir_filter_with_buffer_ccc(d_taps_upper)); - d_filter_lower.reset(new gr::filter::kernel::fir_filter_with_buffer_ccc(d_taps_lower)); + d_filter_upper.reset( + new gr::filter::kernel::fir_filter_with_buffer_ccc(d_taps_upper)); + d_filter_lower.reset( + new gr::filter::kernel::fir_filter_with_buffer_ccc(d_taps_lower)); } void fll_band_edge_cc_impl::print_taps() diff --git a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc index 5354130b25..3f1dcfef91 100644 --- a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc +++ b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc @@ -98,8 +98,8 @@ pfb_clock_sync_ccf_impl::pfb_clock_sync_ccf_impl(double sps, // Create an FIR filter for each channel and zero out the taps std::vector<float> vtaps(1, 0); for (int i = 0; i < d_nfilters; i++) { - d_filters[i].reset(new kernel::fir_filter_ccf(1, vtaps)); - d_diff_filters[i].reset(new kernel::fir_filter_ccf(1, vtaps)); + d_filters[i].reset(new kernel::fir_filter_ccf(1, vtaps)); + d_diff_filters[i].reset(new kernel::fir_filter_ccf(1, vtaps)); } // Now, actually set the filters' taps @@ -206,9 +206,10 @@ void pfb_clock_sync_ccf_impl::update_gains() d_beta = (4 * d_loop_bw * d_loop_bw) / denom; } -void pfb_clock_sync_ccf_impl::set_taps(const std::vector<float>& newtaps, - std::vector<std::vector<float>>& ourtaps, - std::vector<std::unique_ptr<kernel::fir_filter_ccf>>& ourfilter) +void pfb_clock_sync_ccf_impl::set_taps( + const std::vector<float>& newtaps, + std::vector<std::vector<float>>& ourtaps, + std::vector<std::unique_ptr<kernel::fir_filter_ccf>>& ourfilter) { int i, j; diff --git a/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc b/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc index 7b023ba4d3..10b99949d8 100644 --- a/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc +++ b/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc @@ -96,8 +96,7 @@ double probe_mpsk_snr_est_c_impl::snr() if (d_snr_est) return d_snr_est->snr(); else - throw std::runtime_error( - "probe_mpsk_snr_est_c_impl:: No SNR estimator defined."); + throw std::runtime_error("probe_mpsk_snr_est_c_impl:: No SNR estimator defined."); } double probe_mpsk_snr_est_c_impl::signal() @@ -105,8 +104,7 @@ double probe_mpsk_snr_est_c_impl::signal() if (d_snr_est) return d_snr_est->signal(); else - throw std::runtime_error( - "probe_mpsk_snr_est_c_impl:: No SNR estimator defined."); + throw std::runtime_error("probe_mpsk_snr_est_c_impl:: No SNR estimator defined."); } @@ -115,8 +113,7 @@ double probe_mpsk_snr_est_c_impl::noise() if (d_snr_est) return d_snr_est->noise(); else - throw std::runtime_error( - "probe_mpsk_snr_est_c_impl:: No SNR estimator defined."); + throw std::runtime_error("probe_mpsk_snr_est_c_impl:: No SNR estimator defined."); } snr_est_type_t probe_mpsk_snr_est_c_impl::type() const { return d_type; } @@ -146,8 +143,7 @@ void probe_mpsk_snr_est_c_impl::set_type(snr_est_type_t t) d_snr_est = new mpsk_snr_est_svr(d_alpha); break; default: - throw std::invalid_argument( - "probe_mpsk_snr_est_c_impl: unknown type specified."); + throw std::invalid_argument("probe_mpsk_snr_est_c_impl: unknown type specified."); } } @@ -168,8 +164,7 @@ void probe_mpsk_snr_est_c_impl::set_alpha(double alpha) if (d_snr_est) d_snr_est->set_alpha(d_alpha); } else - throw std::invalid_argument( - "probe_mpsk_snr_est_c_impl: alpha must be in [0,1]"); + throw std::invalid_argument("probe_mpsk_snr_est_c_impl: alpha must be in [0,1]"); } } /* namespace digital */ diff --git a/gr-digital/lib/symbol_sync_cc_impl.cc b/gr-digital/lib/symbol_sync_cc_impl.cc index 5faf7871fa..d308bc9fa2 100644 --- a/gr-digital/lib/symbol_sync_cc_impl.cc +++ b/gr-digital/lib/symbol_sync_cc_impl.cc @@ -86,9 +86,8 @@ symbol_sync_cc_impl::symbol_sync_cc_impl(enum ted_type detector_type, d_out_instantaneous_clock_period(NULL), d_out_average_clock_period(NULL) { - set_output_signature(io_signature::makev(1, 4, { - sizeof(gr_complex), sizeof(float), sizeof(float), sizeof(float) - })); + set_output_signature(io_signature::makev( + 1, 4, { sizeof(gr_complex), sizeof(float), sizeof(float), sizeof(float) })); if (sps <= 1.0f) throw std::out_of_range("nominal samples per symbol must be > 1"); @@ -128,8 +127,12 @@ symbol_sync_cc_impl::symbol_sync_cc_impl(enum ted_type detector_type, d_interps_per_symbol % sps); // Symbol Clock Tracking and Estimation - d_clock.reset(new clock_tracking_loop( - loop_bw, sps + max_deviation, sps - max_deviation, sps, damping_factor, ted_gain)); + d_clock.reset(new clock_tracking_loop(loop_bw, + sps + max_deviation, + sps - max_deviation, + sps, + damping_factor, + ted_gain)); // Timing Error Detector d_ted->sync_reset(); @@ -388,8 +391,8 @@ void symbol_sync_cc_impl::forecast(int noutput_items, // in case we have the worst case allowable clock timing deviation on // input. const int answer = static_cast<int>(ceilf(static_cast<float>(noutput_items + 2) * - d_clock->get_max_avg_period() / d_osps)) + - static_cast<int>(d_interp->ntaps()); + d_clock->get_max_avg_period() / d_osps)) + + static_cast<int>(d_interp->ntaps()); for (unsigned i = 0; i < ninputs; i++) ninput_items_required[i] = answer; diff --git a/gr-digital/lib/symbol_sync_ff_impl.cc b/gr-digital/lib/symbol_sync_ff_impl.cc index 948731a60f..f04221d8b4 100644 --- a/gr-digital/lib/symbol_sync_ff_impl.cc +++ b/gr-digital/lib/symbol_sync_ff_impl.cc @@ -88,9 +88,8 @@ symbol_sync_ff_impl::symbol_sync_ff_impl(enum ted_type detector_type, d_out_instantaneous_clock_period(NULL), d_out_average_clock_period(NULL) { - set_output_signature(io_signature::makev(1, 4, { - sizeof(float), sizeof(float), sizeof(float), sizeof(float) - })); + set_output_signature(io_signature::makev( + 1, 4, { sizeof(float), sizeof(float), sizeof(float), sizeof(float) })); if (sps <= 1.0f) throw std::out_of_range("nominal samples per symbol must be > 1"); @@ -397,8 +396,8 @@ void symbol_sync_ff_impl::forecast(int noutput_items, // in case we have the worst case allowable clock timing deviation on // input. const int answer = static_cast<int>(ceilf(static_cast<float>(noutput_items + 2) * - d_clock->get_max_avg_period() / d_osps)) + - static_cast<int>(d_interp->ntaps()); + d_clock->get_max_avg_period() / d_osps)) + + static_cast<int>(d_interp->ntaps()); for (unsigned i = 0; i < ninputs; i++) ninput_items_required[i] = answer; diff --git a/gr-dtv/include/gnuradio/dtv/atsc_consts.h b/gr-dtv/include/gnuradio/dtv/atsc_consts.h index e5d6450d1c..0dcf700201 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_consts.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_consts.h @@ -38,8 +38,9 @@ static constexpr int MPEG_TRANSPORT_ERROR_BIT = 0x80; // top bit of byte after S // ATSC specific constants static constexpr double ATSC_SYMBOL_RATE = 4.5e6 / 286 * 684; // ~10.76 MHz static constexpr double ATSC_DATA_SEGMENT_RATE = ATSC_SYMBOL_RATE / 832; // ~12.935 kHz -static constexpr int ATSC_DATA_SEGMENT_LENGTH = 832; // includes 4 sync symbols at beginning -static constexpr int ATSC_DSEGS_PER_FIELD = 312; // regular data segs / field +static constexpr int ATSC_DATA_SEGMENT_LENGTH = + 832; // includes 4 sync symbols at beginning +static constexpr int ATSC_DSEGS_PER_FIELD = 312; // regular data segs / field } /* namespace dtv */ } /* namespace gr */ diff --git a/gr-dtv/lib/atsc/atsc_equalizer_impl.h b/gr-dtv/lib/atsc/atsc_equalizer_impl.h index 787a93b6da..44db09e101 100644 --- a/gr-dtv/lib/atsc/atsc_equalizer_impl.h +++ b/gr-dtv/lib/atsc/atsc_equalizer_impl.h @@ -34,7 +34,8 @@ class atsc_equalizer_impl : public atsc_equalizer { private: static constexpr int NTAPS = 64; - static constexpr int NPRETAPS = (int)(NTAPS * 0.8); // probably should be either .2 or .8 + static constexpr int NPRETAPS = + (int)(NTAPS * 0.8); // probably should be either .2 or .8 // the length of the field sync pattern that we know unequivocally static constexpr int KNOWN_FIELD_SYNC_LENGTH = 4 + 511 + 3 * 63; diff --git a/gr-dtv/lib/atsc/atsc_fs_checker_impl.h b/gr-dtv/lib/atsc/atsc_fs_checker_impl.h index b14cba00e5..553f465ad2 100644 --- a/gr-dtv/lib/atsc/atsc_fs_checker_impl.h +++ b/gr-dtv/lib/atsc/atsc_fs_checker_impl.h @@ -33,10 +33,10 @@ class atsc_fs_checker_impl : public atsc_fs_checker { private: static constexpr int SRSIZE = 1024; // must be power of two - int d_index; // points at oldest sample - float d_sample_sr[SRSIZE]; // sample shift register - atsc::syminfo d_tag_sr[SRSIZE]; // tag shift register - unsigned char d_bit_sr[SRSIZE]; // binary decision shift register + int d_index; // points at oldest sample + float d_sample_sr[SRSIZE]; // sample shift register + atsc::syminfo d_tag_sr[SRSIZE]; // tag shift register + unsigned char d_bit_sr[SRSIZE]; // binary decision shift register int d_field_num; int d_segment_num; diff --git a/gr-dtv/lib/atsc/atsc_pnXXX_impl.h b/gr-dtv/lib/atsc/atsc_pnXXX_impl.h index 7f25b7c0b5..c08a5fc4a9 100644 --- a/gr-dtv/lib/atsc/atsc_pnXXX_impl.h +++ b/gr-dtv/lib/atsc/atsc_pnXXX_impl.h @@ -60,8 +60,8 @@ constexpr unsigned char atsc_pn511[511] = { }; constexpr unsigned char atsc_pn63[63] = { 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, - 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, - 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, - 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0 }; + 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, + 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, + 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0 }; #endif /* INCLUDED_DTV_ATSC_PNXXX_H */ diff --git a/gr-fec/lib/async_decoder_impl.cc b/gr-fec/lib/async_decoder_impl.cc index d417da3129..e7a668c832 100644 --- a/gr-fec/lib/async_decoder_impl.cc +++ b/gr-fec/lib/async_decoder_impl.cc @@ -116,7 +116,8 @@ void async_decoder_impl::decode_unpacked(pmt::pmt_t msg) size_t nbits_in = pmt::length(bits); size_t nbits_out = 0; size_t nblocks = 1; - bool variable_frame_size = d_decoder->set_frame_size(nbits_in * d_decoder->rate() - diff); + bool variable_frame_size = + d_decoder->set_frame_size(nbits_in * d_decoder->rate() - diff); // Check here if the frame size is larger than what we've // allocated for in the constructor. diff --git a/gr-fec/lib/decoder_impl.cc b/gr-fec/lib/decoder_impl.cc index f4ad7a9846..f1764143eb 100644 --- a/gr-fec/lib/decoder_impl.cc +++ b/gr-fec/lib/decoder_impl.cc @@ -106,8 +106,8 @@ int decoder_impl::general_work(int noutput_items, pmt::intern(alias())); } - int consumed = std::lround( - items / relative_rate() * (output_multiple() - d_decoder->get_history())); + int consumed = std::lround(items / relative_rate() * + (output_multiple() - d_decoder->get_history())); int returned = items * (output_multiple() - d_decoder->get_history()); consume_each(consumed); diff --git a/gr-fft/lib/fft_vcc_fftw.cc b/gr-fft/lib/fft_vcc_fftw.cc index 404ffc538e..f0447c98bd 100644 --- a/gr-fft/lib/fft_vcc_fftw.cc +++ b/gr-fft/lib/fft_vcc_fftw.cc @@ -120,9 +120,8 @@ int fft_vcc_fftw::work(int noutput_items, memcpy(&out[0], &d_fft.get_outbuf()[len], sizeof(gr_complex) * (d_fft_size - len)); - memcpy(&out[d_fft_size - len], - &d_fft.get_outbuf()[0], - sizeof(gr_complex) * len); + memcpy( + &out[d_fft_size - len], &d_fft.get_outbuf()[0], sizeof(gr_complex) * len); } else { memcpy(out, d_fft.get_outbuf(), output_data_size); } diff --git a/gr-filter/include/gnuradio/filter/fft_filter.h b/gr-filter/include/gnuradio/filter/fft_filter.h index b50451ec74..d9a18f8fc6 100644 --- a/gr-filter/include/gnuradio/filter/fft_filter.h +++ b/gr-filter/include/gnuradio/filter/fft_filter.h @@ -74,10 +74,10 @@ private: const int d_decimation; std::unique_ptr<fft::fft_real_fwd> d_fwdfft; // forward "plan" std::unique_ptr<fft::fft_real_rev> d_invfft; // inverse "plan" - int d_nthreads; // number of FFTW threads to use - std::vector<float> d_tail; // state carried between blocks for overlap-add - std::vector<float> d_taps; // stores time domain taps - volk::vector<gr_complex> d_xformed_taps; // Fourier xformed taps + int d_nthreads; // number of FFTW threads to use + std::vector<float> d_tail; // state carried between blocks for overlap-add + std::vector<float> d_taps; // stores time domain taps + volk::vector<gr_complex> d_xformed_taps; // Fourier xformed taps void compute_sizes(int ntaps); int tailsize() const { return d_ntaps - 1; } @@ -174,12 +174,12 @@ private: int d_nsamples; int d_fftsize; // fftsize = ntaps + nsamples - 1 const int d_decimation; - std::unique_ptr<fft::fft_complex> d_fwdfft; // forward "plan" - std::unique_ptr<fft::fft_complex> d_invfft; // inverse "plan" - int d_nthreads; // number of FFTW threads to use + std::unique_ptr<fft::fft_complex> d_fwdfft; // forward "plan" + std::unique_ptr<fft::fft_complex> d_invfft; // inverse "plan" + int d_nthreads; // number of FFTW threads to use std::vector<gr_complex> d_tail; // state carried between blocks for overlap-add std::vector<gr_complex> d_taps; // stores time domain taps - volk::vector<gr_complex> d_xformed_taps; // Fourier xformed taps + volk::vector<gr_complex> d_xformed_taps; // Fourier xformed taps void compute_sizes(int ntaps); int tailsize() const { return d_ntaps - 1; } @@ -276,12 +276,12 @@ private: int d_nsamples; int d_fftsize; // fftsize = ntaps + nsamples - 1 const int d_decimation; - std::unique_ptr<fft::fft_complex> d_fwdfft; // forward "plan" - std::unique_ptr<fft::fft_complex> d_invfft; // inverse "plan" - int d_nthreads; // number of FFTW threads to use + std::unique_ptr<fft::fft_complex> d_fwdfft; // forward "plan" + std::unique_ptr<fft::fft_complex> d_invfft; // inverse "plan" + int d_nthreads; // number of FFTW threads to use std::vector<gr_complex> d_tail; // state carried between blocks for overlap-add std::vector<float> d_taps; // stores time domain taps - volk::vector<gr_complex> d_xformed_taps; // Fourier xformed taps + volk::vector<gr_complex> d_xformed_taps; // Fourier xformed taps void compute_sizes(int ntaps); int tailsize() const { return d_ntaps - 1; } diff --git a/gr-filter/lib/fft_filter.cc b/gr-filter/lib/fft_filter.cc index 6a79f729cc..e08af0c2d0 100644 --- a/gr-filter/lib/fft_filter.cc +++ b/gr-filter/lib/fft_filter.cc @@ -24,9 +24,9 @@ #include "config.h" #endif -#include <boost/smart_ptr/make_unique.hpp> #include <gnuradio/filter/fft_filter.h> #include <volk/volk.h> +#include <boost/smart_ptr/make_unique.hpp> #include <cstring> #include <iostream> @@ -39,9 +39,7 @@ namespace kernel { fft_filter_fff::fft_filter_fff(int decimation, const std::vector<float>& taps, int nthreads) - : d_fftsize(-1), - d_decimation(decimation), - d_nthreads(nthreads) + : d_fftsize(-1), d_decimation(decimation), d_nthreads(nthreads) { set_taps(taps); } @@ -169,9 +167,7 @@ int fft_filter_fff::filter(int nitems, const float* input, float* output) fft_filter_ccc::fft_filter_ccc(int decimation, const std::vector<gr_complex>& taps, int nthreads) - : d_fftsize(-1), - d_decimation(decimation), - d_nthreads(nthreads) + : d_fftsize(-1), d_decimation(decimation), d_nthreads(nthreads) { set_taps(taps); } @@ -300,9 +296,7 @@ int fft_filter_ccc::filter(int nitems, const gr_complex* input, gr_complex* outp fft_filter_ccf::fft_filter_ccf(int decimation, const std::vector<float>& taps, int nthreads) - : d_fftsize(-1), - d_decimation(decimation), - d_nthreads(nthreads) + : d_fftsize(-1), d_decimation(decimation), d_nthreads(nthreads) { set_taps(taps); } diff --git a/gr-filter/lib/fft_filter_ccc_impl.cc b/gr-filter/lib/fft_filter_ccc_impl.cc index 40612f66ad..dd6fa8cbfd 100644 --- a/gr-filter/lib/fft_filter_ccc_impl.cc +++ b/gr-filter/lib/fft_filter_ccc_impl.cc @@ -66,15 +66,9 @@ void fft_filter_ccc_impl::set_taps(const std::vector<gr_complex>& taps) std::vector<gr_complex> fft_filter_ccc_impl::taps() const { return d_new_taps; } -void fft_filter_ccc_impl::set_nthreads(int n) -{ - d_filter.set_nthreads(n); -} +void fft_filter_ccc_impl::set_nthreads(int n) { d_filter.set_nthreads(n); } -int fft_filter_ccc_impl::nthreads() const -{ - return d_filter.nthreads(); -} +int fft_filter_ccc_impl::nthreads() const { return d_filter.nthreads(); } int fft_filter_ccc_impl::work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-filter/lib/fft_filter_ccf_impl.cc b/gr-filter/lib/fft_filter_ccf_impl.cc index 4b8d1ce3c6..6b76bbbb44 100644 --- a/gr-filter/lib/fft_filter_ccf_impl.cc +++ b/gr-filter/lib/fft_filter_ccf_impl.cc @@ -66,15 +66,9 @@ void fft_filter_ccf_impl::set_taps(const std::vector<float>& taps) std::vector<float> fft_filter_ccf_impl::taps() const { return d_new_taps; } -void fft_filter_ccf_impl::set_nthreads(int n) -{ - d_filter.set_nthreads(n); -} +void fft_filter_ccf_impl::set_nthreads(int n) { d_filter.set_nthreads(n); } -int fft_filter_ccf_impl::nthreads() const -{ - return d_filter.nthreads(); -} +int fft_filter_ccf_impl::nthreads() const { return d_filter.nthreads(); } int fft_filter_ccf_impl::work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-filter/lib/fft_filter_fff_impl.cc b/gr-filter/lib/fft_filter_fff_impl.cc index a3c5aba2bf..b8a7eb3cde 100644 --- a/gr-filter/lib/fft_filter_fff_impl.cc +++ b/gr-filter/lib/fft_filter_fff_impl.cc @@ -67,15 +67,9 @@ void fft_filter_fff_impl::set_taps(const std::vector<float>& taps) std::vector<float> fft_filter_fff_impl::taps() const { return d_new_taps; } -void fft_filter_fff_impl::set_nthreads(int n) -{ - d_filter.set_nthreads(n); -} +void fft_filter_fff_impl::set_nthreads(int n) { d_filter.set_nthreads(n); } -int fft_filter_fff_impl::nthreads() const -{ - return d_filter.nthreads(); -} +int fft_filter_fff_impl::nthreads() const { return d_filter.nthreads(); } int fft_filter_fff_impl::work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-filter/lib/pfb_synthesizer_ccf_impl.cc b/gr-filter/lib/pfb_synthesizer_ccf_impl.cc index 206b21dd8c..a155f0241a 100644 --- a/gr-filter/lib/pfb_synthesizer_ccf_impl.cc +++ b/gr-filter/lib/pfb_synthesizer_ccf_impl.cc @@ -26,8 +26,8 @@ #include "pfb_synthesizer_ccf_impl.h" #include <gnuradio/io_signature.h> -#include <cstdio> #include <algorithm> +#include <cstdio> namespace gr { namespace filter { diff --git a/gr-filter/lib/qa_fir_filter_with_buffer.cc b/gr-filter/lib/qa_fir_filter_with_buffer.cc index bc72edffc8..e26041d448 100644 --- a/gr-filter/lib/qa_fir_filter_with_buffer.cc +++ b/gr-filter/lib/qa_fir_filter_with_buffer.cc @@ -30,9 +30,9 @@ #include <gnuradio/types.h> #include <volk/volk.h> #include <boost/test/unit_test.hpp> +#include <algorithm> #include <cmath> #include <cstring> -#include <algorithm> using std::vector; diff --git a/gr-qtgui/include/gnuradio/qtgui/form_menus.h b/gr-qtgui/include/gnuradio/qtgui/form_menus.h index 0e1854762c..27f848708f 100644 --- a/gr-qtgui/include/gnuradio/qtgui/form_menus.h +++ b/gr-qtgui/include/gnuradio/qtgui/form_menus.h @@ -1138,8 +1138,7 @@ public: return d_act[3]; break; default: - throw std::runtime_error( - "TriggerModeMenu::getAction: unknown trigger mode."); + throw std::runtime_error("TriggerModeMenu::getAction: unknown trigger mode."); } } @@ -1193,8 +1192,7 @@ public: if (which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else - throw std::runtime_error( - "TriggerSlopeMenu::getAction: which out of range."); + throw std::runtime_error("TriggerSlopeMenu::getAction: which out of range."); } QAction* getAction(gr::qtgui::trigger_slope slope) @@ -1314,8 +1312,7 @@ public: if (which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else - throw std::runtime_error( - "NumberLayoutMenu::getAction: which out of range."); + throw std::runtime_error("NumberLayoutMenu::getAction: which out of range."); } QAction* getAction(gr::qtgui::graph_t layout) @@ -1331,8 +1328,7 @@ public: return d_act[1]; break; default: - throw std::runtime_error( - "NumberLayoutMenu::getAction: unknown layout type."); + throw std::runtime_error("NumberLayoutMenu::getAction: unknown layout type."); } } diff --git a/gr-qtgui/lib/constellationdisplayform.cc b/gr-qtgui/lib/constellationdisplayform.cc index 8f36522b40..7b5c08ef51 100644 --- a/gr-qtgui/lib/constellationdisplayform.cc +++ b/gr-qtgui/lib/constellationdisplayform.cc @@ -33,7 +33,7 @@ ConstellationDisplayForm::ConstellationDisplayForm(int nplots, QWidget* parent) d_int_validator->setBottom(0); d_layout = new QGridLayout(this); - d_layout->setContentsMargins( 0,0,0,0 ); + d_layout->setContentsMargins(0, 0, 0, 0); d_display_plot = new ConstellationDisplayPlot(nplots, this); d_layout->addWidget(d_display_plot, 0, 0); setLayout(d_layout); diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc index 5ce9b08534..4514cfa1f5 100644 --- a/gr-qtgui/lib/freqdisplayform.cc +++ b/gr-qtgui/lib/freqdisplayform.cc @@ -35,7 +35,7 @@ FreqDisplayForm::FreqDisplayForm(int nplots, QWidget* parent) d_int_validator->setBottom(0); d_layout = new QGridLayout(this); - d_layout->setContentsMargins( 0,0,0,0 ); + d_layout->setContentsMargins(0, 0, 0, 0); d_display_plot = new FrequencyDisplayPlot(nplots, this); d_layout->addWidget(d_display_plot, 0, 0); diff --git a/gr-qtgui/lib/histogramdisplayform.cc b/gr-qtgui/lib/histogramdisplayform.cc index 1062f869b4..5e6ce9c842 100644 --- a/gr-qtgui/lib/histogramdisplayform.cc +++ b/gr-qtgui/lib/histogramdisplayform.cc @@ -37,7 +37,7 @@ HistogramDisplayForm::HistogramDisplayForm(int nplots, QWidget* parent) d_int_validator->setBottom(0); d_layout = new QGridLayout(this); - d_layout->setContentsMargins( 0,0,0,0 ); + d_layout->setContentsMargins(0, 0, 0, 0); d_display_plot = new HistogramDisplayPlot(nplots, this); d_layout->addWidget(d_display_plot, 0, 0); setLayout(d_layout); diff --git a/gr-qtgui/lib/numberdisplayform.cc b/gr-qtgui/lib/numberdisplayform.cc index 4ff12cadfd..0edc881491 100644 --- a/gr-qtgui/lib/numberdisplayform.cc +++ b/gr-qtgui/lib/numberdisplayform.cc @@ -36,7 +36,7 @@ NumberDisplayForm::NumberDisplayForm(int nplots, gr::qtgui::graph_t type, QWidge d_graph_type = type; d_title = new QLabel(QString("")); d_layout = new QGridLayout(this); - d_layout->setContentsMargins( 0,0,0,0 ); + d_layout->setContentsMargins(0, 0, 0, 0); for (unsigned int i = 0; i < d_nplots; ++i) { d_min.push_back(+1e32); d_max.push_back(-1e32); diff --git a/gr-qtgui/lib/plot_raster.cc b/gr-qtgui/lib/plot_raster.cc index 312d344fb8..e36d4cc7dc 100644 --- a/gr-qtgui/lib/plot_raster.cc +++ b/gr-qtgui/lib/plot_raster.cc @@ -298,4 +298,3 @@ QwtInterval PlotTimeRaster::interval(Qt::Axis ax) const return d_data->data->interval(ax); } #endif - diff --git a/gr-qtgui/lib/plot_waterfall.cc b/gr-qtgui/lib/plot_waterfall.cc index 6c18544315..50f626cad7 100644 --- a/gr-qtgui/lib/plot_waterfall.cc +++ b/gr-qtgui/lib/plot_waterfall.cc @@ -279,4 +279,3 @@ QImage PlotWaterfall::renderImage(const QwtScaleMap& xMap, return std::move(image); } - diff --git a/gr-qtgui/lib/timerasterdisplayform.cc b/gr-qtgui/lib/timerasterdisplayform.cc index eeba22e632..9ea8022850 100644 --- a/gr-qtgui/lib/timerasterdisplayform.cc +++ b/gr-qtgui/lib/timerasterdisplayform.cc @@ -43,7 +43,7 @@ TimeRasterDisplayForm::TimeRasterDisplayForm( #endif d_layout = new QGridLayout(this); - d_layout->setContentsMargins( 0,0,0,0 ); + d_layout->setContentsMargins(0, 0, 0, 0); d_display_plot = new TimeRasterDisplayPlot(nplots, samp_rate, rows, cols, this); d_layout->addWidget(d_display_plot, 0, 0); setLayout(d_layout); diff --git a/gr-qtgui/lib/vector_sink_f_impl.h b/gr-qtgui/lib/vector_sink_f_impl.h index 02409e8fb1..dffa3c771a 100644 --- a/gr-qtgui/lib/vector_sink_f_impl.h +++ b/gr-qtgui/lib/vector_sink_f_impl.h @@ -44,7 +44,7 @@ private: float d_vecavg; const std::string d_name; //!< Initial title of the plot - int d_nconnections; //!< Number of connected streaming ports on input + int d_nconnections; //!< Number of connected streaming ports on input const pmt::pmt_t d_port; const pmt::pmt_t d_msg; //< Key of outgoing messages diff --git a/gr-qtgui/lib/vectordisplayform.cc b/gr-qtgui/lib/vectordisplayform.cc index 646afaecfb..b7860be50f 100644 --- a/gr-qtgui/lib/vectordisplayform.cc +++ b/gr-qtgui/lib/vectordisplayform.cc @@ -34,7 +34,7 @@ VectorDisplayForm::VectorDisplayForm(int nplots, QWidget* parent) d_int_validator->setBottom(0); d_layout = new QGridLayout(this); - d_layout->setContentsMargins( 0,0,0,0 ); + d_layout->setContentsMargins(0, 0, 0, 0); d_display_plot = new VectorDisplayPlot(nplots, this); d_layout->addWidget(d_display_plot, 0, 0); setLayout(d_layout); diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc index b94e6a8836..fcf2ed98bc 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -33,8 +33,8 @@ #include <volk/volk.h> #include <string.h> -#include <iostream> #include <algorithm> +#include <iostream> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/waterfalldisplayform.cc b/gr-qtgui/lib/waterfalldisplayform.cc index 9b57db62bb..56e5b3abcf 100644 --- a/gr-qtgui/lib/waterfalldisplayform.cc +++ b/gr-qtgui/lib/waterfalldisplayform.cc @@ -35,7 +35,7 @@ WaterfallDisplayForm::WaterfallDisplayForm(int nplots, QWidget* parent) d_int_validator->setBottom(0); d_layout = new QGridLayout(this); - d_layout->setContentsMargins( 0,0,0,0 ); + d_layout->setContentsMargins(0, 0, 0, 0); d_display_plot = new WaterfallDisplayPlot(nplots, this); d_layout->addWidget(d_display_plot, 0, 0); setLayout(d_layout); |