diff options
author | Marcus Müller <mmueller@gnuradio.org> | 2019-08-07 22:21:18 +0200 |
---|---|---|
committer | Marcus Müller <marcus@hostalia.de> | 2019-08-09 23:04:28 +0200 |
commit | d24b0c8f1ebe1a9681271c014659bf2ecc613e50 (patch) | |
tree | a18051dccba5266904571dce8a93128ad62e8453 /gr-qtgui/lib | |
parent | 65599ad299f030d302386fcda9bc0e3175d9a828 (diff) |
clang-format: Ordering all the includes
clang-format: ordering includes in gnuradio-runtime
clang-format: ordering includes in gr-filter
clang-format: ordering includes in gr-fft
clang-format: ordering includes in gr-audio
clang-format: ordering includes in gr-analog
clang-format: ordering includes in gr-fec
clang-format: ordering includes in gr-wavelet
clang-format: ordering includes in gr-zeromq
clang-format: ordering includes in gr-vocoder
clang-format: ordering includes in gr-video-sdl
clang-format: ordering includes in gr-trellis
clang-format: ordering includes in gr-blocks
clang-format: ordering includes in gr-digital
clang-format: ordering includes in gr-uhd
clang-format: ordering includes in gr-dtv
clang-format: ordering includes in gr-channels
clang-format: ordering includes in gr-qtgui
clang_format.py: re-enable include reordering
Diffstat (limited to 'gr-qtgui/lib')
40 files changed, 61 insertions, 61 deletions
diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc index 5400b341d3..6358b6ac19 100644 --- a/gr-qtgui/lib/ConstellationDisplayPlot.cc +++ b/gr-qtgui/lib/ConstellationDisplayPlot.cc @@ -25,8 +25,8 @@ #include <gnuradio/qtgui/ConstellationDisplayPlot.h> -#include <qwt_scale_draw.h> #include <qwt_legend.h> +#include <qwt_scale_draw.h> #include <QColor> #include <iostream> diff --git a/gr-qtgui/lib/DisplayPlot.cc b/gr-qtgui/lib/DisplayPlot.cc index b14021e315..2989b1aaf8 100644 --- a/gr-qtgui/lib/DisplayPlot.cc +++ b/gr-qtgui/lib/DisplayPlot.cc @@ -22,13 +22,13 @@ #include <gnuradio/qtgui/DisplayPlot.h> -#include <qwt_scale_draw.h> #include <qwt_legend.h> +#include <qwt_scale_draw.h> #include <QColor> +#include <QDebug> #include <cmath> #include <iostream> #include <stdexcept> -#include <QDebug> DisplayPlot::DisplayPlot(int nplots, QWidget* parent) : QwtPlot(parent), d_nplots(nplots), d_stop(false) diff --git a/gr-qtgui/lib/HistogramDisplayPlot.cc b/gr-qtgui/lib/HistogramDisplayPlot.cc index e57557f954..17a9faca7b 100644 --- a/gr-qtgui/lib/HistogramDisplayPlot.cc +++ b/gr-qtgui/lib/HistogramDisplayPlot.cc @@ -25,14 +25,14 @@ #include <gnuradio/qtgui/HistogramDisplayPlot.h> -#include <qwt_scale_draw.h> +#include <gnuradio/math.h> #include <qwt_legend.h> +#include <qwt_scale_draw.h> +#include <volk/volk.h> +#include <boost/math/special_functions/round.hpp> #include <QColor> #include <cmath> #include <iostream> -#include <volk/volk.h> -#include <gnuradio/math.h> -#include <boost/math/special_functions/round.hpp> #ifdef _MSC_VER #define copysign _copysign diff --git a/gr-qtgui/lib/SpectrumGUIClass.cc b/gr-qtgui/lib/SpectrumGUIClass.cc index 442ff6a4f9..e5be0ec7ed 100644 --- a/gr-qtgui/lib/SpectrumGUIClass.cc +++ b/gr-qtgui/lib/SpectrumGUIClass.cc @@ -26,8 +26,8 @@ #include <gnuradio/qtgui/SpectrumGUIClass.h> // Added by qt3to4: -#include <QEvent> #include <volk/volk.h> +#include <QEvent> const long SpectrumGUIClass::MAX_FFT_SIZE = 32768; const long SpectrumGUIClass::MIN_FFT_SIZE = 256; diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc index ad8a300abf..73796b54b3 100644 --- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc +++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc @@ -25,12 +25,12 @@ #include <gnuradio/qtgui/TimeDomainDisplayPlot.h> -#include <qwt_scale_draw.h> #include <qwt_legend.h> +#include <qwt_scale_draw.h> +#include <volk/volk.h> #include <QColor> #include <cmath> #include <iostream> -#include <volk/volk.h> class TimePrecisionClass { diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc index 5fc333c6b2..67e9fac6ee 100644 --- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc +++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc @@ -27,9 +27,9 @@ #include <gnuradio/qtgui/qtgui_types.h> #include <qwt_color_map.h> -#include <qwt_scale_draw.h> #include <qwt_legend.h> #include <qwt_plot_layout.h> +#include <qwt_scale_draw.h> #include <QColor> #include <iostream> diff --git a/gr-qtgui/lib/VectorDisplayPlot.cc b/gr-qtgui/lib/VectorDisplayPlot.cc index dbc1209b50..3e91de071a 100644 --- a/gr-qtgui/lib/VectorDisplayPlot.cc +++ b/gr-qtgui/lib/VectorDisplayPlot.cc @@ -26,8 +26,8 @@ #include <gnuradio/qtgui/VectorDisplayPlot.h> #include <gnuradio/qtgui/qtgui_types.h> -#include <qwt_scale_draw.h> #include <qwt_legend.h> +#include <qwt_scale_draw.h> #include <QColor> #include <iostream> diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc index cd87fc965d..af8e3b47f2 100644 --- a/gr-qtgui/lib/WaterfallDisplayPlot.cc +++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc @@ -27,9 +27,9 @@ #include <gnuradio/qtgui/qtgui_types.h> #include <qwt_color_map.h> -#include <qwt_scale_draw.h> #include <qwt_legend.h> #include <qwt_plot_layout.h> +#include <qwt_scale_draw.h> #include <QColor> #include <iostream> diff --git a/gr-qtgui/lib/ber_sink_b_impl.cc b/gr-qtgui/lib/ber_sink_b_impl.cc index b2f98981ce..3b8c6a9d89 100644 --- a/gr-qtgui/lib/ber_sink_b_impl.cc +++ b/gr-qtgui/lib/ber_sink_b_impl.cc @@ -22,9 +22,9 @@ #include "ber_sink_b_impl.h" +#include <gnuradio/fft/fft.h> #include <gnuradio/io_signature.h> #include <gnuradio/math.h> -#include <gnuradio/fft/fft.h> #include <volk/volk.h> #include <cmath> diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index a6024bbed7..a2f2f3458c 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -28,9 +28,9 @@ #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> +#include <qwt_symbol.h> #include <string.h> #include <volk/volk.h> -#include <qwt_symbol.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/constellationdisplayform.cc b/gr-qtgui/lib/constellationdisplayform.cc index b14a8a8fbd..ecfc4cb238 100644 --- a/gr-qtgui/lib/constellationdisplayform.cc +++ b/gr-qtgui/lib/constellationdisplayform.cc @@ -22,8 +22,8 @@ #include <gnuradio/qtgui/constellationdisplayform.h> -#include <cmath> #include <QMessageBox> +#include <cmath> #include <iostream> ConstellationDisplayForm::ConstellationDisplayForm(int nplots, QWidget* parent) diff --git a/gr-qtgui/lib/displayform.cc b/gr-qtgui/lib/displayform.cc index 23329902fd..85cfe9dd79 100644 --- a/gr-qtgui/lib/displayform.cc +++ b/gr-qtgui/lib/displayform.cc @@ -22,9 +22,9 @@ #include <gnuradio/qtgui/displayform.h> -#include <iostream> -#include <QPixmap> #include <QFileDialog> +#include <QPixmap> +#include <iostream> DisplayForm::DisplayForm(int nplots, QWidget* parent) : QWidget(parent), d_nplots(nplots), d_system_specified_flag(false) diff --git a/gr-qtgui/lib/edit_box_msg_impl.h b/gr-qtgui/lib/edit_box_msg_impl.h index b53dbbc4f4..7d71a7f41b 100644 --- a/gr-qtgui/lib/edit_box_msg_impl.h +++ b/gr-qtgui/lib/edit_box_msg_impl.h @@ -25,12 +25,12 @@ #include <gnuradio/qtgui/edit_box_msg.h> +#include <QComboBox> #include <QGroupBox> -#include <QVBoxLayout> #include <QHBoxLayout> -#include <QLineEdit> -#include <QComboBox> #include <QLabel> +#include <QLineEdit> +#include <QVBoxLayout> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc index 576c96a918..8372ce4b35 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.cc +++ b/gr-qtgui/lib/freq_sink_c_impl.cc @@ -29,8 +29,8 @@ #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <volk/volk.h> #include <qwt_symbol.h> +#include <volk/volk.h> #include <string.h> diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h index ac619bbe31..c9c51e8e75 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.h +++ b/gr-qtgui/lib/freq_sink_c_impl.h @@ -25,9 +25,9 @@ #include <gnuradio/qtgui/freq_sink_c.h> -#include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> #include <gnuradio/fft/fft_shift.h> +#include <gnuradio/filter/firdes.h> #include <gnuradio/high_res_timer.h> #include <gnuradio/qtgui/freqdisplayform.h> diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc index 54f40d2453..4f25ffb522 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -29,8 +29,8 @@ #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <volk/volk.h> #include <qwt_symbol.h> +#include <volk/volk.h> #include <string.h> diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h index c529ca6d7b..616069847a 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.h +++ b/gr-qtgui/lib/freq_sink_f_impl.h @@ -25,9 +25,9 @@ #include <gnuradio/qtgui/freq_sink_f.h> -#include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> #include <gnuradio/fft/fft_shift.h> +#include <gnuradio/filter/firdes.h> #include <gnuradio/high_res_timer.h> #include <gnuradio/qtgui/freqdisplayform.h> diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc index 432d30729f..2aafedd115 100644 --- a/gr-qtgui/lib/freqdisplayform.cc +++ b/gr-qtgui/lib/freqdisplayform.cc @@ -22,10 +22,10 @@ #include <gnuradio/qtgui/freqdisplayform.h> -#include <cmath> +#include <gnuradio/qtgui/freqcontrolpanel.h> #include <QMessageBox> #include <QSpacerItem> -#include <gnuradio/qtgui/freqcontrolpanel.h> +#include <cmath> #include <iostream> FreqDisplayForm::FreqDisplayForm(int nplots, QWidget* parent) diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc index 133725abc0..d66676a9c3 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.cc +++ b/gr-qtgui/lib/histogram_sink_f_impl.cc @@ -29,8 +29,8 @@ #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <volk/volk.h> #include <qwt_symbol.h> +#include <volk/volk.h> #include <string.h> diff --git a/gr-qtgui/lib/histogram_sink_f_impl.h b/gr-qtgui/lib/histogram_sink_f_impl.h index a80cb3855c..0d12dbc4e0 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.h +++ b/gr-qtgui/lib/histogram_sink_f_impl.h @@ -25,8 +25,8 @@ #include <gnuradio/qtgui/histogram_sink_f.h> -#include <gnuradio/qtgui/histogramdisplayform.h> #include <gnuradio/high_res_timer.h> +#include <gnuradio/qtgui/histogramdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/number_sink_impl.cc b/gr-qtgui/lib/number_sink_impl.cc index 05c8355554..1222b90433 100644 --- a/gr-qtgui/lib/number_sink_impl.cc +++ b/gr-qtgui/lib/number_sink_impl.cc @@ -26,11 +26,11 @@ #include "number_sink_impl.h" -#include <gnuradio/io_signature.h> #include <gnuradio/fft/fft.h> +#include <gnuradio/io_signature.h> -#include <volk/volk.h> #include <qwt_symbol.h> +#include <volk/volk.h> #include <string.h> #include <cmath> diff --git a/gr-qtgui/lib/number_sink_impl.h b/gr-qtgui/lib/number_sink_impl.h index 8a1ba06635..717d7a6e2a 100644 --- a/gr-qtgui/lib/number_sink_impl.h +++ b/gr-qtgui/lib/number_sink_impl.h @@ -25,9 +25,9 @@ #include <gnuradio/qtgui/number_sink.h> -#include <gnuradio/qtgui/numberdisplayform.h> #include <gnuradio/filter/single_pole_iir.h> #include <gnuradio/high_res_timer.h> +#include <gnuradio/qtgui/numberdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/numberdisplayform.cc b/gr-qtgui/lib/numberdisplayform.cc index 6fa0657546..f0ae16c7ae 100644 --- a/gr-qtgui/lib/numberdisplayform.cc +++ b/gr-qtgui/lib/numberdisplayform.cc @@ -23,8 +23,8 @@ #include <gnuradio/qtgui/numberdisplayform.h> #include <qwt_color_map.h> -#include <QMessageBox> #include <QFileDialog> +#include <QMessageBox> #include <cmath> #include <iostream> diff --git a/gr-qtgui/lib/plot_raster.cc b/gr-qtgui/lib/plot_raster.cc index a339ec64bb..8c5a33adbc 100644 --- a/gr-qtgui/lib/plot_raster.cc +++ b/gr-qtgui/lib/plot_raster.cc @@ -22,12 +22,12 @@ #include <gnuradio/qtgui/plot_raster.h> -#include <qimage.h> -#include <qpen.h> -#include <qpainter.h> +#include "qwt_color_map.h" #include "qwt_painter.h" #include "qwt_scale_map.h" -#include "qwt_color_map.h" +#include <qimage.h> +#include <qpainter.h> +#include <qpen.h> #include <iostream> diff --git a/gr-qtgui/lib/plot_waterfall.cc b/gr-qtgui/lib/plot_waterfall.cc index 4f9ba9ecf2..eaee256289 100644 --- a/gr-qtgui/lib/plot_waterfall.cc +++ b/gr-qtgui/lib/plot_waterfall.cc @@ -22,12 +22,12 @@ #include <gnuradio/qtgui/plot_waterfall.h> -#include <qimage.h> -#include <qpen.h> -#include <qpainter.h> +#include "qwt_color_map.h" #include "qwt_painter.h" #include "qwt_scale_map.h" -#include "qwt_color_map.h" +#include <qimage.h> +#include <qpainter.h> +#include <qpen.h> #if QWT_VERSION < 0x060000 #include "qwt_double_interval.h" diff --git a/gr-qtgui/lib/qtgui_util.cc b/gr-qtgui/lib/qtgui_util.cc index 3432ad302f..75befcd5b0 100644 --- a/gr-qtgui/lib/qtgui_util.cc +++ b/gr-qtgui/lib/qtgui_util.cc @@ -24,10 +24,10 @@ #include <gnuradio/prefs.h> +#include <qapplication.h> +#include <QCoreApplication> #include <QDebug> #include <QFile> -#include <QCoreApplication> -#include <qapplication.h> QString get_qt_style_sheet(QString filename) { diff --git a/gr-qtgui/lib/sink_c_impl.h b/gr-qtgui/lib/sink_c_impl.h index a016a1404f..4a341ace58 100644 --- a/gr-qtgui/lib/sink_c_impl.h +++ b/gr-qtgui/lib/sink_c_impl.h @@ -25,8 +25,8 @@ #include <gnuradio/qtgui/sink_c.h> -#include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> +#include <gnuradio/filter/firdes.h> #include <gnuradio/high_res_timer.h> #include <gnuradio/qtgui/SpectrumGUIClass.h> diff --git a/gr-qtgui/lib/sink_f_impl.h b/gr-qtgui/lib/sink_f_impl.h index ed37a703d2..8fe0ef1863 100644 --- a/gr-qtgui/lib/sink_f_impl.h +++ b/gr-qtgui/lib/sink_f_impl.h @@ -25,8 +25,8 @@ #include <gnuradio/qtgui/sink_f.h> -#include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> +#include <gnuradio/filter/firdes.h> #include <gnuradio/high_res_timer.h> #include <gnuradio/qtgui/SpectrumGUIClass.h> diff --git a/gr-qtgui/lib/timeRasterGlobalData.cc b/gr-qtgui/lib/timeRasterGlobalData.cc index 5f9d097077..caf9df9d97 100644 --- a/gr-qtgui/lib/timeRasterGlobalData.cc +++ b/gr-qtgui/lib/timeRasterGlobalData.cc @@ -25,8 +25,8 @@ #include <gnuradio/qtgui/timeRasterGlobalData.h> -#include <cstdio> #include <cmath> +#include <cstdio> #include <iostream> TimeRasterData::TimeRasterData(const double rows, const double cols) diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h b/gr-qtgui/lib/time_raster_sink_b_impl.h index 71dda47b4d..a6c73079f9 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.h +++ b/gr-qtgui/lib/time_raster_sink_b_impl.h @@ -25,8 +25,8 @@ #include <gnuradio/qtgui/time_raster_sink_b.h> -#include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> +#include <gnuradio/filter/firdes.h> #include <gnuradio/high_res_timer.h> #include <gnuradio/qtgui/timerasterdisplayform.h> diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h b/gr-qtgui/lib/time_raster_sink_f_impl.h index b760907427..e20204167e 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.h +++ b/gr-qtgui/lib/time_raster_sink_f_impl.h @@ -25,8 +25,8 @@ #include <gnuradio/qtgui/time_raster_sink_f.h> -#include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> +#include <gnuradio/filter/firdes.h> #include <gnuradio/high_res_timer.h> #include <gnuradio/qtgui/timerasterdisplayform.h> diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index c885b7290e..95ac4c2f69 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -26,12 +26,12 @@ #include "time_sink_c_impl.h" +#include <gnuradio/fft/fft.h> #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <gnuradio/fft/fft.h> -#include <volk/volk.h> #include <qwt_symbol.h> +#include <volk/volk.h> #include <string.h> diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h index d927e4a973..9db9bcb390 100644 --- a/gr-qtgui/lib/time_sink_c_impl.h +++ b/gr-qtgui/lib/time_sink_c_impl.h @@ -25,8 +25,8 @@ #include <gnuradio/qtgui/time_sink_c.h> -#include <gnuradio/qtgui/timedisplayform.h> #include <gnuradio/high_res_timer.h> +#include <gnuradio/qtgui/timedisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc index 07bacc5581..e834411e6a 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -26,14 +26,14 @@ #include "time_sink_f_impl.h" -#include <gnuradio/io_signature.h> #include <gnuradio/block_detail.h> #include <gnuradio/buffer.h> -#include <gnuradio/prefs.h> #include <gnuradio/fft/fft.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/prefs.h> -#include <volk/volk.h> #include <qwt_symbol.h> +#include <volk/volk.h> #include <string.h> diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h index 1f608657a2..9669be4470 100644 --- a/gr-qtgui/lib/time_sink_f_impl.h +++ b/gr-qtgui/lib/time_sink_f_impl.h @@ -25,8 +25,8 @@ #include <gnuradio/qtgui/time_sink_f.h> -#include <gnuradio/qtgui/timedisplayform.h> #include <gnuradio/high_res_timer.h> +#include <gnuradio/qtgui/timedisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc index 6380153395..1c50f57f15 100644 --- a/gr-qtgui/lib/timedisplayform.cc +++ b/gr-qtgui/lib/timedisplayform.cc @@ -23,9 +23,9 @@ #include <gnuradio/qtgui/timedisplayform.h> +#include <QGroupBox> #include <QMessageBox> #include <QSpacerItem> -#include <QGroupBox> #include <cmath> #include <iostream> diff --git a/gr-qtgui/lib/vector_sink_f_impl.cc b/gr-qtgui/lib/vector_sink_f_impl.cc index 92963b4a64..b38f14ca2c 100644 --- a/gr-qtgui/lib/vector_sink_f_impl.cc +++ b/gr-qtgui/lib/vector_sink_f_impl.cc @@ -29,8 +29,8 @@ #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <volk/volk.h> #include <qwt_symbol.h> +#include <volk/volk.h> #include <string.h> diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc index b2f5751eab..edbbfdc609 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -29,11 +29,11 @@ #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <volk/volk.h> #include <qwt_symbol.h> +#include <volk/volk.h> -#include <iostream> #include <string.h> +#include <iostream> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h b/gr-qtgui/lib/waterfall_sink_c_impl.h index 41fdf86e48..c03a9a1b58 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.h +++ b/gr-qtgui/lib/waterfall_sink_c_impl.h @@ -25,9 +25,9 @@ #include <gnuradio/qtgui/waterfall_sink_c.h> -#include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> #include <gnuradio/fft/fft_shift.h> +#include <gnuradio/filter/firdes.h> #include <gnuradio/high_res_timer.h> #include <gnuradio/qtgui/waterfalldisplayform.h> diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h index 036dd23e61..2613ef5e5d 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.h +++ b/gr-qtgui/lib/waterfall_sink_f_impl.h @@ -25,9 +25,9 @@ #include <gnuradio/qtgui/waterfall_sink_f.h> -#include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> #include <gnuradio/fft/fft_shift.h> +#include <gnuradio/filter/firdes.h> #include <gnuradio/high_res_timer.h> #include <gnuradio/qtgui/waterfalldisplayform.h> |