diff options
Diffstat (limited to 'gr-qtgui/lib')
-rw-r--r-- | gr-qtgui/lib/TimeDomainDisplayPlot.cc | 2 | ||||
-rw-r--r-- | gr-qtgui/lib/ber_sink_b_impl.cc | 2 | ||||
-rw-r--r-- | gr-qtgui/lib/const_sink_c_impl.cc | 4 | ||||
-rw-r--r-- | gr-qtgui/lib/edit_box_msg_impl.cc | 4 | ||||
-rw-r--r-- | gr-qtgui/lib/freq_sink_c_impl.cc | 6 | ||||
-rw-r--r-- | gr-qtgui/lib/freq_sink_f_impl.cc | 6 | ||||
-rw-r--r-- | gr-qtgui/lib/freqdisplayform.cc | 2 | ||||
-rw-r--r-- | gr-qtgui/lib/histogram_sink_f_impl.cc | 2 | ||||
-rw-r--r-- | gr-qtgui/lib/qtgui_util.cc | 2 | ||||
-rw-r--r-- | gr-qtgui/lib/sink_c_impl.cc | 2 | ||||
-rw-r--r-- | gr-qtgui/lib/sink_f_impl.cc | 2 | ||||
-rw-r--r-- | gr-qtgui/lib/spectrumdisplayform.cc | 2 | ||||
-rw-r--r-- | gr-qtgui/lib/time_raster_sink_b_impl.cc | 6 | ||||
-rw-r--r-- | gr-qtgui/lib/time_raster_sink_f_impl.cc | 6 | ||||
-rw-r--r-- | gr-qtgui/lib/time_sink_c_impl.cc | 4 | ||||
-rw-r--r-- | gr-qtgui/lib/time_sink_f_impl.cc | 4 | ||||
-rw-r--r-- | gr-qtgui/lib/timedisplayform.cc | 2 | ||||
-rw-r--r-- | gr-qtgui/lib/waterfall_sink_c_impl.cc | 4 | ||||
-rw-r--r-- | gr-qtgui/lib/waterfall_sink_f_impl.cc | 4 |
19 files changed, 33 insertions, 33 deletions
diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc index 73796b54b3..4b60871f0a 100644 --- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc +++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc @@ -260,7 +260,7 @@ void TimeDomainDisplayPlot::plotNewData(const std::vector<double*> dataPoints, // Plot and attach any new tags found. // First test if this was a complex input where real/imag get // split here into two stream. - if (tags.size() > 0) { + if (!tags.empty()) { bool cmplx = false; unsigned int mult = d_nplots / tags.size(); if (mult == 2) diff --git a/gr-qtgui/lib/ber_sink_b_impl.cc b/gr-qtgui/lib/ber_sink_b_impl.cc index 3b8c6a9d89..e87ce4db06 100644 --- a/gr-qtgui/lib/ber_sink_b_impl.cc +++ b/gr-qtgui/lib/ber_sink_b_impl.cc @@ -109,7 +109,7 @@ ber_sink_b_impl::ber_sink_b_impl(std::vector<float> esnos, if (curvenames.size() == (unsigned int)curves) { for (int j = 0; j < curves; j++) { - if (curvenames[j] != "") { + if (!curvenames[j].empty()) { set_line_label(j, curvenames[j]); } } diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index a2f2f3458c..852f6ee109 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -138,7 +138,7 @@ void const_sink_c_impl::initialize() d_main_gui = new ConstellationDisplayForm(numplots, d_parent); d_main_gui->setNPoints(d_size); - if (d_name.size() > 0) + if (!d_name.empty()) set_title(d_name); // initialize update time to 10 times a second @@ -364,7 +364,7 @@ void const_sink_c_impl::_test_trigger_tags(int nitems) uint64_t nr = nitems_read(d_trigger_channel); std::vector<gr::tag_t> tags; get_tags_in_range(tags, d_trigger_channel, nr, nr + nitems, d_trigger_tag_key); - if (tags.size() > 0) { + if (!tags.empty()) { d_triggered = true; trigger_index = tags[0].offset - nr; d_start = d_index + trigger_index; diff --git a/gr-qtgui/lib/edit_box_msg_impl.cc b/gr-qtgui/lib/edit_box_msg_impl.cc index 0339276276..67fa5e9b39 100644 --- a/gr-qtgui/lib/edit_box_msg_impl.cc +++ b/gr-qtgui/lib/edit_box_msg_impl.cc @@ -106,7 +106,7 @@ edit_box_msg_impl::edit_box_msg_impl(data_type_t type, d_key->setFixedWidth(width); // Verify that a default key has been set or emit an error - if (key.size() == 0) { + if (key.empty()) { throw std::runtime_error( "When using static + pair mode, please set a default key."); } @@ -118,7 +118,7 @@ edit_box_msg_impl::edit_box_msg_impl(data_type_t type, } d_label = NULL; - if (label != "") { + if (!label.empty()) { d_label = new QLabel(QString(label.c_str())); d_vlayout->addWidget(d_label); } diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc index 8372ce4b35..b692f458ac 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.cc +++ b/gr-qtgui/lib/freq_sink_c_impl.cc @@ -171,7 +171,7 @@ void freq_sink_c_impl::initialize() set_fft_size(d_fftsize); set_frequency_range(d_center_freq, d_bandwidth); - if (d_name.size() > 0) + if (!d_name.empty()) set_title(d_name); set_output_multiple(d_fftsize); @@ -387,7 +387,7 @@ void freq_sink_c_impl::_reset() void freq_sink_c_impl::fft(float* data_out, const gr_complex* data_in, int size) { - if (d_window.size()) { + if (!d_window.empty()) { volk_32fc_32f_multiply_32fc(d_fft->get_inbuf(), data_in, &d_window.front(), size); } else { memcpy(d_fft->get_inbuf(), data_in, sizeof(gr_complex) * size); @@ -529,7 +529,7 @@ void freq_sink_c_impl::_test_trigger_tags(int start, int nitems) std::vector<gr::tag_t> tags; get_tags_in_range( tags, d_trigger_channel, nr + start, nr + start + nitems, d_trigger_tag_key); - if (tags.size() > 0) { + if (!tags.empty()) { d_triggered = true; d_index = tags[0].offset - nr; d_trigger_count = 0; diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc index 4f25ffb522..c14bfc31fd 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -172,7 +172,7 @@ void freq_sink_f_impl::initialize() set_fft_size(d_fftsize); set_frequency_range(d_center_freq, d_bandwidth); - if (d_name.size() > 0) + if (!d_name.empty()) set_title(d_name); set_output_multiple(d_fftsize); @@ -394,7 +394,7 @@ void freq_sink_f_impl::fft(float* data_out, const float* data_in, int size) for (int i = 0; i < size; i++) dst[i] = data_in[i]; - if (d_window.size()) { + if (!d_window.empty()) { volk_32fc_32f_multiply_32fc(d_fft->get_inbuf(), dst, &d_window.front(), size); } @@ -533,7 +533,7 @@ void freq_sink_f_impl::_test_trigger_tags(int start, int nitems) std::vector<gr::tag_t> tags; get_tags_in_range( tags, d_trigger_channel, nr + start, nr + start + nitems, d_trigger_tag_key); - if (tags.size() > 0) { + if (!tags.empty()) { d_triggered = true; d_index = tags[0].offset - nr; d_trigger_count = 0; diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc index 2aafedd115..02e9e06301 100644 --- a/gr-qtgui/lib/freqdisplayform.cc +++ b/gr-qtgui/lib/freqdisplayform.cc @@ -423,7 +423,7 @@ void FreqDisplayForm::updateTrigger(gr::qtgui::trigger_mode mode) } // if tag mode, popup tag key box to set - if ((d_trig_tag_key == "") && (d_trig_mode == gr::qtgui::TRIG_MODE_TAG)) + if ((d_trig_tag_key.empty()) && (d_trig_mode == gr::qtgui::TRIG_MODE_TAG)) d_tr_tag_key_act->activate(QAction::Trigger); emit signalReplot(); diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc index d66676a9c3..d16de932ca 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.cc +++ b/gr-qtgui/lib/histogram_sink_f_impl.cc @@ -137,7 +137,7 @@ void histogram_sink_f_impl::initialize() d_main_gui->setNPoints(d_size); d_main_gui->setXaxis(d_xmin, d_xmax); - if (d_name.size() > 0) + if (!d_name.empty()) set_title(d_name); // initialize update time to 10 times a second diff --git a/gr-qtgui/lib/qtgui_util.cc b/gr-qtgui/lib/qtgui_util.cc index 75befcd5b0..c7f57b6161 100644 --- a/gr-qtgui/lib/qtgui_util.cc +++ b/gr-qtgui/lib/qtgui_util.cc @@ -104,7 +104,7 @@ QwtPickerMachine* QwtDblClickPlotPicker::stateMachine(int n) const void check_set_qss(QApplication* app) { std::string qssfile = gr::prefs::singleton()->get_string("qtgui", "qss", ""); - if (qssfile.size() > 0) { + if (!qssfile.empty()) { QString sstext = get_qt_style_sheet(QString(qssfile.c_str())); app->setStyleSheet(sstext); } diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc index 0caa2f0782..d3feb9d16c 100644 --- a/gr-qtgui/lib/sink_c_impl.cc +++ b/gr-qtgui/lib/sink_c_impl.cc @@ -238,7 +238,7 @@ void sink_c_impl::set_update_time(double t) void sink_c_impl::fft(float* data_out, const gr_complex* data_in, int size) { - if (d_window.size()) { + if (!d_window.empty()) { volk_32fc_32f_multiply_32fc(d_fft->get_inbuf(), data_in, &d_window.front(), size); } else { memcpy(d_fft->get_inbuf(), data_in, sizeof(gr_complex) * size); diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc index 635e293a0f..418b630b78 100644 --- a/gr-qtgui/lib/sink_f_impl.cc +++ b/gr-qtgui/lib/sink_f_impl.cc @@ -228,7 +228,7 @@ void sink_f_impl::set_update_time(double t) void sink_f_impl::fft(float* data_out, const float* data_in, int size) { - if (d_window.size()) { + if (!d_window.empty()) { gr_complex* dst = d_fft->get_inbuf(); for (int i = 0; i < size; i++) // apply window dst[i] = data_in[i] * d_window[i]; diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc index 68db7be975..1c7a157c34 100644 --- a/gr-qtgui/lib/spectrumdisplayform.cc +++ b/gr-qtgui/lib/spectrumdisplayform.cc @@ -484,7 +484,7 @@ void SpectrumDisplayForm::setAverageCount(const int newCount) void SpectrumDisplayForm::_averageHistory(const double* newBuffer) { if (_numRealDataPoints > 0) { - if (_historyVector->size() > 0) { + if (!_historyVector->empty()) { memcpy(_historyVector->operator[](_historyEntry), newBuffer, _numRealDataPoints * sizeof(double)); diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc index c08e95a8d4..045c216b00 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc @@ -146,7 +146,7 @@ void time_raster_sink_b_impl::initialize() d_main_gui = new TimeRasterDisplayForm(numplots, d_samp_rate, d_rows, d_cols, 1, d_parent); - if (d_name.size() > 0) + if (!d_name.empty()) set_title(d_name); // initialize update time to 10 times a second @@ -297,7 +297,7 @@ double time_raster_sink_b_impl::num_cols() { return d_main_gui->numCols(); } void time_raster_sink_b_impl::set_multiplier(const std::vector<float>& mult) { - if (mult.size() == 0) { + if (mult.empty()) { for (int i = 0; i < d_nconnections + 1; i++) { d_mult[i] = 1.0f; } @@ -317,7 +317,7 @@ void time_raster_sink_b_impl::set_multiplier(const std::vector<float>& mult) void time_raster_sink_b_impl::set_offset(const std::vector<float>& offset) { - if (offset.size() == 0) { + if (offset.empty()) { for (int i = 0; i < d_nconnections + 1; i++) { d_offset[i] = 0.0f; } diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc index 05c37963b4..d186f319da 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc @@ -144,7 +144,7 @@ void time_raster_sink_f_impl::initialize() d_main_gui = new TimeRasterDisplayForm(numplots, d_samp_rate, d_rows, d_cols, 1, d_parent); - if (d_name.size() > 0) + if (!d_name.empty()) set_title(d_name); // initialize update time to 10 times a second @@ -300,7 +300,7 @@ double time_raster_sink_f_impl::num_cols() { return d_main_gui->numCols(); } void time_raster_sink_f_impl::set_multiplier(const std::vector<float>& mult) { - if (mult.size() == 0) { + if (mult.empty()) { for (int i = 0; i < d_nconnections; i++) { d_mult[i] = 1.0f; } @@ -316,7 +316,7 @@ void time_raster_sink_f_impl::set_multiplier(const std::vector<float>& mult) void time_raster_sink_f_impl::set_offset(const std::vector<float>& offset) { - if (offset.size() == 0) { + if (offset.empty()) { for (int i = 0; i < d_nconnections; i++) { d_offset[i] = 0.0f; } diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index 95ac4c2f69..a05672f831 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -151,7 +151,7 @@ void time_sink_c_impl::initialize() d_main_gui->setNPoints(d_size); d_main_gui->setSampleRate(d_samp_rate); - if (d_name.size() > 0) + if (!d_name.empty()) set_title(d_name); // initialize update time to 10 times a second @@ -496,7 +496,7 @@ void time_sink_c_impl::_test_trigger_tags(int nitems) std::vector<gr::tag_t> tags; get_tags_in_range( tags, d_trigger_channel / 2, nr, nr + nitems + 1, d_trigger_tag_key); - if (tags.size() > 0) { + if (!tags.empty()) { trigger_index = tags[0].offset - nr; int start = d_index + trigger_index - d_trigger_delay - 1; if (start >= 0) { diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc index e834411e6a..df13998d75 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -147,7 +147,7 @@ void time_sink_f_impl::initialize() d_main_gui->setNPoints(d_size); d_main_gui->setSampleRate(d_samp_rate); - if (d_name.size() > 0) + if (!d_name.empty()) set_title(d_name); // initialize update time to 10 times a second @@ -489,7 +489,7 @@ void time_sink_f_impl::_test_trigger_tags(int nitems) uint64_t nr = nitems_read(d_trigger_channel); std::vector<gr::tag_t> tags; get_tags_in_range(tags, d_trigger_channel, nr, nr + nitems + 1, d_trigger_tag_key); - if (tags.size() > 0) { + if (!tags.empty()) { trigger_index = tags[0].offset - nr; int start = d_index + trigger_index - d_trigger_delay - 1; if (start >= 0) { diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc index 1c50f57f15..d5ec4e7fde 100644 --- a/gr-qtgui/lib/timedisplayform.cc +++ b/gr-qtgui/lib/timedisplayform.cc @@ -376,7 +376,7 @@ void TimeDisplayForm::updateTrigger(gr::qtgui::trigger_mode mode) } // if tag mode, popup tag key box to set - if ((d_trig_tag_key == "") && (d_trig_mode == gr::qtgui::TRIG_MODE_TAG)) + if ((d_trig_tag_key.empty()) && (d_trig_mode == gr::qtgui::TRIG_MODE_TAG)) d_tr_tag_key_act->activate(QAction::Trigger); emit signalReplot(); diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc index edbbfdc609..121023d528 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -182,7 +182,7 @@ void waterfall_sink_c_impl::initialize() set_fft_size(d_fftsize); set_frequency_range(d_center_freq, d_bandwidth); - if (d_name.size() > 0) + if (!d_name.empty()) set_title(d_name); // initialize update time to 10 times a second @@ -318,7 +318,7 @@ void waterfall_sink_c_impl::disable_legend() { d_main_gui->disableLegend(); } void waterfall_sink_c_impl::fft(float* data_out, const gr_complex* data_in, int size) { - if (d_window.size()) { + if (!d_window.empty()) { volk_32fc_32f_multiply_32fc(d_fft->get_inbuf(), data_in, &d_window.front(), size); } else { memcpy(d_fft->get_inbuf(), data_in, sizeof(gr_complex) * size); diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc index e523ac328e..aa1037a472 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc @@ -181,7 +181,7 @@ void waterfall_sink_f_impl::initialize() set_fft_size(d_fftsize); set_frequency_range(d_center_freq, d_bandwidth); - if (d_name.size() > 0) + if (!d_name.empty()) set_title(d_name); // initialize update time to 10 times a second @@ -327,7 +327,7 @@ void waterfall_sink_f_impl::fft(float* data_out, const float* data_in, int size) for (int i = 0; i < size; i++) dst[i] = data_in[i]; - if (d_window.size()) { + if (!d_window.empty()) { volk_32fc_32f_multiply_32fc(d_fft->get_inbuf(), dst, &d_window.front(), size); } |