diff options
author | Thomas Habets <thomas@habets.se> | 2019-12-21 19:38:44 +0000 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2020-01-01 19:40:43 -0800 |
commit | 183a35ee554fd2034acbc5ac91e32abd046d5de1 (patch) | |
tree | eb77ac056d06a81c2a9e2c9f7b4901cac63077d3 /gr-qtgui | |
parent | 24725470892c770b8f0cd5f839588a8a5125caa6 (diff) |
Remove newlines from exception messages
Diffstat (limited to 'gr-qtgui')
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/form_menus.h | 36 | ||||
-rw-r--r-- | gr-qtgui/lib/DisplayPlot.cc | 2 | ||||
-rw-r--r-- | gr-qtgui/lib/TimeDomainDisplayPlot.cc | 4 | ||||
-rw-r--r-- | gr-qtgui/lib/TimeRasterDisplayPlot.cc | 4 | ||||
-rw-r--r-- | gr-qtgui/lib/numberdisplayform.cc | 8 | ||||
-rw-r--r-- | gr-qtgui/lib/sink_c_impl.cc | 2 | ||||
-rw-r--r-- | gr-qtgui/lib/time_raster_sink_b_impl.cc | 4 | ||||
-rw-r--r-- | gr-qtgui/lib/time_raster_sink_f_impl.cc | 4 | ||||
-rw-r--r-- | gr-qtgui/lib/timedisplayform.cc | 2 |
9 files changed, 33 insertions, 33 deletions
diff --git a/gr-qtgui/include/gnuradio/qtgui/form_menus.h b/gr-qtgui/include/gnuradio/qtgui/form_menus.h index 226adb5142..0e1854762c 100644 --- a/gr-qtgui/include/gnuradio/qtgui/form_menus.h +++ b/gr-qtgui/include/gnuradio/qtgui/form_menus.h @@ -92,7 +92,7 @@ public: if (which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else - throw std::runtime_error("LineColorMenu::getAction: which out of range.\n"); + throw std::runtime_error("LineColorMenu::getAction: which out of range."); } signals: @@ -172,7 +172,7 @@ public: if (which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else - throw std::runtime_error("LineWidthMenu::getAction: which out of range.\n"); + throw std::runtime_error("LineWidthMenu::getAction: which out of range."); } signals: @@ -242,7 +242,7 @@ public: if (which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else - throw std::runtime_error("LineStyleMenu::getAction: which out of range.\n"); + throw std::runtime_error("LineStyleMenu::getAction: which out of range."); } signals: @@ -326,7 +326,7 @@ public: if (which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else - throw std::runtime_error("LineMarkerMenu::getAction: which out of range.\n"); + throw std::runtime_error("LineMarkerMenu::getAction: which out of range."); } signals: @@ -399,7 +399,7 @@ public: if (which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else - throw std::runtime_error("MarkerAlphaMenu::getAction: which out of range.\n"); + throw std::runtime_error("MarkerAlphaMenu::getAction: which out of range."); } signals: @@ -655,7 +655,7 @@ public: if (which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else - throw std::runtime_error("FFTSizeMenu::getAction: which out of range.\n"); + throw std::runtime_error("FFTSizeMenu::getAction: which out of range."); } QAction* getActionFromSize(int size) @@ -668,7 +668,7 @@ public: return d_act[static_cast<int>(which)]; else throw std::runtime_error( - "FFTSizeMenu::getActionFromString: which out of range.\n"); + "FFTSizeMenu::getActionFromString: which out of range."); } // Or a non-predefined value, return Other else { @@ -763,7 +763,7 @@ public: if (which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else - throw std::runtime_error("FFTSizeMenu::getAction: which out of range.\n"); + throw std::runtime_error("FFTSizeMenu::getAction: which out of range."); } QAction* getActionFromAvg(float avg) @@ -873,7 +873,7 @@ public: if (which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else - throw std::runtime_error("FFTWindowMenu::getAction: which out of range.\n"); + throw std::runtime_error("FFTWindowMenu::getAction: which out of range."); } QAction* getActionFromWindow(gr::filter::firdes::win_type type) @@ -1035,7 +1035,7 @@ public: if (which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else - throw std::runtime_error("ColorMapMenu::getAction: which out of range.\n"); + throw std::runtime_error("ColorMapMenu::getAction: which out of range."); } signals: @@ -1119,7 +1119,7 @@ public: if (which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else - throw std::runtime_error("TriggerModeMenu::getAction: which out of range.\n"); + throw std::runtime_error("TriggerModeMenu::getAction: which out of range."); } QAction* getAction(gr::qtgui::trigger_mode mode) @@ -1139,7 +1139,7 @@ public: break; default: throw std::runtime_error( - "TriggerModeMenu::getAction: unknown trigger mode.\n"); + "TriggerModeMenu::getAction: unknown trigger mode."); } } @@ -1194,7 +1194,7 @@ public: return d_act[which]; else throw std::runtime_error( - "TriggerSlopeMenu::getAction: which out of range.\n"); + "TriggerSlopeMenu::getAction: which out of range."); } QAction* getAction(gr::qtgui::trigger_slope slope) @@ -1208,7 +1208,7 @@ public: break; default: throw std::runtime_error( - "TriggerSlopeMenu::getAction: unknown trigger slope.\n"); + "TriggerSlopeMenu::getAction: unknown trigger slope."); } } @@ -1256,7 +1256,7 @@ public: return d_act[which]; else throw std::runtime_error( - "TriggerChannelMenu::getAction: which out of range.\n"); + "TriggerChannelMenu::getAction: which out of range."); } @@ -1315,7 +1315,7 @@ public: return d_act[which]; else throw std::runtime_error( - "NumberLayoutMenu::getAction: which out of range.\n"); + "NumberLayoutMenu::getAction: which out of range."); } QAction* getAction(gr::qtgui::graph_t layout) @@ -1332,7 +1332,7 @@ public: break; default: throw std::runtime_error( - "NumberLayoutMenu::getAction: unknown layout type.\n"); + "NumberLayoutMenu::getAction: unknown layout type."); } } @@ -1398,7 +1398,7 @@ public: if (which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else - throw std::runtime_error("ColorMapMenu::getAction: which out of range.\n"); + throw std::runtime_error("ColorMapMenu::getAction: which out of range."); } signals: diff --git a/gr-qtgui/lib/DisplayPlot.cc b/gr-qtgui/lib/DisplayPlot.cc index 2989b1aaf8..f2cbf34315 100644 --- a/gr-qtgui/lib/DisplayPlot.cc +++ b/gr-qtgui/lib/DisplayPlot.cc @@ -414,7 +414,7 @@ void DisplayPlot::legendEntryChecked(const QVariant& plotItem, bool on, int inde { #if QWT_VERSION < 0x060100 std::runtime_error("DisplayPlot::legendEntryChecked with QVariant not enabled in " - "this version of QWT.\n"); + "this version of QWT."); #else QwtPlotItem* p = infoToItem(plotItem); legendEntryChecked(p, on); diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc index 4b60871f0a..f1272991bb 100644 --- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc +++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc @@ -427,7 +427,7 @@ void TimeDomainDisplayPlot::legendEntryChecked(const QVariant& plotItem, { #if QWT_VERSION < 0x060100 std::runtime_error("TimeDomainDisplayPlot::legendEntryChecked with QVariant not " - "enabled in this version of QWT.\n"); + "enabled in this version of QWT."); #else QwtPlotItem* p = infoToItem(plotItem); legendEntryChecked(p, on); @@ -567,7 +567,7 @@ void TimeDomainDisplayPlot::enableTagMarker(unsigned int which, bool en) d_tag_markers_en[which] = en; else throw std::runtime_error( - "TimeDomainDisplayPlot: enabled tag marker does not exist.\n"); + "TimeDomainDisplayPlot: enabled tag marker does not exist."); } const QColor TimeDomainDisplayPlot::getTagTextColor() { return d_tag_text_color; } diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc index 67e9fac6ee..1a26529cdf 100644 --- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc +++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc @@ -428,7 +428,7 @@ int TimeRasterDisplayPlot::getIntensityColorMapType(unsigned int which) const { if (which >= d_color_map_type.size()) throw std::runtime_error( - "TimerasterDisplayPlot::GetIntesityColorMap: invalid which.\n"); + "TimerasterDisplayPlot::GetIntesityColorMap: invalid which."); return d_color_map_type[which]; } @@ -455,7 +455,7 @@ void TimeRasterDisplayPlot::setIntensityColorMapType(const unsigned int which, { if (which >= d_color_map_type.size()) throw std::runtime_error( - "TimerasterDisplayPlot::setIntesityColorMap: invalid which.\n"); + "TimerasterDisplayPlot::setIntesityColorMap: invalid which."); if ((d_color_map_type[which] != newType) || ((newType == INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) && diff --git a/gr-qtgui/lib/numberdisplayform.cc b/gr-qtgui/lib/numberdisplayform.cc index 9c027671bc..658d54c670 100644 --- a/gr-qtgui/lib/numberdisplayform.cc +++ b/gr-qtgui/lib/numberdisplayform.cc @@ -432,7 +432,7 @@ void NumberDisplayForm::setTitle(const std::string& title) std::string NumberDisplayForm::unit(unsigned int which) const { if (static_cast<size_t>(which) >= d_unit.size()) - throw std::runtime_error("NumberDisplayForm::units: invalid 'which'.\n"); + throw std::runtime_error("NumberDisplayForm::units: invalid 'which'."); return d_unit[which]; } @@ -440,7 +440,7 @@ std::string NumberDisplayForm::unit(unsigned int which) const void NumberDisplayForm::setUnit(unsigned int which, const std::string& unit) { if (static_cast<size_t>(which) >= d_unit.size()) - throw std::runtime_error("NumberDisplayForm::setUnits: invalid 'which'.\n"); + throw std::runtime_error("NumberDisplayForm::setUnits: invalid 'which'."); d_unit[which] = unit; } @@ -448,7 +448,7 @@ void NumberDisplayForm::setUnit(unsigned int which, const std::string& unit) float NumberDisplayForm::factor(unsigned int which) const { if (static_cast<size_t>(which) >= d_factor.size()) - throw std::runtime_error("NumberDisplayForm::factor: invalid 'which'.\n"); + throw std::runtime_error("NumberDisplayForm::factor: invalid 'which'."); return d_factor[which]; } @@ -456,7 +456,7 @@ float NumberDisplayForm::factor(unsigned int which) const void NumberDisplayForm::setFactor(unsigned int which, float factor) { if (static_cast<size_t>(which) >= d_factor.size()) - throw std::runtime_error("NumberDisplayForm::setFactor: invalid 'which'.\n"); + throw std::runtime_error("NumberDisplayForm::setFactor: invalid 'which'."); d_factor[which] = factor; } diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc index d3feb9d16c..2c5fea9f6f 100644 --- a/gr-qtgui/lib/sink_c_impl.cc +++ b/gr-qtgui/lib/sink_c_impl.cc @@ -151,7 +151,7 @@ void sink_c_impl::initialize() check_set_qss(d_qApplication); if (d_center_freq < 0) { - throw std::runtime_error("sink_c_impl: Received bad center frequency.\n"); + throw std::runtime_error("sink_c_impl: Received bad center frequency."); } uint64_t maxBufferSize = 32768; diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc index 045c216b00..383fc9effd 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc @@ -311,7 +311,7 @@ void time_raster_sink_b_impl::set_multiplier(const std::vector<float>& mult) } } else { throw std::runtime_error( - "time_raster_sink_b_impl::set_multiplier incorrect dimensions.\n"); + "time_raster_sink_b_impl::set_multiplier incorrect dimensions."); } } @@ -331,7 +331,7 @@ void time_raster_sink_b_impl::set_offset(const std::vector<float>& offset) } } else { throw std::runtime_error( - "time_raster_sink_b_impl::set_offset incorrect dimensions.\n"); + "time_raster_sink_b_impl::set_offset incorrect dimensions."); } } diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc index d186f319da..c67ae080dc 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc @@ -310,7 +310,7 @@ void time_raster_sink_f_impl::set_multiplier(const std::vector<float>& mult) } } else { throw std::runtime_error( - "time_raster_sink_f_impl::set_multiplier incorrect dimensions.\n"); + "time_raster_sink_f_impl::set_multiplier incorrect dimensions."); } } @@ -326,7 +326,7 @@ void time_raster_sink_f_impl::set_offset(const std::vector<float>& offset) } } else { throw std::runtime_error( - "time_raster_sink_f_impl::set_offset incorrect dimensions.\n"); + "time_raster_sink_f_impl::set_offset incorrect dimensions."); } } diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc index d5ec4e7fde..570be33c6c 100644 --- a/gr-qtgui/lib/timedisplayform.cc +++ b/gr-qtgui/lib/timedisplayform.cc @@ -274,7 +274,7 @@ void TimeDisplayForm::setSampleRate(const double samprate) getPlot()->setSampleRate(samprate, units, strtime[iunit]); } else { - throw std::runtime_error("TimeDisplayForm: samprate must be > 0.\n"); + throw std::runtime_error("TimeDisplayForm: samprate must be > 0."); } } |