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 | |
| 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')
80 files changed, 155 insertions, 155 deletions
diff --git a/gr-qtgui/examples/c++/display_qt.h b/gr-qtgui/examples/c++/display_qt.h index 18e5c4b470..819b24407a 100644 --- a/gr-qtgui/examples/c++/display_qt.h +++ b/gr-qtgui/examples/c++/display_qt.h @@ -21,21 +21,21 @@ // Q_MOC_RUN is a workaround for a QT4 + Boost version issue #ifndef Q_MOC_RUN -#include <gnuradio/top_block.h> -#include <gnuradio/analog/sig_source.h> #include <gnuradio/analog/noise_source.h> +#include <gnuradio/analog/sig_source.h> #include <gnuradio/blocks/add_blk.h> #include <gnuradio/blocks/throttle.h> -#include <gnuradio/qtgui/time_sink_f.h> +#include <gnuradio/fft/window.h> #include <gnuradio/qtgui/freq_sink_f.h> -#include <gnuradio/qtgui/waterfall_sink_f.h> #include <gnuradio/qtgui/histogram_sink_f.h> -#include <gnuradio/fft/window.h> +#include <gnuradio/qtgui/time_sink_f.h> +#include <gnuradio/qtgui/waterfall_sink_f.h> +#include <gnuradio/top_block.h> #endif -#include <QWidget> #include <QHBoxLayout> #include <QTabWidget> +#include <QWidget> using namespace gr; diff --git a/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h index bca8c6385e..1b9f8b643a 100644 --- a/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h @@ -23,10 +23,10 @@ #ifndef CONSTELLATION_DISPLAY_PLOT_H #define CONSTELLATION_DISPLAY_PLOT_H +#include <gnuradio/qtgui/DisplayPlot.h> #include <stdint.h> #include <cstdio> #include <vector> -#include <gnuradio/qtgui/DisplayPlot.h> /*! * \brief QWidget for displaying constellaton (I&Q) plots. diff --git a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h index bb523c0c2d..d1cf806f5f 100644 --- a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h @@ -23,22 +23,22 @@ #ifndef DOMAIN_DISPLAY_PLOT_H #define DOMAIN_DISPLAY_PLOT_H -#include <stdint.h> -#include <cstdio> -#include <vector> -#include <qwt_plot.h> +#include <gnuradio/qtgui/utils.h> +#include <qwt_legend.h> #include <qwt_painter.h> +#include <qwt_plot.h> #include <qwt_plot_canvas.h> #include <qwt_plot_curve.h> -#include <qwt_scale_engine.h> -#include <qwt_scale_widget.h> -#include <qwt_plot_zoomer.h> -#include <qwt_plot_panner.h> #include <qwt_plot_magnifier.h> #include <qwt_plot_marker.h> +#include <qwt_plot_panner.h> +#include <qwt_plot_zoomer.h> +#include <qwt_scale_engine.h> +#include <qwt_scale_widget.h> #include <qwt_symbol.h> -#include <qwt_legend.h> -#include <gnuradio/qtgui/utils.h> +#include <stdint.h> +#include <cstdio> +#include <vector> #if QWT_VERSION >= 0x060000 #include <qwt_compat.h> diff --git a/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h index 7c6f2db3d2..ebb6b2e480 100644 --- a/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h @@ -23,10 +23,10 @@ #ifndef FREQUENCY_DISPLAY_PLOT_HPP #define FREQUENCY_DISPLAY_PLOT_HPP +#include <gnuradio/qtgui/DisplayPlot.h> #include <stdint.h> #include <cstdio> #include <vector> -#include <gnuradio/qtgui/DisplayPlot.h> /*! * \brief QWidget for displaying frequency domain (PSD) plots. diff --git a/gr-qtgui/include/gnuradio/qtgui/HistogramDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/HistogramDisplayPlot.h index 0b342a0edf..5c660989b9 100644 --- a/gr-qtgui/include/gnuradio/qtgui/HistogramDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/HistogramDisplayPlot.h @@ -23,10 +23,10 @@ #ifndef HISTOGRAM_DISPLAY_PLOT_H #define HISTOGRAM_DISPLAY_PLOT_H +#include <gnuradio/qtgui/DisplayPlot.h> #include <stdint.h> #include <cstdio> #include <vector> -#include <gnuradio/qtgui/DisplayPlot.h> /*! * \brief QWidget for displaying time domain plots. diff --git a/gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h b/gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h index 1e3402b043..adca221876 100644 --- a/gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h +++ b/gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h @@ -23,12 +23,12 @@ #ifndef SPECTRUM_GUI_CLASS_HPP #define SPECTRUM_GUI_CLASS_HPP +#include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <gnuradio/thread/thread.h> -#include <qwidget.h> #include <qapplication.h> #include <qlabel.h> #include <qslider.h> -#include <gnuradio/qtgui/spectrumUpdateEvents.h> +#include <qwidget.h> class SpectrumDisplayForm; #include <gnuradio/qtgui/spectrumdisplayform.h> @@ -36,8 +36,8 @@ class SpectrumDisplayForm; #include <cmath> #include <complex> -#include <vector> #include <string> +#include <vector> /*! * \brief QWidget class for controlling plotting. diff --git a/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h index ab1402cd24..3af3bd8bc6 100644 --- a/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h @@ -23,11 +23,11 @@ #ifndef TIME_DOMAIN_DISPLAY_PLOT_H #define TIME_DOMAIN_DISPLAY_PLOT_H +#include <gnuradio/qtgui/DisplayPlot.h> +#include <gnuradio/tags.h> #include <stdint.h> #include <cstdio> #include <vector> -#include <gnuradio/qtgui/DisplayPlot.h> -#include <gnuradio/tags.h> /*! * \brief QWidget for displaying time domain plots. diff --git a/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h index 62bab30839..20047ac311 100644 --- a/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h @@ -23,14 +23,14 @@ #ifndef TIMERASTER_DISPLAY_PLOT_H #define TIMERASTER_DISPLAY_PLOT_H +#include <gnuradio/high_res_timer.h> +#include <gnuradio/qtgui/DisplayPlot.h> +#include <gnuradio/qtgui/plot_raster.h> +#include <gnuradio/qtgui/timeRasterGlobalData.h> +#include <qwt_plot_rasteritem.h> #include <stdint.h> #include <cstdio> #include <vector> -#include <qwt_plot_rasteritem.h> -#include <gnuradio/qtgui/DisplayPlot.h> -#include <gnuradio/qtgui/timeRasterGlobalData.h> -#include <gnuradio/qtgui/plot_raster.h> -#include <gnuradio/high_res_timer.h> #if QWT_VERSION < 0x060000 #include <gnuradio/qtgui/plot_waterfall.h> diff --git a/gr-qtgui/include/gnuradio/qtgui/VectorDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/VectorDisplayPlot.h index 413a929809..df58d6ba5e 100644 --- a/gr-qtgui/include/gnuradio/qtgui/VectorDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/VectorDisplayPlot.h @@ -23,10 +23,10 @@ #ifndef VECTOR_DISPLAY_PLOT_HPP #define VECTOR_DISPLAY_PLOT_HPP +#include <gnuradio/qtgui/DisplayPlot.h> #include <stdint.h> #include <cstdio> #include <vector> -#include <gnuradio/qtgui/DisplayPlot.h> /*! * \brief QWidget for displaying 1D-vector plots. diff --git a/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h index ccb02dae51..3c53906cbf 100644 --- a/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h @@ -23,13 +23,13 @@ #ifndef WATERFALL_DISPLAY_PLOT_H #define WATERFALL_DISPLAY_PLOT_H +#include <gnuradio/high_res_timer.h> +#include <gnuradio/qtgui/DisplayPlot.h> +#include <gnuradio/qtgui/waterfallGlobalData.h> +#include <qwt_plot_spectrogram.h> #include <stdint.h> #include <cstdio> #include <vector> -#include <qwt_plot_spectrogram.h> -#include <gnuradio/qtgui/DisplayPlot.h> -#include <gnuradio/qtgui/waterfallGlobalData.h> -#include <gnuradio/high_res_timer.h> #if QWT_VERSION < 0x060000 #include <gnuradio/qtgui/plot_waterfall.h> diff --git a/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h b/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h index e1f6516e41..c39e81a9d8 100644 --- a/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h +++ b/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h @@ -27,8 +27,8 @@ #include <Python.h> #endif -#include <gnuradio/qtgui/api.h> #include <gnuradio/block.h> +#include <gnuradio/qtgui/api.h> #include <qapplication.h> diff --git a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h index 263a982ee7..7a481b5132 100644 --- a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h @@ -27,11 +27,11 @@ #include <Python.h> #endif +#include <gnuradio/filter/firdes.h> #include <gnuradio/qtgui/api.h> #include <gnuradio/qtgui/trigger_mode.h> #include <gnuradio/sync_block.h> #include <qapplication.h> -#include <gnuradio/filter/firdes.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h index ac37867be6..955bec2bc1 100644 --- a/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h @@ -23,9 +23,9 @@ #ifndef CONSTELLATION_DISPLAY_FORM_H #define CONSTELLATION_DISPLAY_FORM_H +#include <gnuradio/qtgui/ConstellationDisplayPlot.h> #include <gnuradio/qtgui/api.h> #include <gnuradio/qtgui/spectrumUpdateEvents.h> -#include <gnuradio/qtgui/ConstellationDisplayPlot.h> #include <QtGui/QtGui> #include <vector> diff --git a/gr-qtgui/include/gnuradio/qtgui/displayform.h b/gr-qtgui/include/gnuradio/qtgui/displayform.h index 1142b95955..d19ea8f692 100644 --- a/gr-qtgui/include/gnuradio/qtgui/displayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/displayform.h @@ -23,8 +23,8 @@ #ifndef DISPLAY_FORM_H #define DISPLAY_FORM_H -#include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <gnuradio/qtgui/api.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <QtGui/QtGui> #include <vector> diff --git a/gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h b/gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h index b8ae1e7553..4299bbb94c 100644 --- a/gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h +++ b/gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h @@ -27,9 +27,9 @@ #include <Python.h> #endif -#include <gnuradio/qtgui/qtgui_types.h> -#include <gnuradio/qtgui/api.h> #include <gnuradio/block.h> +#include <gnuradio/qtgui/api.h> +#include <gnuradio/qtgui/qtgui_types.h> #include <qapplication.h> namespace gr { diff --git a/gr-qtgui/include/gnuradio/qtgui/form_menus.h b/gr-qtgui/include/gnuradio/qtgui/form_menus.h index b2a70dcec6..dcb32fbc42 100644 --- a/gr-qtgui/include/gnuradio/qtgui/form_menus.h +++ b/gr-qtgui/include/gnuradio/qtgui/form_menus.h @@ -23,20 +23,20 @@ #ifndef FORM_MENUS_H #define FORM_MENUS_H +#include <QtGui/QDoubleValidator> +#include <QtGui/QIntValidator> +#include <QtGui/QtGui> #include <stdexcept> #include <vector> -#include <QtGui/QtGui> -#include <QtGui/QIntValidator> -#include <QtGui/QDoubleValidator> #if QT_VERSION >= 0x050000 #include <QtWidgets/QtWidgets> #endif -#include <qwt_symbol.h> #include <gnuradio/filter/firdes.h> #include <gnuradio/qtgui/qtgui_types.h> #include <gnuradio/qtgui/trigger_mode.h> +#include <qwt_symbol.h> class LineColorMenu : public QMenu { diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h index 93bacfbc11..d172e49599 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h @@ -27,11 +27,11 @@ #include <Python.h> #endif +#include <gnuradio/filter/firdes.h> #include <gnuradio/qtgui/api.h> #include <gnuradio/qtgui/trigger_mode.h> #include <gnuradio/sync_block.h> #include <qapplication.h> -#include <gnuradio/filter/firdes.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h index 3df7ba1317..81be9a6874 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h @@ -27,11 +27,11 @@ #include <Python.h> #endif +#include <gnuradio/filter/firdes.h> #include <gnuradio/qtgui/api.h> #include <gnuradio/qtgui/trigger_mode.h> #include <gnuradio/sync_block.h> #include <qapplication.h> -#include <gnuradio/filter/firdes.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h index 907e2ff72a..bd4a6e8820 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h +++ b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h @@ -23,16 +23,16 @@ #ifndef FREQ_CONTROL_PANEL_H #define FREQ_CONTROL_PANEL_H +#include <gnuradio/qtgui/displayform.h> +#include <gnuradio/qtgui/freqdisplayform.h> #include <QtGui/QtGui> -#include <vector> -#include <QSlider> -#include <QComboBox> #include <QCheckBox> -#include <QPushButton> -#include <QLabel> +#include <QComboBox> #include <QHBoxLayout> -#include <gnuradio/qtgui/displayform.h> -#include <gnuradio/qtgui/freqdisplayform.h> +#include <QLabel> +#include <QPushButton> +#include <QSlider> +#include <vector> class FreqControlPanel : public QVBoxLayout { diff --git a/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h index b3350a4141..5c09e15202 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h @@ -23,11 +23,11 @@ #ifndef FREQ_DISPLAY_FORM_H #define FREQ_DISPLAY_FORM_H -#include <gnuradio/qtgui/spectrumUpdateEvents.h> +#include <gnuradio/filter/firdes.h> #include <gnuradio/qtgui/FrequencyDisplayPlot.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <QtGui/QtGui> #include <vector> -#include <gnuradio/filter/firdes.h> #include <gnuradio/qtgui/displayform.h> diff --git a/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h index 18f400578b..f4eb22ec18 100644 --- a/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h @@ -23,8 +23,8 @@ #ifndef HISTOGRAM_DISPLAY_FORM_H #define HISTOGRAM_DISPLAY_FORM_H -#include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <gnuradio/qtgui/HistogramDisplayPlot.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <QtGui/QtGui> #include <vector> diff --git a/gr-qtgui/include/gnuradio/qtgui/number_sink.h b/gr-qtgui/include/gnuradio/qtgui/number_sink.h index 1030bdef7d..a457462c13 100644 --- a/gr-qtgui/include/gnuradio/qtgui/number_sink.h +++ b/gr-qtgui/include/gnuradio/qtgui/number_sink.h @@ -28,8 +28,8 @@ #endif #include <gnuradio/qtgui/api.h> -#include <gnuradio/qtgui/trigger_mode.h> #include <gnuradio/qtgui/qtgui_types.h> +#include <gnuradio/qtgui/trigger_mode.h> #include <gnuradio/sync_block.h> #include <qapplication.h> diff --git a/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h index 05f6aaa94e..0386ed1bea 100644 --- a/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h @@ -23,8 +23,8 @@ #ifndef NUMBER_DISPLAY_FORM_H #define NUMBER_DISPLAY_FORM_H -#include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <gnuradio/qtgui/form_menus.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <QtGui/QtGui> #include <qwt_thermo.h> #include <vector> diff --git a/gr-qtgui/include/gnuradio/qtgui/plot_raster.h b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h index 9705aabbc6..83165619b8 100644 --- a/gr-qtgui/include/gnuradio/qtgui/plot_raster.h +++ b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h @@ -23,13 +23,13 @@ #ifndef PLOT_TIMERASTER_H #define PLOT_TIMERASTER_H -#include <qglobal.h> #include <gnuradio/qtgui/timeRasterGlobalData.h> +#include <qglobal.h> #include <qwt_plot_rasteritem.h> #if QWT_VERSION >= 0x060000 -#include <qwt_point_3d.h> // doesn't seem necessary, but is... #include <qwt_compat.h> +#include <qwt_point_3d.h> // doesn't seem necessary, but is... #endif class QwtColorMap; diff --git a/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h index c7c626413d..22cd708353 100644 --- a/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h +++ b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h @@ -23,13 +23,13 @@ #ifndef PLOT_WATERFALL_H #define PLOT_WATERFALL_H -#include <qglobal.h> #include <gnuradio/qtgui/waterfallGlobalData.h> +#include <qglobal.h> #include <qwt_plot_rasteritem.h> #if QWT_VERSION >= 0x060000 -#include <qwt_point_3d.h> // doesn't seem necessary, but is... #include <qwt_compat.h> +#include <qwt_point_3d.h> // doesn't seem necessary, but is... #endif class QwtColorMap; diff --git a/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h index 1d21e68e0d..90bad89eb9 100644 --- a/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h +++ b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h @@ -23,9 +23,9 @@ #ifndef QTGUI_TYPES_H #define QTGUI_TYPES_H +#include <gnuradio/high_res_timer.h> #include <qwt_color_map.h> #include <qwt_scale_draw.h> -#include <gnuradio/high_res_timer.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/include/gnuradio/qtgui/sink_c.h b/gr-qtgui/include/gnuradio/qtgui/sink_c.h index 4dcf7f1528..3ad02a1e06 100644 --- a/gr-qtgui/include/gnuradio/qtgui/sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/sink_c.h @@ -27,8 +27,8 @@ #include <Python.h> #endif -#include <gnuradio/qtgui/api.h> #include <gnuradio/block.h> +#include <gnuradio/qtgui/api.h> #include <qapplication.h> #include <qwt_symbol.h> diff --git a/gr-qtgui/include/gnuradio/qtgui/sink_f.h b/gr-qtgui/include/gnuradio/qtgui/sink_f.h index 36759c15b9..c5d8973385 100644 --- a/gr-qtgui/include/gnuradio/qtgui/sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/sink_f.h @@ -27,8 +27,8 @@ #include <Python.h> #endif -#include <gnuradio/qtgui/api.h> #include <gnuradio/block.h> +#include <gnuradio/qtgui/api.h> #include <qapplication.h> #include <qwt_symbol.h> diff --git a/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h index 4a85b44c8a..5eec015a8c 100644 --- a/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h +++ b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h @@ -23,14 +23,14 @@ #ifndef SPECTRUM_UPDATE_EVENTS_H #define SPECTRUM_UPDATE_EVENTS_H +#include <gnuradio/high_res_timer.h> +#include <gnuradio/qtgui/api.h> +#include <gnuradio/tags.h> #include <stdint.h> #include <QEvent> #include <QString> #include <complex> #include <vector> -#include <gnuradio/high_res_timer.h> -#include <gnuradio/qtgui/api.h> -#include <gnuradio/tags.h> static const int SpectrumUpdateEventType = 10005; static const int SpectrumWindowCaptionEventType = 10008; diff --git a/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h index 6acdde7394..5322698631 100644 --- a/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h @@ -28,13 +28,13 @@ class SpectrumGUIClass; #include <gnuradio/qtgui/SpectrumGUIClass.h> -#include <gnuradio/qtgui/SpectrumGUIClass.h> +#include <gnuradio/qtgui/ConstellationDisplayPlot.h> #include <gnuradio/qtgui/FrequencyDisplayPlot.h> -#include <gnuradio/qtgui/WaterfallDisplayPlot.h> +#include <gnuradio/qtgui/SpectrumGUIClass.h> #include <gnuradio/qtgui/TimeDomainDisplayPlot.h> -#include <gnuradio/qtgui/ConstellationDisplayPlot.h> -#include <QValidator> +#include <gnuradio/qtgui/WaterfallDisplayPlot.h> #include <QTimer> +#include <QValidator> #include <vector> class SpectrumDisplayForm : public QWidget, public Ui::SpectrumDisplayForm diff --git a/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h b/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h index dd57a8c2ee..0a7fb1e10a 100644 --- a/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h +++ b/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h @@ -23,12 +23,12 @@ #ifndef TIMERASTER_GLOBAL_DATA_HPP #define TIMERASTER_GLOBAL_DATA_HPP -#include <qwt_raster_data.h> #include <inttypes.h> +#include <qwt_raster_data.h> #if QWT_VERSION >= 0x060000 -#include <qwt_point_3d.h> // doesn't seem necessary, but is... #include <qwt_compat.h> +#include <qwt_point_3d.h> // doesn't seem necessary, but is... #endif class TimeRasterData : public QwtRasterData diff --git a/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h b/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h index 1629b16358..602cebedd3 100644 --- a/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h +++ b/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h @@ -23,16 +23,16 @@ #ifndef TIME_CONTROL_PANEL_H #define TIME_CONTROL_PANEL_H +#include <gnuradio/qtgui/displayform.h> +#include <gnuradio/qtgui/timedisplayform.h> #include <QtGui/QtGui> -#include <vector> -#include <QSlider> -#include <QComboBox> #include <QCheckBox> -#include <QPushButton> -#include <QLabel> +#include <QComboBox> #include <QHBoxLayout> -#include <gnuradio/qtgui/displayform.h> -#include <gnuradio/qtgui/timedisplayform.h> +#include <QLabel> +#include <QPushButton> +#include <QSlider> +#include <vector> class TimeControlPanel : public QVBoxLayout { diff --git a/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h index 71ef2bd1a5..0f67b0a589 100644 --- a/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h @@ -23,9 +23,9 @@ #ifndef TIME_DISPLAY_FORM_H #define TIME_DISPLAY_FORM_H -#include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <gnuradio/qtgui/TimeDomainDisplayPlot.h> #include <gnuradio/qtgui/displayform.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <QtGui/QtGui> #include <vector> diff --git a/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h index f9d9141db3..bf685d8b33 100644 --- a/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h @@ -23,11 +23,11 @@ #ifndef TIMERASTER_DISPLAY_FORM_H #define TIMERASTER_DISPLAY_FORM_H -#include <gnuradio/qtgui/spectrumUpdateEvents.h> +#include <gnuradio/filter/firdes.h> #include <gnuradio/qtgui/TimeRasterDisplayPlot.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <QtGui/QtGui> #include <vector> -#include <gnuradio/filter/firdes.h> #include <gnuradio/qtgui/displayform.h> diff --git a/gr-qtgui/include/gnuradio/qtgui/utils.h b/gr-qtgui/include/gnuradio/qtgui/utils.h index fb4431ef8b..5a75ef8a91 100644 --- a/gr-qtgui/include/gnuradio/qtgui/utils.h +++ b/gr-qtgui/include/gnuradio/qtgui/utils.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_QTGUI_UTILS_H #define INCLUDED_QTGUI_UTILS_H -#include <qevent.h> #include <gnuradio/qtgui/api.h> -#include <qwt_plot_picker.h> +#include <qevent.h> #include <qwt_picker_machine.h> -#include <QString> +#include <qwt_plot_picker.h> #include <QCoreApplication> +#include <QString> /*! * From QSS file name, extracts the file contents and returns a diff --git a/gr-qtgui/include/gnuradio/qtgui/vectordisplayform.h b/gr-qtgui/include/gnuradio/qtgui/vectordisplayform.h index bafdb911cf..78e93b4c08 100644 --- a/gr-qtgui/include/gnuradio/qtgui/vectordisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/vectordisplayform.h @@ -23,8 +23,8 @@ #ifndef VECTOR_DISPLAY_FORM_H #define VECTOR_DISPLAY_FORM_H -#include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <gnuradio/qtgui/VectorDisplayPlot.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <QtGui/QtGui> #include <vector> diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h b/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h index fb21485d38..2996405990 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h @@ -23,12 +23,12 @@ #ifndef WATERFALL_GLOBAL_DATA_HPP #define WATERFALL_GLOBAL_DATA_HPP -#include <qwt_raster_data.h> #include <inttypes.h> +#include <qwt_raster_data.h> #if QWT_VERSION >= 0x060000 -#include <qwt_point_3d.h> // doesn't seem necessary, but is... #include <qwt_compat.h> +#include <qwt_point_3d.h> // doesn't seem necessary, but is... #endif class WaterfallData : public QwtRasterData diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h index a41281af6f..774ac663fe 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h @@ -27,10 +27,10 @@ #include <Python.h> #endif +#include <gnuradio/filter/firdes.h> #include <gnuradio/qtgui/api.h> #include <gnuradio/sync_block.h> #include <qapplication.h> -#include <gnuradio/filter/firdes.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h index bbb9538da6..2a01e603b9 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h @@ -27,10 +27,10 @@ #include <Python.h> #endif +#include <gnuradio/filter/firdes.h> #include <gnuradio/qtgui/api.h> #include <gnuradio/sync_block.h> #include <qapplication.h> -#include <gnuradio/filter/firdes.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h index 44b8a8a084..2ddecd77e6 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h @@ -23,11 +23,11 @@ #ifndef WATERFALL_DISPLAY_FORM_H #define WATERFALL_DISPLAY_FORM_H -#include <gnuradio/qtgui/spectrumUpdateEvents.h> +#include <gnuradio/filter/firdes.h> #include <gnuradio/qtgui/WaterfallDisplayPlot.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <QtGui/QtGui> #include <vector> -#include <gnuradio/filter/firdes.h> #include <gnuradio/qtgui/displayform.h> 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> |