diff options
Diffstat (limited to 'gr-qtgui/lib')
46 files changed, 144 insertions, 144 deletions
diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt index 7114c6c390..2df8b31555 100644 --- a/gr-qtgui/lib/CMakeLists.txt +++ b/gr-qtgui/lib/CMakeLists.txt @@ -20,7 +20,7 @@ ######################################################################## # Setup the QT file generations stuff ######################################################################## -set(qtgui_mod_includedir ${CMAKE_CURRENT_SOURCE_DIR}/../include/qtgui) +set(qtgui_mod_includedir ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/qtgui) set(qtgui_moc_hdrs ${qtgui_mod_includedir}/spectrumdisplayform.h ${qtgui_mod_includedir}/displayform.h diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc index 7e2f11e6d6..f483867776 100644 --- a/gr-qtgui/lib/ConstellationDisplayPlot.cc +++ b/gr-qtgui/lib/ConstellationDisplayPlot.cc @@ -23,7 +23,7 @@ #ifndef CONSTELLATION_DISPLAY_PLOT_C #define CONSTELLATION_DISPLAY_PLOT_C -#include <qtgui/ConstellationDisplayPlot.h> +#include <gnuradio/qtgui/ConstellationDisplayPlot.h> #include <qwt_scale_draw.h> #include <qwt_legend.h> diff --git a/gr-qtgui/lib/DisplayPlot.cc b/gr-qtgui/lib/DisplayPlot.cc index 227cf9cc9e..3fe16f68bd 100644 --- a/gr-qtgui/lib/DisplayPlot.cc +++ b/gr-qtgui/lib/DisplayPlot.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <qtgui/DisplayPlot.h> +#include <gnuradio/qtgui/DisplayPlot.h> #include <qwt_scale_draw.h> #include <qwt_legend.h> diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc index 56e63100c7..087a176d5e 100644 --- a/gr-qtgui/lib/FrequencyDisplayPlot.cc +++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc @@ -23,9 +23,9 @@ #ifndef FREQUENCY_DISPLAY_PLOT_C #define FREQUENCY_DISPLAY_PLOT_C -#include <qtgui/FrequencyDisplayPlot.h> +#include <gnuradio/qtgui/FrequencyDisplayPlot.h> -#include <qtgui/qtgui_types.h> +#include <gnuradio/qtgui/qtgui_types.h> #include <qwt_scale_draw.h> #include <qwt_legend.h> #include <qwt_legend_item.h> diff --git a/gr-qtgui/lib/SpectrumGUIClass.cc b/gr-qtgui/lib/SpectrumGUIClass.cc index 020cd8218a..c0c78dad14 100644 --- a/gr-qtgui/lib/SpectrumGUIClass.cc +++ b/gr-qtgui/lib/SpectrumGUIClass.cc @@ -23,7 +23,7 @@ #ifndef SPECTRUM_GUI_CLASS_CPP #define SPECTRUM_GUI_CLASS_CPP -#include <qtgui/SpectrumGUIClass.h> +#include <gnuradio/qtgui/SpectrumGUIClass.h> //Added by qt3to4: #include <QEvent> #include <QCustomEvent> diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc index 13e24c2a97..a7e6a821bc 100644 --- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc +++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc @@ -23,7 +23,7 @@ #ifndef TIME_DOMAIN_DISPLAY_PLOT_C #define TIME_DOMAIN_DISPLAY_PLOT_C -#include <qtgui/TimeDomainDisplayPlot.h> +#include <gnuradio/qtgui/TimeDomainDisplayPlot.h> #include <qwt_scale_draw.h> #include <qwt_legend.h> diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc index 66b38c52f2..89e32cab9c 100644 --- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc +++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc @@ -23,9 +23,9 @@ #ifndef TIMERASTER_DISPLAY_PLOT_C #define TIMERASTER_DISPLAY_PLOT_C -#include <qtgui/TimeRasterDisplayPlot.h> +#include <gnuradio/qtgui/TimeRasterDisplayPlot.h> -#include <qtgui/qtgui_types.h> +#include <gnuradio/qtgui/qtgui_types.h> #include <qwt_color_map.h> #include <qwt_scale_draw.h> #include <qwt_legend.h> diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc index aa78000741..0e38808b94 100644 --- a/gr-qtgui/lib/WaterfallDisplayPlot.cc +++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc @@ -23,9 +23,9 @@ #ifndef WATERFALL_DISPLAY_PLOT_C #define WATERFALL_DISPLAY_PLOT_C -#include <qtgui/WaterfallDisplayPlot.h> +#include <gnuradio/qtgui/WaterfallDisplayPlot.h> -#include <qtgui/qtgui_types.h> +#include <gnuradio/qtgui/qtgui_types.h> #include <qwt_color_map.h> #include <qwt_scale_draw.h> #include <qwt_legend.h> diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index 9064be4ebe..33e0cc5a22 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -25,10 +25,10 @@ #endif #include "const_sink_c_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <qwt_symbol.h> namespace gr { @@ -48,9 +48,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("const_sink_c", - gr_make_io_signature(nconnections, nconnections, sizeof(gr_complex)), - gr_make_io_signature(0, 0, 0)), + : sync_block("const_sink_c", + io_signature::make(nconnections, nconnections, sizeof(gr_complex)), + io_signature::make(0, 0, 0)), d_size(size), d_name(name), d_nconnections(nconnections), d_parent(parent) { diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h index 02b25409e6..fb9481fb15 100644 --- a/gr-qtgui/lib/const_sink_c_impl.h +++ b/gr-qtgui/lib/const_sink_c_impl.h @@ -23,10 +23,10 @@ #ifndef INCLUDED_QTGUI_CONST_SINK_C_IMPL_H #define INCLUDED_QTGUI_CONST_SINK_C_IMPL_H -#include <qtgui/const_sink_c.h> -#include <high_res_timer.h> -#include <thread/thread.h> -#include <qtgui/constellationdisplayform.h> +#include <gnuradio/qtgui/const_sink_c.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/qtgui/constellationdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/constellationdisplayform.cc b/gr-qtgui/lib/constellationdisplayform.cc index bfd17b9c11..52691ee67a 100644 --- a/gr-qtgui/lib/constellationdisplayform.cc +++ b/gr-qtgui/lib/constellationdisplayform.cc @@ -22,7 +22,7 @@ #include <cmath> #include <QMessageBox> -#include <qtgui/constellationdisplayform.h> +#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 3439db31ee..ecc878b0a8 100644 --- a/gr-qtgui/lib/displayform.cc +++ b/gr-qtgui/lib/displayform.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <qtgui/displayform.h> +#include <gnuradio/qtgui/displayform.h> #include <iostream> #include <QPixmap> #include <QFileDialog> diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc index 4508750457..b0646904cf 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.cc +++ b/gr-qtgui/lib/freq_sink_c_impl.cc @@ -25,7 +25,7 @@ #endif #include "freq_sink_c_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> #include <qwt_symbol.h> @@ -52,9 +52,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("freq_sink_c", - gr_make_io_signature(1, -1, sizeof(gr_complex)), - gr_make_io_signature(0, 0, 0)), + : sync_block("freq_sink_c", + io_signature::make(1, -1, sizeof(gr_complex)), + io_signature::make(0, 0, 0)), d_fftsize(fftsize), d_fftavg(1.0), d_wintype((filter::firdes::win_type)(wintype)), d_center_freq(fc), d_bandwidth(bw), d_name(name), diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h index ef17079567..06ae4f80f3 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.h +++ b/gr-qtgui/lib/freq_sink_c_impl.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_QTGUI_FREQ_SINK_C_IMPL_H #define INCLUDED_QTGUI_FREQ_SINK_C_IMPL_H -#include <qtgui/freq_sink_c.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <thread/thread.h> -#include <qtgui/freqdisplayform.h> +#include <gnuradio/qtgui/freq_sink_c.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/fft/fft.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/qtgui/freqdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc index 6028c8ec4e..2f9f1956f3 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -25,7 +25,7 @@ #endif #include "freq_sink_f_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> #include <qwt_symbol.h> @@ -52,9 +52,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("freq_sink_f", - gr_make_io_signature(1, -1, sizeof(float)), - gr_make_io_signature(0, 0, 0)), + : sync_block("freq_sink_f", + io_signature::make(1, -1, sizeof(float)), + io_signature::make(0, 0, 0)), d_fftsize(fftsize), d_fftavg(1.0), d_wintype((filter::firdes::win_type)(wintype)), d_center_freq(fc), d_bandwidth(bw), d_name(name), diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h index 6f4d9d2062..a5bdc3c076 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.h +++ b/gr-qtgui/lib/freq_sink_f_impl.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_QTGUI_FREQ_SINK_F_IMPL_H #define INCLUDED_QTGUI_FREQ_SINK_F_IMPL_H -#include <qtgui/freq_sink_f.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <thread/thread.h> -#include <qtgui/freqdisplayform.h> +#include <gnuradio/qtgui/freq_sink_f.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/fft/fft.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/qtgui/freqdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc index adcc09dc4b..948d845895 100644 --- a/gr-qtgui/lib/freqdisplayform.cc +++ b/gr-qtgui/lib/freqdisplayform.cc @@ -22,7 +22,7 @@ #include <cmath> #include <QMessageBox> -#include <qtgui/freqdisplayform.h> +#include <gnuradio/qtgui/freqdisplayform.h> #include <iostream> FreqDisplayForm::FreqDisplayForm(int nplots, QWidget* parent) diff --git a/gr-qtgui/lib/plot_raster.cc b/gr-qtgui/lib/plot_raster.cc index 6d31a2596c..62eac5e13f 100644 --- a/gr-qtgui/lib/plot_raster.cc +++ b/gr-qtgui/lib/plot_raster.cc @@ -27,7 +27,7 @@ #include "qwt_painter.h" #include "qwt_scale_map.h" #include "qwt_color_map.h" -#include <qtgui/plot_raster.h> +#include <gnuradio/qtgui/plot_raster.h> #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 5a378767be..b96d573e3d 100644 --- a/gr-qtgui/lib/plot_waterfall.cc +++ b/gr-qtgui/lib/plot_waterfall.cc @@ -26,7 +26,7 @@ #include "qwt_painter.h" #include "qwt_scale_map.h" #include "qwt_color_map.h" -#include <qtgui/plot_waterfall.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 70dcb483fb..539f7bac8f 100644 --- a/gr-qtgui/lib/qtgui_util.cc +++ b/gr-qtgui/lib/qtgui_util.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <qtgui/utils.h> +#include <gnuradio/qtgui/utils.h> #include <QDebug> QwtPickerDblClickPointMachine::QwtPickerDblClickPointMachine() diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc index aab5be54bf..b33853482d 100644 --- a/gr-qtgui/lib/sink_c_impl.cc +++ b/gr-qtgui/lib/sink_c_impl.cc @@ -25,7 +25,7 @@ #endif #include "sink_c_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> @@ -54,9 +54,9 @@ namespace gr { bool plotfreq, bool plotwaterfall, bool plottime, bool plotconst, QWidget *parent) - : gr_block("sink_c", - gr_make_io_signature(1, -1, sizeof(gr_complex)), - gr_make_io_signature(0, 0, 0)), + : block("sink_c", + io_signature::make(1, -1, sizeof(gr_complex)), + io_signature::make(0, 0, 0)), d_fftsize(fftsize), d_wintype((filter::firdes::win_type)(wintype)), d_center_freq(fc), d_bandwidth(bw), d_name(name), diff --git a/gr-qtgui/lib/sink_c_impl.h b/gr-qtgui/lib/sink_c_impl.h index 77ddf79a0e..ce4bbac11b 100644 --- a/gr-qtgui/lib/sink_c_impl.h +++ b/gr-qtgui/lib/sink_c_impl.h @@ -23,11 +23,11 @@ #ifndef INCLUDED_QTGUI_SINK_C_IMPL_H #define INCLUDED_QTGUI_SINK_C_IMPL_H -#include <qtgui/sink_c.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <qtgui/SpectrumGUIClass.h> +#include <gnuradio/qtgui/sink_c.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/fft/fft.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/qtgui/SpectrumGUIClass.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc index 1fb2bbdbb7..679593b1ad 100644 --- a/gr-qtgui/lib/sink_f_impl.cc +++ b/gr-qtgui/lib/sink_f_impl.cc @@ -25,7 +25,7 @@ #endif #include "sink_f_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> @@ -54,9 +54,9 @@ namespace gr { bool plotfreq, bool plotwaterfall, bool plottime, bool plotconst, QWidget *parent) - : gr_block("sink_f", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature (0, 0, 0)), + : block("sink_f", + io_signature::make(1, 1, sizeof(float)), + io_signature::make (0, 0, 0)), d_fftsize(fftsize), d_wintype((filter::firdes::win_type)(wintype)), d_center_freq(fc), d_bandwidth(bw), d_name(name), diff --git a/gr-qtgui/lib/sink_f_impl.h b/gr-qtgui/lib/sink_f_impl.h index 24dff8d6b3..c6b4ec3cb5 100644 --- a/gr-qtgui/lib/sink_f_impl.h +++ b/gr-qtgui/lib/sink_f_impl.h @@ -23,11 +23,11 @@ #ifndef INCLUDED_QTGUI_SINK_F_IMPL_H #define INCLUDED_QTGUI_SINK_F_IMPL_H -#include <qtgui/sink_f.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <qtgui/SpectrumGUIClass.h> +#include <gnuradio/qtgui/sink_f.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/fft/fft.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/qtgui/SpectrumGUIClass.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/spectrumUpdateEvents.cc b/gr-qtgui/lib/spectrumUpdateEvents.cc index 21b1f4d6d9..7d7f689f25 100644 --- a/gr-qtgui/lib/spectrumUpdateEvents.cc +++ b/gr-qtgui/lib/spectrumUpdateEvents.cc @@ -23,7 +23,7 @@ #ifndef SPECTRUM_UPDATE_EVENTS_C #define SPECTRUM_UPDATE_EVENTS_C -#include <qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> SpectrumUpdateEvent::SpectrumUpdateEvent(const float* fftPoints, const uint64_t numFFTDataPoints, diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc index 24f15886ba..7731e41454 100644 --- a/gr-qtgui/lib/spectrumdisplayform.cc +++ b/gr-qtgui/lib/spectrumdisplayform.cc @@ -23,8 +23,8 @@ #include <cmath> #include <QColorDialog> #include <QMessageBox> -#include <qtgui/spectrumdisplayform.h> -#include <qtgui/qtgui_types.h> +#include <gnuradio/qtgui/spectrumdisplayform.h> +#include <gnuradio/qtgui/qtgui_types.h> SpectrumDisplayForm::SpectrumDisplayForm(QWidget* parent) : QWidget(parent) diff --git a/gr-qtgui/lib/spectrumdisplayform.ui b/gr-qtgui/lib/spectrumdisplayform.ui index e1ebfa8197..f6f21c6472 100644 --- a/gr-qtgui/lib/spectrumdisplayform.ui +++ b/gr-qtgui/lib/spectrumdisplayform.ui @@ -522,10 +522,10 @@ <tabstop>WaterfallMinimumIntensitySlider</tabstop> </tabstops> <includes> - <include location="global">qtgui/SpectrumGUIClass.h</include> - <include location="global">qtgui/FrequencyDisplayPlot.h</include> - <include location="global">qtgui/WaterfallDisplayPlot.h</include> - <include location="global">qtgui/TimeDomainDisplayPlot.h</include> + <include location="global">gnuradio/qtgui/SpectrumGUIClass.h</include> + <include location="global">gnuradio/qtgui/FrequencyDisplayPlot.h</include> + <include location="global">gnuradio/qtgui/WaterfallDisplayPlot.h</include> + <include location="global">gnuradio/qtgui/TimeDomainDisplayPlot.h</include> <include location="global">qvalidator.h</include> <include location="global">vector</include> <include location="local">qwt_slider.h</include> diff --git a/gr-qtgui/lib/timeRasterGlobalData.cc b/gr-qtgui/lib/timeRasterGlobalData.cc index 6ebef5f47e..bd88ead8d3 100644 --- a/gr-qtgui/lib/timeRasterGlobalData.cc +++ b/gr-qtgui/lib/timeRasterGlobalData.cc @@ -23,7 +23,7 @@ #ifndef TIMERASTER_GLOBAL_DATA_CPP #define TIMERASTER_GLOBAL_DATA_CPP -#include <qtgui/timeRasterGlobalData.h> +#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 6ec6c6075b..4b3d1594cd 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc @@ -25,7 +25,7 @@ #endif #include "time_raster_sink_b_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> @@ -57,9 +57,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("time_raster_sink_b", - gr_make_io_signature(1, -1, sizeof(char)), - gr_make_io_signature(0, 0, 0)), + : sync_block("time_raster_sink_b", + io_signature::make(1, -1, sizeof(char)), + io_signature::make(0, 0, 0)), d_name(name), d_nconnections(nconnections), d_parent(parent), d_rows(rows), d_cols(cols), d_mult(std::vector<float>(nconnections,1)), diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h b/gr-qtgui/lib/time_raster_sink_b_impl.h index 09c471fcfc..17a492b799 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.h +++ b/gr-qtgui/lib/time_raster_sink_b_impl.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_QTGUI_TIME_RASTER_SINK_B_IMPL_H #define INCLUDED_QTGUI_TIME_RASTER_SINK_B_IMPL_H -#include <qtgui/time_raster_sink_b.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <thread/thread.h> -#include <qtgui/timerasterdisplayform.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> +#include <gnuradio/thread/thread.h> +#include <gnuradio/qtgui/timerasterdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/time_raster_sink_c_impl.cc b/gr-qtgui/lib/time_raster_sink_c_impl.cc index 1c71258030..93eba63a3f 100644 --- a/gr-qtgui/lib/time_raster_sink_c_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_c_impl.cc @@ -25,7 +25,7 @@ #endif #include "time_raster_sink_c_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> @@ -47,9 +47,9 @@ namespace gr { unsigned int cols, const std::string &name, QWidget *parent) - : gr_sync_block("time_raster_sink_c", - gr_make_io_signature(1, -1, sizeof(gr_complex)), - gr_make_io_signature(0, 0, 0)), + : sync_block("time_raster_sink_c", + io_signature::make(1, -1, sizeof(gr_complex)), + io_signature::make(0, 0, 0)), d_name(name), d_nconnections(1), d_parent(parent), d_rows(rows), d_cols(cols) { diff --git a/gr-qtgui/lib/time_raster_sink_c_impl.h b/gr-qtgui/lib/time_raster_sink_c_impl.h index 9f8a463bf8..8263046702 100644 --- a/gr-qtgui/lib/time_raster_sink_c_impl.h +++ b/gr-qtgui/lib/time_raster_sink_c_impl.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_QTGUI_TIME_RASTER_SINK_C_IMPL_H #define INCLUDED_QTGUI_TIME_RASTER_SINK_C_IMPL_H -#include <qtgui/time_raster_sink_c.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <thread/thread.h> -#include <qtgui/time_rasterdisplayform.h> +#include <gnuradio/qtgui/time_raster_sink_c.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/fft/fft.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/qtgui/time_rasterdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc index b6b0a1fc7d..0f60e45463 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc @@ -25,7 +25,7 @@ #endif #include "time_raster_sink_f_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> @@ -57,9 +57,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("time_raster_sink_f", - gr_make_io_signature(1, -1, sizeof(float)), - gr_make_io_signature(0, 0, 0)), + : sync_block("time_raster_sink_f", + io_signature::make(1, -1, sizeof(float)), + io_signature::make(0, 0, 0)), d_name(name), d_nconnections(nconnections), d_parent(parent), d_rows(rows), d_cols(cols), d_mult(std::vector<float>(nconnections,1)), diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h b/gr-qtgui/lib/time_raster_sink_f_impl.h index fad731570c..42e0c787e2 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.h +++ b/gr-qtgui/lib/time_raster_sink_f_impl.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_QTGUI_TIME_RASTER_SINK_F_IMPL_H #define INCLUDED_QTGUI_TIME_RASTER_SINK_F_IMPL_H -#include <qtgui/time_raster_sink_f.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <thread/thread.h> -#include <qtgui/timerasterdisplayform.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> +#include <gnuradio/thread/thread.h> +#include <gnuradio/qtgui/timerasterdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index f8ff758218..c9f3e963c7 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -25,10 +25,10 @@ #endif #include "time_sink_c_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <qwt_symbol.h> namespace gr { @@ -48,9 +48,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("time_sink_c", - gr_make_io_signature(nconnections, nconnections, sizeof(gr_complex)), - gr_make_io_signature(0, 0, 0)), + : sync_block("time_sink_c", + io_signature::make(nconnections, nconnections, sizeof(gr_complex)), + io_signature::make(0, 0, 0)), d_size(size), d_samp_rate(samp_rate), d_name(name), d_nconnections(2*nconnections), d_parent(parent) { diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h index 2f9765c2c5..724d38e2ae 100644 --- a/gr-qtgui/lib/time_sink_c_impl.h +++ b/gr-qtgui/lib/time_sink_c_impl.h @@ -23,10 +23,10 @@ #ifndef INCLUDED_QTGUI_TIME_SINK_C_IMPL_H #define INCLUDED_QTGUI_TIME_SINK_C_IMPL_H -#include <qtgui/time_sink_c.h> -#include <qtgui/timedisplayform.h> -#include <thread/thread.h> -#include <high_res_timer.h> +#include <gnuradio/qtgui/time_sink_c.h> +#include <gnuradio/qtgui/timedisplayform.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/high_res_timer.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 6011751b2b..081da98134 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -25,10 +25,10 @@ #endif #include "time_sink_f_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <qwt_symbol.h> namespace gr { @@ -48,9 +48,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("time_sink_f", - gr_make_io_signature(nconnections, nconnections, sizeof(float)), - gr_make_io_signature(0, 0, 0)), + : sync_block("time_sink_f", + io_signature::make(nconnections, nconnections, sizeof(float)), + io_signature::make(0, 0, 0)), d_size(size), d_samp_rate(samp_rate), d_name(name), d_nconnections(nconnections), d_parent(parent) { diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h index 1012ffbd77..c3bd7cd838 100644 --- a/gr-qtgui/lib/time_sink_f_impl.h +++ b/gr-qtgui/lib/time_sink_f_impl.h @@ -23,10 +23,10 @@ #ifndef INCLUDED_QTGUI_TIME_SINK_F_IMPL_H #define INCLUDED_QTGUI_TIME_SINK_F_IMPL_H -#include <qtgui/time_sink_f.h> -#include <qtgui/timedisplayform.h> -#include <thread/thread.h> -#include <high_res_timer.h> +#include <gnuradio/qtgui/time_sink_f.h> +#include <gnuradio/qtgui/timedisplayform.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/high_res_timer.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc index 3ae6f93d0c..4b26808cf6 100644 --- a/gr-qtgui/lib/timedisplayform.cc +++ b/gr-qtgui/lib/timedisplayform.cc @@ -22,7 +22,7 @@ #include <cmath> #include <QMessageBox> -#include <qtgui/timedisplayform.h> +#include <gnuradio/qtgui/timedisplayform.h> #include <iostream> TimeDisplayForm::TimeDisplayForm(int nplots, QWidget* parent) diff --git a/gr-qtgui/lib/timerasterdisplayform.cc b/gr-qtgui/lib/timerasterdisplayform.cc index 50c63ad545..e6f341875d 100644 --- a/gr-qtgui/lib/timerasterdisplayform.cc +++ b/gr-qtgui/lib/timerasterdisplayform.cc @@ -23,7 +23,7 @@ #include <cmath> #include <QColorDialog> #include <QMessageBox> -#include <qtgui/timerasterdisplayform.h> +#include <gnuradio/qtgui/timerasterdisplayform.h> #include <iostream> TimeRasterDisplayForm::TimeRasterDisplayForm(int nplots, diff --git a/gr-qtgui/lib/waterfallGlobalData.cc b/gr-qtgui/lib/waterfallGlobalData.cc index 2085acf8fc..a7e8db0928 100644 --- a/gr-qtgui/lib/waterfallGlobalData.cc +++ b/gr-qtgui/lib/waterfallGlobalData.cc @@ -23,7 +23,7 @@ #ifndef WATERFALL_GLOBAL_DATA_CPP #define WATERFALL_GLOBAL_DATA_CPP -#include <qtgui/waterfallGlobalData.h> +#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 817a5a126e..34ad0de38d 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -25,7 +25,7 @@ #endif #include "waterfall_sink_c_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> #include <qwt_symbol.h> @@ -52,9 +52,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("waterfall_sink_c", - gr_make_io_signature(1, nconnections, sizeof(gr_complex)), - gr_make_io_signature(0, 0, 0)), + : sync_block("waterfall_sink_c", + io_signature::make(1, nconnections, sizeof(gr_complex)), + io_signature::make(0, 0, 0)), d_fftsize(fftsize), d_fftavg(1.0), d_wintype((filter::firdes::win_type)(wintype)), d_center_freq(fc), d_bandwidth(bw), d_name(name), diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h b/gr-qtgui/lib/waterfall_sink_c_impl.h index 7483989c00..bd548bc944 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.h +++ b/gr-qtgui/lib/waterfall_sink_c_impl.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_QTGUI_WATERFALL_SINK_C_IMPL_H #define INCLUDED_QTGUI_WATERFALL_SINK_C_IMPL_H -#include <qtgui/waterfall_sink_c.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <thread/thread.h> -#include <qtgui/waterfalldisplayform.h> +#include <gnuradio/qtgui/waterfall_sink_c.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/fft/fft.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/qtgui/waterfalldisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc index aad2ffe5c7..d226ca6a96 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc @@ -25,7 +25,7 @@ #endif #include "waterfall_sink_f_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> @@ -51,9 +51,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("waterfall_sink_f", - gr_make_io_signature(1, -1, sizeof(float)), - gr_make_io_signature(0, 0, 0)), + : sync_block("waterfall_sink_f", + io_signature::make(1, -1, sizeof(float)), + io_signature::make(0, 0, 0)), d_fftsize(fftsize), d_fftavg(1.0), d_wintype((filter::firdes::win_type)(wintype)), d_center_freq(fc), d_bandwidth(bw), d_name(name), diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h index 02556fd9d6..16a54e0f36 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.h +++ b/gr-qtgui/lib/waterfall_sink_f_impl.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_QTGUI_WATERFALL_SINK_F_IMPL_H #define INCLUDED_QTGUI_WATERFALL_SINK_F_IMPL_H -#include <qtgui/waterfall_sink_f.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <thread/thread.h> -#include <qtgui/waterfalldisplayform.h> +#include <gnuradio/qtgui/waterfall_sink_f.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/fft/fft.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/qtgui/waterfalldisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/waterfalldisplayform.cc b/gr-qtgui/lib/waterfalldisplayform.cc index fb5df230c2..1021a4f8d3 100644 --- a/gr-qtgui/lib/waterfalldisplayform.cc +++ b/gr-qtgui/lib/waterfalldisplayform.cc @@ -23,7 +23,7 @@ #include <cmath> #include <QColorDialog> #include <QMessageBox> -#include <qtgui/waterfalldisplayform.h> +#include <gnuradio/qtgui/waterfalldisplayform.h> #include <iostream> WaterfallDisplayForm::WaterfallDisplayForm(int nplots, QWidget* parent) |