diff options
| author | Andrej Rode <mail@andrejro.de> | 2018-03-03 19:01:58 +0100 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-03-04 11:38:03 +0100 |
| commit | cbd03b4f2e2ebab1ec3bdca02854d7f2491b8a1d (patch) | |
| tree | 53993a2fdced24833c25336bbc91b23244e9efdd | |
| parent | 7e758dd41aa8ff72e6be903d682dbdd922ecc8dc (diff) | |
cleanup: add missing includes + reorder qtgui includes correctly
51 files changed, 126 insertions, 39 deletions
diff --git a/gr-blocks/lib/stream_pdu_base.h b/gr-blocks/lib/stream_pdu_base.h index 6a2bf9b15e..e15aec1787 100644 --- a/gr-blocks/lib/stream_pdu_base.h +++ b/gr-blocks/lib/stream_pdu_base.h @@ -24,6 +24,7 @@ #define INCLUDED_STREAM_PDU_BASE_H #include <gnuradio/thread/thread.h> +#include <gnuradio/basic_block.h> #include <pmt/pmt.h> class basic_block; diff --git a/gr-fec/include/gnuradio/fec/polar_common.h b/gr-fec/include/gnuradio/fec/polar_common.h index 229dc70e2e..79272cb308 100644 --- a/gr-fec/include/gnuradio/fec/polar_common.h +++ b/gr-fec/include/gnuradio/fec/polar_common.h @@ -25,6 +25,7 @@ #define INCLUDED_FEC_POLAR_COMMON_H #include <gnuradio/fec/api.h> +#include <vector> // Forward declaration for those objects. SWIG doesn't like them to be #include'd. namespace gr { diff --git a/gr-qtgui/lib/SpectrumGUIClass.cc b/gr-qtgui/lib/SpectrumGUIClass.cc index 0cbb6f5f51..a55c89369e 100644 --- a/gr-qtgui/lib/SpectrumGUIClass.cc +++ b/gr-qtgui/lib/SpectrumGUIClass.cc @@ -24,6 +24,7 @@ #define SPECTRUM_GUI_CLASS_CPP #include <gnuradio/qtgui/SpectrumGUIClass.h> + //Added by qt3to4: #include <QEvent> #include <volk/volk.h> diff --git a/gr-qtgui/lib/ber_sink_b_impl.cc b/gr-qtgui/lib/ber_sink_b_impl.cc index eb3aa14597..94490de7ca 100644 --- a/gr-qtgui/lib/ber_sink_b_impl.cc +++ b/gr-qtgui/lib/ber_sink_b_impl.cc @@ -21,6 +21,7 @@ */ #include "ber_sink_b_impl.h" + #include <boost/math/special_functions/erf.hpp> #include <gnuradio/io_signature.h> #include <gnuradio/math.h> diff --git a/gr-qtgui/lib/ber_sink_b_impl.h b/gr-qtgui/lib/ber_sink_b_impl.h index 5ae637699e..23957230ed 100644 --- a/gr-qtgui/lib/ber_sink_b_impl.h +++ b/gr-qtgui/lib/ber_sink_b_impl.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_BER_SINK_B_IMPL_H #include <gnuradio/qtgui/ber_sink_b.h> + #include <gnuradio/high_res_timer.h> #include <gnuradio/qtgui/constellationdisplayform.h> diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index 3f3bbf4405..7cfd689189 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -25,6 +25,7 @@ #endif #include "const_sink_c_impl.h" + #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> #include <string.h> diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h index f2dcb6e73e..54fa39f27d 100644 --- a/gr-qtgui/lib/const_sink_c_impl.h +++ b/gr-qtgui/lib/const_sink_c_impl.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_CONST_SINK_C_IMPL_H #include <gnuradio/qtgui/const_sink_c.h> + #include <gnuradio/high_res_timer.h> #include <gnuradio/qtgui/constellationdisplayform.h> diff --git a/gr-qtgui/lib/constellationdisplayform.cc b/gr-qtgui/lib/constellationdisplayform.cc index 1325beccae..bc70bb92d2 100644 --- a/gr-qtgui/lib/constellationdisplayform.cc +++ b/gr-qtgui/lib/constellationdisplayform.cc @@ -20,9 +20,10 @@ * Boston, MA 02110-1301, USA. */ +#include <gnuradio/qtgui/constellationdisplayform.h> + #include <cmath> #include <QMessageBox> -#include <gnuradio/qtgui/constellationdisplayform.h> #include <iostream> ConstellationDisplayForm::ConstellationDisplayForm(int nplots, QWidget* parent) diff --git a/gr-qtgui/lib/displayform.cc b/gr-qtgui/lib/displayform.cc index 13c2d8a193..d4e86b1768 100644 --- a/gr-qtgui/lib/displayform.cc +++ b/gr-qtgui/lib/displayform.cc @@ -21,6 +21,7 @@ */ #include <gnuradio/qtgui/displayform.h> + #include <iostream> #include <QPixmap> #include <QFileDialog> diff --git a/gr-qtgui/lib/edit_box_msg_impl.cc b/gr-qtgui/lib/edit_box_msg_impl.cc index 0dee1fa18b..7050c74985 100644 --- a/gr-qtgui/lib/edit_box_msg_impl.cc +++ b/gr-qtgui/lib/edit_box_msg_impl.cc @@ -25,9 +25,11 @@ #endif #include "edit_box_msg_impl.h" + #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> #include <gnuradio/qtgui/utils.h> + #include <boost/lexical_cast.hpp> namespace gr { diff --git a/gr-qtgui/lib/edit_box_msg_impl.h b/gr-qtgui/lib/edit_box_msg_impl.h index c60b3de9b0..0e16f958a7 100644 --- a/gr-qtgui/lib/edit_box_msg_impl.h +++ b/gr-qtgui/lib/edit_box_msg_impl.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_EDIT_BOX_MSG_IMPL_H #include <gnuradio/qtgui/edit_box_msg.h> + #include <QGroupBox> #include <QVBoxLayout> #include <QHBoxLayout> diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc index c697e8c269..afd4f91d98 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.cc +++ b/gr-qtgui/lib/freq_sink_c_impl.cc @@ -25,12 +25,15 @@ #endif #include "freq_sink_c_impl.h" + #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <string.h> + #include <volk/volk.h> #include <qwt_symbol.h> +#include <string.h> + namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h index b102209359..9dcde0887e 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.h +++ b/gr-qtgui/lib/freq_sink_c_impl.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_FREQ_SINK_C_IMPL_H #include <gnuradio/qtgui/freq_sink_c.h> + #include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc index 046414ffaf..c131b89bf6 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -25,12 +25,15 @@ #endif #include "freq_sink_f_impl.h" + #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <string.h> + #include <volk/volk.h> #include <qwt_symbol.h> +#include <string.h> + namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h index 85d45b3f4c..782bdb5626 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.h +++ b/gr-qtgui/lib/freq_sink_f_impl.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_FREQ_SINK_F_IMPL_H #include <gnuradio/qtgui/freq_sink_f.h> + #include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> diff --git a/gr-qtgui/lib/freqcontrolpanel.cc b/gr-qtgui/lib/freqcontrolpanel.cc index c0a8ed4158..536bf9a2f8 100644 --- a/gr-qtgui/lib/freqcontrolpanel.cc +++ b/gr-qtgui/lib/freqcontrolpanel.cc @@ -21,6 +21,7 @@ */ #include <gnuradio/qtgui/freqcontrolpanel.h> + #include <cmath> FreqControlPanel::FreqControlPanel(FreqDisplayForm *form) diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc index 832a16c783..613138d13a 100644 --- a/gr-qtgui/lib/freqdisplayform.cc +++ b/gr-qtgui/lib/freqdisplayform.cc @@ -20,10 +20,11 @@ * Boston, MA 02110-1301, USA. */ +#include <gnuradio/qtgui/freqdisplayform.h> + #include <cmath> #include <QMessageBox> #include <QSpacerItem> -#include <gnuradio/qtgui/freqdisplayform.h> #include <gnuradio/qtgui/freqcontrolpanel.h> #include <iostream> diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc index 13e50b217c..c08df37e7d 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.cc +++ b/gr-qtgui/lib/histogram_sink_f_impl.cc @@ -25,12 +25,15 @@ #endif #include "histogram_sink_f_impl.h" + #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <string.h> + #include <volk/volk.h> #include <qwt_symbol.h> +#include <string.h> + namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/histogram_sink_f_impl.h b/gr-qtgui/lib/histogram_sink_f_impl.h index d397beeb6b..27c0017915 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.h +++ b/gr-qtgui/lib/histogram_sink_f_impl.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_HISTOGRAM_SINK_F_IMPL_H #include <gnuradio/qtgui/histogram_sink_f.h> + #include <gnuradio/qtgui/histogramdisplayform.h> #include <gnuradio/high_res_timer.h> diff --git a/gr-qtgui/lib/histogramdisplayform.cc b/gr-qtgui/lib/histogramdisplayform.cc index 9cff21f11d..905a8635b0 100644 --- a/gr-qtgui/lib/histogramdisplayform.cc +++ b/gr-qtgui/lib/histogramdisplayform.cc @@ -20,9 +20,11 @@ * Boston, MA 02110-1301, USA. */ -#include <cmath> -#include <QMessageBox> #include <gnuradio/qtgui/histogramdisplayform.h> + +#include <QMessageBox> + +#include <cmath> #include <iostream> HistogramDisplayForm::HistogramDisplayForm(int nplots, QWidget* parent) diff --git a/gr-qtgui/lib/number_sink_impl.cc b/gr-qtgui/lib/number_sink_impl.cc index ea07c5dbd2..129e6462f3 100644 --- a/gr-qtgui/lib/number_sink_impl.cc +++ b/gr-qtgui/lib/number_sink_impl.cc @@ -25,11 +25,14 @@ #endif #include "number_sink_impl.h" + #include <gnuradio/io_signature.h> -#include <string.h> -#include <volk/volk.h> #include <gnuradio/fft/fft.h> + +#include <volk/volk.h> #include <qwt_symbol.h> + +#include <string.h> #include <cmath> #ifdef _MSC_VER diff --git a/gr-qtgui/lib/number_sink_impl.h b/gr-qtgui/lib/number_sink_impl.h index a5809354fa..e17d409f32 100644 --- a/gr-qtgui/lib/number_sink_impl.h +++ b/gr-qtgui/lib/number_sink_impl.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_NUMBER_SINK_IMPL_H #include <gnuradio/qtgui/number_sink.h> + #include <gnuradio/qtgui/numberdisplayform.h> #include <gnuradio/filter/single_pole_iir.h> #include <gnuradio/high_res_timer.h> diff --git a/gr-qtgui/lib/numberdisplayform.cc b/gr-qtgui/lib/numberdisplayform.cc index a199c35d4e..33b5076be0 100644 --- a/gr-qtgui/lib/numberdisplayform.cc +++ b/gr-qtgui/lib/numberdisplayform.cc @@ -20,12 +20,14 @@ * Boston, MA 02110-1301, USA. */ -#include <cmath> +#include <gnuradio/qtgui/numberdisplayform.h> + +#include <qwt_color_map.h> #include <QMessageBox> #include <QFileDialog> -#include <gnuradio/qtgui/numberdisplayform.h> + +#include <cmath> #include <iostream> -#include <qwt_color_map.h> NumberDisplayForm::NumberDisplayForm(int nplots, gr::qtgui::graph_t type, QWidget* parent) diff --git a/gr-qtgui/lib/plot_raster.cc b/gr-qtgui/lib/plot_raster.cc index b40513506d..f565977d5b 100644 --- a/gr-qtgui/lib/plot_raster.cc +++ b/gr-qtgui/lib/plot_raster.cc @@ -20,14 +20,16 @@ * Boston, MA 02110-1301, USA. */ -#include <iostream> +#include <gnuradio/qtgui/plot_raster.h> + #include <qimage.h> #include <qpen.h> #include <qpainter.h> #include "qwt_painter.h" #include "qwt_scale_map.h" #include "qwt_color_map.h" -#include <gnuradio/qtgui/plot_raster.h> + +#include <iostream> #if QWT_VERSION < 0x060000 #include "qwt_double_interval.h" diff --git a/gr-qtgui/lib/plot_waterfall.cc b/gr-qtgui/lib/plot_waterfall.cc index b96d573e3d..ccc4b74c4b 100644 --- a/gr-qtgui/lib/plot_waterfall.cc +++ b/gr-qtgui/lib/plot_waterfall.cc @@ -20,13 +20,14 @@ * Boston, MA 02110-1301, USA. */ +#include <gnuradio/qtgui/plot_waterfall.h> + #include <qimage.h> #include <qpen.h> #include <qpainter.h> #include "qwt_painter.h" #include "qwt_scale_map.h" #include "qwt_color_map.h" -#include <gnuradio/qtgui/plot_waterfall.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 0a0c826bbe..4201022f40 100644 --- a/gr-qtgui/lib/qtgui_util.cc +++ b/gr-qtgui/lib/qtgui_util.cc @@ -21,7 +21,9 @@ */ #include <gnuradio/qtgui/utils.h> + #include <gnuradio/prefs.h> + #include <QDebug> #include <QFile> #include <QCoreApplication> diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc index ba1be4b7c3..958a155b52 100644 --- a/gr-qtgui/lib/sink_c_impl.cc +++ b/gr-qtgui/lib/sink_c_impl.cc @@ -25,11 +25,14 @@ #endif #include "sink_c_impl.h" + #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <string.h> + #include <volk/volk.h> +#include <string.h> + namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/sink_c_impl.h b/gr-qtgui/lib/sink_c_impl.h index 87ce7ad39e..455d215349 100644 --- a/gr-qtgui/lib/sink_c_impl.h +++ b/gr-qtgui/lib/sink_c_impl.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2008,2009,2011,2012,2014 Free Software Foundation, Inc. + * Copyright 2008,2009,2011,2012,2014,2018 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_SINK_C_IMPL_H #include <gnuradio/qtgui/sink_c.h> + #include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc index 73b6fcad83..2c1eaf2a92 100644 --- a/gr-qtgui/lib/sink_f_impl.cc +++ b/gr-qtgui/lib/sink_f_impl.cc @@ -25,11 +25,14 @@ #endif #include "sink_f_impl.h" + #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <string.h> + #include <volk/volk.h> +#include <string.h> + namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/sink_f_impl.h b/gr-qtgui/lib/sink_f_impl.h index 53494b9ccf..bd72e47b29 100644 --- a/gr-qtgui/lib/sink_f_impl.h +++ b/gr-qtgui/lib/sink_f_impl.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_SINK_F_IMPL_H #include <gnuradio/qtgui/sink_f.h> + #include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc index 8c67b7a2bf..fcc6561f3b 100644 --- a/gr-qtgui/lib/spectrumdisplayform.cc +++ b/gr-qtgui/lib/spectrumdisplayform.cc @@ -19,12 +19,14 @@ * the Free Software Foundation, Inc., 51 Franklin Street, * Boston, MA 02110-1301, USA. */ +#include <gnuradio/qtgui/spectrumdisplayform.h> + +#include <gnuradio/qtgui/qtgui_types.h> -#include <cmath> #include <QColorDialog> #include <QMessageBox> -#include <gnuradio/qtgui/spectrumdisplayform.h> -#include <gnuradio/qtgui/qtgui_types.h> + +#include <cmath> SpectrumDisplayForm::SpectrumDisplayForm(QWidget* parent) : QWidget(parent) diff --git a/gr-qtgui/lib/timeRasterGlobalData.cc b/gr-qtgui/lib/timeRasterGlobalData.cc index 018b7e5ea6..18d8b8daef 100644 --- a/gr-qtgui/lib/timeRasterGlobalData.cc +++ b/gr-qtgui/lib/timeRasterGlobalData.cc @@ -24,6 +24,7 @@ #define TIMERASTER_GLOBAL_DATA_CPP #include <gnuradio/qtgui/timeRasterGlobalData.h> + #include <cstdio> #include <cmath> #include <iostream> diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc index 1e2fe360b1..b8e55ae724 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc @@ -25,11 +25,14 @@ #endif #include "time_raster_sink_b_impl.h" + #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <string.h> + #include <volk/volk.h> +#include <string.h> + namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h b/gr-qtgui/lib/time_raster_sink_b_impl.h index 48037b5e5e..1bfe3d68bb 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.h +++ b/gr-qtgui/lib/time_raster_sink_b_impl.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_TIME_RASTER_SINK_B_IMPL_H #include <gnuradio/qtgui/time_raster_sink_b.h> + #include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc index e4cbb0d38f..5b23f98235 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc @@ -25,11 +25,14 @@ #endif #include "time_raster_sink_f_impl.h" + #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <string.h> + #include <volk/volk.h> +#include <string.h> + namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h b/gr-qtgui/lib/time_raster_sink_f_impl.h index 1f25dc5534..31ac460d03 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.h +++ b/gr-qtgui/lib/time_raster_sink_f_impl.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_TIME_RASTER_SINK_F_IMPL_H #include <gnuradio/qtgui/time_raster_sink_f.h> + #include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index b23a5468fc..89fafb7f5a 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -25,13 +25,16 @@ #endif #include "time_sink_c_impl.h" + #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <string.h> -#include <volk/volk.h> #include <gnuradio/fft/fft.h> + +#include <volk/volk.h> #include <qwt_symbol.h> +#include <string.h> + namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h index ff938f8ea1..92cda21df1 100644 --- a/gr-qtgui/lib/time_sink_c_impl.h +++ b/gr-qtgui/lib/time_sink_c_impl.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_TIME_SINK_C_IMPL_H #include <gnuradio/qtgui/time_sink_c.h> + #include <gnuradio/qtgui/timedisplayform.h> #include <gnuradio/high_res_timer.h> diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc index 2b39b5536c..a1af17cfb5 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -25,15 +25,18 @@ #endif #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 <string.h> -#include <volk/volk.h> #include <gnuradio/fft/fft.h> + +#include <volk/volk.h> #include <qwt_symbol.h> +#include <string.h> + namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h index a7a304aee1..094c96efab 100644 --- a/gr-qtgui/lib/time_sink_f_impl.h +++ b/gr-qtgui/lib/time_sink_f_impl.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_TIME_SINK_F_IMPL_H #include <gnuradio/qtgui/time_sink_f.h> + #include <gnuradio/qtgui/timedisplayform.h> #include <gnuradio/high_res_timer.h> diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc index 726944101d..efb8a4f9fd 100644 --- a/gr-qtgui/lib/timedisplayform.cc +++ b/gr-qtgui/lib/timedisplayform.cc @@ -19,13 +19,15 @@ * the Free Software Foundation, Inc., 51 Franklin Street, * Boston, MA 02110-1301, USA. */ +#include <gnuradio/qtgui/timecontrolpanel.h> + +#include <gnuradio/qtgui/timedisplayform.h> -#include <cmath> #include <QMessageBox> #include <QSpacerItem> #include <QGroupBox> -#include <gnuradio/qtgui/timedisplayform.h> -#include <gnuradio/qtgui/timecontrolpanel.h> + +#include <cmath> #include <iostream> diff --git a/gr-qtgui/lib/timerasterdisplayform.cc b/gr-qtgui/lib/timerasterdisplayform.cc index 9582f02973..5b1d8f5e37 100644 --- a/gr-qtgui/lib/timerasterdisplayform.cc +++ b/gr-qtgui/lib/timerasterdisplayform.cc @@ -20,10 +20,12 @@ * Boston, MA 02110-1301, USA. */ -#include <cmath> +#include <gnuradio/qtgui/timerasterdisplayform.h> + #include <QColorDialog> #include <QMessageBox> -#include <gnuradio/qtgui/timerasterdisplayform.h> + +#include <cmath> #include <iostream> TimeRasterDisplayForm::TimeRasterDisplayForm(int nplots, diff --git a/gr-qtgui/lib/vector_sink_f_impl.cc b/gr-qtgui/lib/vector_sink_f_impl.cc index fedef9654d..ca6a8c3054 100644 --- a/gr-qtgui/lib/vector_sink_f_impl.cc +++ b/gr-qtgui/lib/vector_sink_f_impl.cc @@ -25,12 +25,15 @@ #endif #include "vector_sink_f_impl.h" + #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <string.h> + #include <volk/volk.h> #include <qwt_symbol.h> +#include <string.h> + namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/vector_sink_f_impl.h b/gr-qtgui/lib/vector_sink_f_impl.h index 12cf362fee..6abd61d170 100644 --- a/gr-qtgui/lib/vector_sink_f_impl.h +++ b/gr-qtgui/lib/vector_sink_f_impl.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_VECTOR_SINK_F_IMPL_H #include <gnuradio/qtgui/vector_sink_f.h> + #include <gnuradio/high_res_timer.h> #include <gnuradio/qtgui/vectordisplayform.h> diff --git a/gr-qtgui/lib/vectordisplayform.cc b/gr-qtgui/lib/vectordisplayform.cc index 7eb5c45d0a..d1a5882d3e 100644 --- a/gr-qtgui/lib/vectordisplayform.cc +++ b/gr-qtgui/lib/vectordisplayform.cc @@ -20,9 +20,11 @@ * Boston, MA 02110-1301, USA. */ -#include <cmath> -#include <QMessageBox> #include <gnuradio/qtgui/vectordisplayform.h> + +#include <QMessageBox> + +#include <cmath> #include <iostream> VectorDisplayForm::VectorDisplayForm(int nplots, QWidget* parent) diff --git a/gr-qtgui/lib/waterfallGlobalData.cc b/gr-qtgui/lib/waterfallGlobalData.cc index 5d500e51ae..09d8b7efd2 100644 --- a/gr-qtgui/lib/waterfallGlobalData.cc +++ b/gr-qtgui/lib/waterfallGlobalData.cc @@ -24,6 +24,7 @@ #define WATERFALL_GLOBAL_DATA_CPP #include <gnuradio/qtgui/waterfallGlobalData.h> + #include <cstdio> WaterfallData::WaterfallData(const double minimumFrequency, diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc index 4306b97d71..50611dccc6 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -25,12 +25,15 @@ #endif #include "waterfall_sink_c_impl.h" + #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <string.h> + #include <volk/volk.h> #include <qwt_symbol.h> + #include <iostream> +#include <string.h> 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 49766cd3dc..c6e7236c37 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.h +++ b/gr-qtgui/lib/waterfall_sink_c_impl.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_WATERFALL_SINK_C_IMPL_H #include <gnuradio/qtgui/waterfall_sink_c.h> + #include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc index 9789c2cf6d..f1df670029 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc @@ -25,10 +25,13 @@ #endif #include "waterfall_sink_f_impl.h" + #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <string.h> + #include <volk/volk.h> + +#include <string.h> #include <iostream> namespace gr { diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h index db0f4239bc..fb6fdddc0e 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.h +++ b/gr-qtgui/lib/waterfall_sink_f_impl.h @@ -24,6 +24,7 @@ #define INCLUDED_QTGUI_WATERFALL_SINK_F_IMPL_H #include <gnuradio/qtgui/waterfall_sink_f.h> + #include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> diff --git a/gr-qtgui/lib/waterfalldisplayform.cc b/gr-qtgui/lib/waterfalldisplayform.cc index a284c5233a..38ac91b836 100644 --- a/gr-qtgui/lib/waterfalldisplayform.cc +++ b/gr-qtgui/lib/waterfalldisplayform.cc @@ -20,10 +20,12 @@ * Boston, MA 02110-1301, USA. */ -#include <cmath> +#include <gnuradio/qtgui/waterfalldisplayform.h> + #include <QColorDialog> #include <QMessageBox> -#include <gnuradio/qtgui/waterfalldisplayform.h> + +#include <cmath> #include <iostream> WaterfallDisplayForm::WaterfallDisplayForm(int nplots, QWidget* parent) |