diff options
71 files changed, 128 insertions, 128 deletions
diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt index ca3a809b5b..19a31c5f02 100644 --- a/gr-qtgui/CMakeLists.txt +++ b/gr-qtgui/CMakeLists.txt @@ -107,7 +107,7 @@ CPACK_COMPONENT("qtgui_swig" ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/qtgui) +add_subdirectory(include/gnuradio/qtgui) add_subdirectory(lib) add_subdirectory(doc) if(ENABLE_PYTHON) diff --git a/gr-qtgui/include/qtgui/CMakeLists.txt b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt index 8f95837fec..8f95837fec 100644 --- a/gr-qtgui/include/qtgui/CMakeLists.txt +++ b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt diff --git a/gr-qtgui/include/qtgui/ConstellationDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h index 041e72d45f..52a74b6d40 100644 --- a/gr-qtgui/include/qtgui/ConstellationDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h @@ -26,7 +26,7 @@ #include <stdint.h> #include <cstdio> #include <vector> -#include <qtgui/DisplayPlot.h> +#include <gnuradio/qtgui/DisplayPlot.h> /*! * \brief QWidget for displaying constellaton (I&Q) plots. diff --git a/gr-qtgui/include/qtgui/DisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h index aee9ce5880..bafc712aac 100644 --- a/gr-qtgui/include/qtgui/DisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h @@ -37,7 +37,7 @@ #include <qwt_plot_magnifier.h> #include <qwt_plot_marker.h> #include <qwt_symbol.h> -#include <qtgui/utils.h> +#include <gnuradio/qtgui/utils.h> #if QWT_VERSION >= 0x060000 #include <qwt_compat.h> diff --git a/gr-qtgui/include/qtgui/FrequencyDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h index a835e7de08..220dcd7546 100644 --- a/gr-qtgui/include/qtgui/FrequencyDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h @@ -26,7 +26,7 @@ #include <stdint.h> #include <cstdio> #include <vector> -#include <qtgui/DisplayPlot.h> +#include <gnuradio/qtgui/DisplayPlot.h> /*! * \brief QWidget for displaying frequency domain (PSD) plots. diff --git a/gr-qtgui/include/qtgui/SpectrumGUIClass.h b/gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h index 1fc5fa0f96..f95ab6477a 100644 --- a/gr-qtgui/include/qtgui/SpectrumGUIClass.h +++ b/gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h @@ -28,10 +28,10 @@ #include <qapplication.h> #include <qlabel.h> #include <qslider.h> -#include <qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> class SpectrumDisplayForm; -#include <qtgui/spectrumdisplayform.h> +#include <gnuradio/qtgui/spectrumdisplayform.h> #include <cmath> diff --git a/gr-qtgui/include/qtgui/TimeDomainDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h index 4f1883a1cf..1ef5ddd85c 100644 --- a/gr-qtgui/include/qtgui/TimeDomainDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h @@ -26,7 +26,7 @@ #include <stdint.h> #include <cstdio> #include <vector> -#include <qtgui/DisplayPlot.h> +#include <gnuradio/qtgui/DisplayPlot.h> /*! * \brief QWidget for displaying time domain plots. diff --git a/gr-qtgui/include/qtgui/TimeRasterDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h index f1936c1f53..f22028c3c9 100644 --- a/gr-qtgui/include/qtgui/TimeRasterDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h @@ -27,13 +27,13 @@ #include <cstdio> #include <vector> #include <qwt_plot_rasteritem.h> -#include <qtgui/DisplayPlot.h> -#include <qtgui/timeRasterGlobalData.h> -#include <qtgui/plot_raster.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 <qtgui/plot_waterfall.h> +#include <gnuradio/qtgui/plot_waterfall.h> #else #include <qwt_compat.h> #endif diff --git a/gr-qtgui/include/qtgui/WaterfallDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h index cc9de56b39..62ea41a87c 100644 --- a/gr-qtgui/include/qtgui/WaterfallDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h @@ -27,12 +27,12 @@ #include <cstdio> #include <vector> #include <qwt_plot_spectrogram.h> -#include <qtgui/DisplayPlot.h> -#include <qtgui/waterfallGlobalData.h> +#include <gnuradio/qtgui/DisplayPlot.h> +#include <gnuradio/qtgui/waterfallGlobalData.h> #include <gnuradio/high_res_timer.h> #if QWT_VERSION < 0x060000 -#include <qtgui/plot_waterfall.h> +#include <gnuradio/qtgui/plot_waterfall.h> #else #include <qwt_compat.h> #endif diff --git a/gr-qtgui/include/qtgui/api.h b/gr-qtgui/include/gnuradio/qtgui/api.h index 0a05544842..0a05544842 100644 --- a/gr-qtgui/include/qtgui/api.h +++ b/gr-qtgui/include/gnuradio/qtgui/api.h diff --git a/gr-qtgui/include/qtgui/const_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h index f50a13a793..d430b6ffdd 100644 --- a/gr-qtgui/include/qtgui/const_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h @@ -24,7 +24,7 @@ #define INCLUDED_QTGUI_CONST_SINK_C_H #include <Python.h> -#include <qtgui/api.h> +#include <gnuradio/qtgui/api.h> #include <gnuradio/sync_block.h> #include <qapplication.h> #include <gnuradio/filter/firdes.h> diff --git a/gr-qtgui/include/qtgui/constellationdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h index 48c70beaed..8e04218ed0 100644 --- a/gr-qtgui/include/qtgui/constellationdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h @@ -23,12 +23,12 @@ #ifndef CONSTELLATION_DISPLAY_FORM_H #define CONSTELLATION_DISPLAY_FORM_H -#include <qtgui/spectrumUpdateEvents.h> -#include <qtgui/ConstellationDisplayPlot.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/ConstellationDisplayPlot.h> #include <QtGui/QtGui> #include <vector> -#include <qtgui/displayform.h> +#include <gnuradio/qtgui/displayform.h> /*! * \brief DisplayForm child for managing constellaton (I&Q) plots. diff --git a/gr-qtgui/include/qtgui/displayform.h b/gr-qtgui/include/gnuradio/qtgui/displayform.h index ac7ee9bf8d..df0d5a94d6 100644 --- a/gr-qtgui/include/qtgui/displayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/displayform.h @@ -23,15 +23,15 @@ #ifndef DISPLAY_FORM_H #define DISPLAY_FORM_H -#include <qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <QtGui/QtGui> #include <vector> #include <qwt_plot_grid.h> #include <qwt_plot_layout.h> -#include <qtgui/DisplayPlot.h> -#include <qtgui/form_menus.h> +#include <gnuradio/qtgui/DisplayPlot.h> +#include <gnuradio/qtgui/form_menus.h> /*! * \brief Base class for setting up and managing QTGUI plot forms. diff --git a/gr-qtgui/include/qtgui/form_menus.h b/gr-qtgui/include/gnuradio/qtgui/form_menus.h index 71353616a5..1158f337a2 100644 --- a/gr-qtgui/include/qtgui/form_menus.h +++ b/gr-qtgui/include/gnuradio/qtgui/form_menus.h @@ -28,7 +28,7 @@ #include <QtGui/QtGui> #include <qwt_symbol.h> #include <gnuradio/filter/firdes.h> -#include <qtgui/qtgui_types.h> +#include <gnuradio/qtgui/qtgui_types.h> class LineColorMenu: public QMenu { diff --git a/gr-qtgui/include/qtgui/freq_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h index 3708f3a27a..667ee95e18 100644 --- a/gr-qtgui/include/qtgui/freq_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h @@ -24,7 +24,7 @@ #define INCLUDED_QTGUI_FREQ_SINK_C_H #include <Python.h> -#include <qtgui/api.h> +#include <gnuradio/qtgui/api.h> #include <gnuradio/sync_block.h> #include <qapplication.h> #include <gnuradio/filter/firdes.h> diff --git a/gr-qtgui/include/qtgui/freq_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h index 1a0a08aeb6..77e9159fe3 100644 --- a/gr-qtgui/include/qtgui/freq_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h @@ -24,7 +24,7 @@ #define INCLUDED_QTGUI_FREQ_SINK_F_H #include <Python.h> -#include <qtgui/api.h> +#include <gnuradio/qtgui/api.h> #include <gnuradio/sync_block.h> #include <qapplication.h> #include <gnuradio/filter/firdes.h> diff --git a/gr-qtgui/include/qtgui/freqdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h index 95e297c90d..48dd1a6377 100644 --- a/gr-qtgui/include/qtgui/freqdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h @@ -23,13 +23,13 @@ #ifndef FREQ_DISPLAY_FORM_H #define FREQ_DISPLAY_FORM_H -#include <qtgui/spectrumUpdateEvents.h> -#include <qtgui/FrequencyDisplayPlot.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/FrequencyDisplayPlot.h> #include <QtGui/QtGui> #include <vector> #include <gnuradio/filter/firdes.h> -#include <qtgui/displayform.h> +#include <gnuradio/qtgui/displayform.h> /*! * \brief DisplayForm child for managing frequency (PSD) plots. diff --git a/gr-qtgui/include/qtgui/plot_raster.h b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h index 2a5159e00e..6352e9f0db 100644 --- a/gr-qtgui/include/qtgui/plot_raster.h +++ b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h @@ -24,7 +24,7 @@ #define PLOT_TIMERASTER_H #include <qglobal.h> -#include <qtgui/timeRasterGlobalData.h> +#include <gnuradio/qtgui/timeRasterGlobalData.h> #include <qwt_plot_rasteritem.h> #if QWT_VERSION >= 0x060000 diff --git a/gr-qtgui/include/qtgui/plot_waterfall.h b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h index ed8edbbd0c..bd550ec676 100644 --- a/gr-qtgui/include/qtgui/plot_waterfall.h +++ b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h @@ -24,7 +24,7 @@ #define PLOT_WATERFALL_H #include <qglobal.h> -#include <qtgui/waterfallGlobalData.h> +#include <gnuradio/qtgui/waterfallGlobalData.h> #include <qwt_plot_rasteritem.h> #if QWT_VERSION >= 0x060000 diff --git a/gr-qtgui/include/qtgui/qtgui_types.h b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h index f71ab9eda3..f71ab9eda3 100644 --- a/gr-qtgui/include/qtgui/qtgui_types.h +++ b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h diff --git a/gr-qtgui/include/qtgui/sink_c.h b/gr-qtgui/include/gnuradio/qtgui/sink_c.h index 526df8fc26..9b30e74c95 100644 --- a/gr-qtgui/include/qtgui/sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/sink_c.h @@ -24,7 +24,7 @@ #define INCLUDED_QTGUI_SINK_C_H #include <Python.h> -#include <qtgui/api.h> +#include <gnuradio/qtgui/api.h> #include <gnuradio/block.h> #include <qapplication.h> #include <qwt_symbol.h> diff --git a/gr-qtgui/include/qtgui/sink_f.h b/gr-qtgui/include/gnuradio/qtgui/sink_f.h index cad36a10d7..99e499421b 100644 --- a/gr-qtgui/include/qtgui/sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/sink_f.h @@ -24,7 +24,7 @@ #define INCLUDED_QTGUI_SINK_F_H #include <Python.h> -#include <qtgui/api.h> +#include <gnuradio/qtgui/api.h> #include <gnuradio/block.h> #include <qapplication.h> #include <qwt_symbol.h> diff --git a/gr-qtgui/include/qtgui/spectrumUpdateEvents.h b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h index 361610d095..361610d095 100644 --- a/gr-qtgui/include/qtgui/spectrumUpdateEvents.h +++ b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h diff --git a/gr-qtgui/include/qtgui/spectrumdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h index 37a481245c..6b43661cb4 100644 --- a/gr-qtgui/include/qtgui/spectrumdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h @@ -26,13 +26,13 @@ #include <spectrumdisplayform.ui.h> class SpectrumGUIClass; -#include <qtgui/SpectrumGUIClass.h> +#include <gnuradio/qtgui/SpectrumGUIClass.h> -#include <qtgui/SpectrumGUIClass.h> -#include <qtgui/FrequencyDisplayPlot.h> -#include <qtgui/WaterfallDisplayPlot.h> -#include <qtgui/TimeDomainDisplayPlot.h> -#include <qtgui/ConstellationDisplayPlot.h> +#include <gnuradio/qtgui/SpectrumGUIClass.h> +#include <gnuradio/qtgui/FrequencyDisplayPlot.h> +#include <gnuradio/qtgui/WaterfallDisplayPlot.h> +#include <gnuradio/qtgui/TimeDomainDisplayPlot.h> +#include <gnuradio/qtgui/ConstellationDisplayPlot.h> #include <QValidator> #include <QTimer> #include <vector> diff --git a/gr-qtgui/include/qtgui/timeRasterGlobalData.h b/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h index 0a414432d1..0a414432d1 100644 --- a/gr-qtgui/include/qtgui/timeRasterGlobalData.h +++ b/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h diff --git a/gr-qtgui/include/qtgui/time_raster_sink_b.h b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h index d232f8e933..22130e56aa 100644 --- a/gr-qtgui/include/qtgui/time_raster_sink_b.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h @@ -24,7 +24,7 @@ #define INCLUDED_QTGUI_TIME_RASTER_SINK_B_H #include <Python.h> -#include <qtgui/api.h> +#include <gnuradio/qtgui/api.h> #include <gnuradio/sync_block.h> #include <qapplication.h> #include <qwt_symbol.h> diff --git a/gr-qtgui/include/qtgui/time_raster_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h index 288d970d78..5a82587074 100644 --- a/gr-qtgui/include/qtgui/time_raster_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h @@ -24,7 +24,7 @@ #define INCLUDED_QTGUI_TIME_RASTER_SINK_F_H #include <Python.h> -#include <qtgui/api.h> +#include <gnuradio/qtgui/api.h> #include <gnuradio/sync_block.h> #include <qapplication.h> #include <qwt_symbol.h> diff --git a/gr-qtgui/include/qtgui/time_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h index 4ac8640f7d..8563cf5cd1 100644 --- a/gr-qtgui/include/qtgui/time_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h @@ -24,7 +24,7 @@ #define INCLUDED_QTGUI_TIME_SINK_C_H #include <Python.h> -#include <qtgui/api.h> +#include <gnuradio/qtgui/api.h> #include <gnuradio/sync_block.h> #include <qapplication.h> diff --git a/gr-qtgui/include/qtgui/time_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h index 56970ef721..f9457f7a72 100644 --- a/gr-qtgui/include/qtgui/time_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h @@ -24,7 +24,7 @@ #define INCLUDED_QTGUI_TIME_SINK_F_H #include <Python.h> -#include <qtgui/api.h> +#include <gnuradio/qtgui/api.h> #include <gnuradio/sync_block.h> #include <qapplication.h> diff --git a/gr-qtgui/include/qtgui/timedisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h index 4e216abb0c..07118a4baa 100644 --- a/gr-qtgui/include/qtgui/timedisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h @@ -23,12 +23,12 @@ #ifndef TIME_DISPLAY_FORM_H #define TIME_DISPLAY_FORM_H -#include <qtgui/spectrumUpdateEvents.h> -#include <qtgui/TimeDomainDisplayPlot.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/TimeDomainDisplayPlot.h> #include <QtGui/QtGui> #include <vector> -#include <qtgui/displayform.h> +#include <gnuradio/qtgui/displayform.h> /*! * \brief DisplayForm child for managing time domain plots. diff --git a/gr-qtgui/include/qtgui/timerasterdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h index 05b20e2cef..24933c3c05 100644 --- a/gr-qtgui/include/qtgui/timerasterdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h @@ -23,13 +23,13 @@ #ifndef TIMERASTER_DISPLAY_FORM_H #define TIMERASTER_DISPLAY_FORM_H -#include <qtgui/spectrumUpdateEvents.h> -#include <qtgui/TimeRasterDisplayPlot.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/TimeRasterDisplayPlot.h> #include <QtGui/QtGui> #include <vector> #include <gnuradio/filter/firdes.h> -#include <qtgui/displayform.h> +#include <gnuradio/qtgui/displayform.h> /*! * \brief DisplayForm child for managing time raster plots. diff --git a/gr-qtgui/include/qtgui/utils.h b/gr-qtgui/include/gnuradio/qtgui/utils.h index f490c48567..c4271288fa 100644 --- a/gr-qtgui/include/qtgui/utils.h +++ b/gr-qtgui/include/gnuradio/qtgui/utils.h @@ -24,7 +24,7 @@ #define INCLUDED_QTGUI_UTILS_H #include <qevent.h> -#include <qtgui/api.h> +#include <gnuradio/qtgui/api.h> #include <qwt_plot_picker.h> #include <qwt_picker_machine.h> diff --git a/gr-qtgui/include/qtgui/waterfallGlobalData.h b/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h index 8ab9590d0b..8ab9590d0b 100644 --- a/gr-qtgui/include/qtgui/waterfallGlobalData.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h diff --git a/gr-qtgui/include/qtgui/waterfall_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h index 30eff9d70d..74b94bb4b4 100644 --- a/gr-qtgui/include/qtgui/waterfall_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h @@ -24,7 +24,7 @@ #define INCLUDED_QTGUI_WATERFALL_SINK_C_H #include <Python.h> -#include <qtgui/api.h> +#include <gnuradio/qtgui/api.h> #include <gnuradio/sync_block.h> #include <qapplication.h> #include <gnuradio/filter/firdes.h> diff --git a/gr-qtgui/include/qtgui/waterfall_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h index 3f97d4fcfe..8b6fce2651 100644 --- a/gr-qtgui/include/qtgui/waterfall_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h @@ -24,7 +24,7 @@ #define INCLUDED_QTGUI_WATERFALL_SINK_F_H #include <Python.h> -#include <qtgui/api.h> +#include <gnuradio/qtgui/api.h> #include <gnuradio/sync_block.h> #include <qapplication.h> #include <gnuradio/filter/firdes.h> diff --git a/gr-qtgui/include/qtgui/waterfalldisplayform.h b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h index 6419c1c826..8d78bb015a 100644 --- a/gr-qtgui/include/qtgui/waterfalldisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h @@ -23,13 +23,13 @@ #ifndef WATERFALL_DISPLAY_FORM_H #define WATERFALL_DISPLAY_FORM_H -#include <qtgui/spectrumUpdateEvents.h> -#include <qtgui/WaterfallDisplayPlot.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/WaterfallDisplayPlot.h> #include <QtGui/QtGui> #include <vector> #include <gnuradio/filter/firdes.h> -#include <qtgui/displayform.h> +#include <gnuradio/qtgui/displayform.h> /*! * \brief DisplayForm child for managing waterfall (spectrogram) plots. 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.h b/gr-qtgui/lib/const_sink_c_impl.h index 3a2bda242a..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 <gnuradio/qtgui/const_sink_c.h> #include <gnuradio/high_res_timer.h> #include <gnuradio/thread/thread.h> -#include <qtgui/constellationdisplayform.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.h b/gr-qtgui/lib/freq_sink_c_impl.h index 1293c48866..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 <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 <qtgui/freqdisplayform.h> +#include <gnuradio/qtgui/freqdisplayform.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 4fb6c00360..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 <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 <qtgui/freqdisplayform.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.h b/gr-qtgui/lib/sink_c_impl.h index a1abaab614..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 <gnuradio/qtgui/sink_c.h> #include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> -#include <qtgui/SpectrumGUIClass.h> +#include <gnuradio/qtgui/SpectrumGUIClass.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/sink_f_impl.h b/gr-qtgui/lib/sink_f_impl.h index 645af4bb07..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 <gnuradio/qtgui/sink_f.h> #include <gnuradio/filter/firdes.h> #include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> -#include <qtgui/SpectrumGUIClass.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/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.h b/gr-qtgui/lib/time_raster_sink_b_impl.h index 73b26c9351..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 <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 <qtgui/timerasterdisplayform.h> +#include <gnuradio/qtgui/timerasterdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/time_raster_sink_c_impl.h b/gr-qtgui/lib/time_raster_sink_c_impl.h index 3e3d9f248f..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 <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 <qtgui/time_rasterdisplayform.h> +#include <gnuradio/qtgui/time_rasterdisplayform.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 d30ffadd50..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 <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 <qtgui/timerasterdisplayform.h> +#include <gnuradio/qtgui/timerasterdisplayform.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 d18c3e468d..724d38e2ae 100644 --- a/gr-qtgui/lib/time_sink_c_impl.h +++ b/gr-qtgui/lib/time_sink_c_impl.h @@ -23,8 +23,8 @@ #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 <gnuradio/qtgui/time_sink_c.h> +#include <gnuradio/qtgui/timedisplayform.h> #include <gnuradio/thread/thread.h> #include <gnuradio/high_res_timer.h> diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h index 7fb6bacb95..c3bd7cd838 100644 --- a/gr-qtgui/lib/time_sink_f_impl.h +++ b/gr-qtgui/lib/time_sink_f_impl.h @@ -23,8 +23,8 @@ #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 <gnuradio/qtgui/time_sink_f.h> +#include <gnuradio/qtgui/timedisplayform.h> #include <gnuradio/thread/thread.h> #include <gnuradio/high_res_timer.h> 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.h b/gr-qtgui/lib/waterfall_sink_c_impl.h index c4c2d12fc2..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 <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 <qtgui/waterfalldisplayform.h> +#include <gnuradio/qtgui/waterfalldisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h index 0995e4170f..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 <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 <qtgui/waterfalldisplayform.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) diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt index 15b2147d6f..1c9a182625 100644 --- a/gr-qtgui/swig/CMakeLists.txt +++ b/gr-qtgui/swig/CMakeLists.txt @@ -39,7 +39,7 @@ if(ENABLE_GR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/qtgui_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/qtgui) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/qtgui) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_LIBRARIES gnuradio-qtgui) diff --git a/gr-qtgui/swig/qtgui_swig.i b/gr-qtgui/swig/qtgui_swig.i index b209be6506..a04267dffc 100644 --- a/gr-qtgui/swig/qtgui_swig.i +++ b/gr-qtgui/swig/qtgui_swig.i @@ -32,33 +32,33 @@ %import "gnuradio/filter/firdes.h" %{ -#include "qtgui/form_menus.h" -#include "qtgui/DisplayPlot.h" -#include "qtgui/displayform.h" -#include "qtgui/sink_c.h" -#include "qtgui/sink_f.h" -#include "qtgui/time_sink_c.h" -#include "qtgui/time_sink_f.h" -#include "qtgui/time_raster_sink_b.h" -#include "qtgui/time_raster_sink_f.h" -#include "qtgui/freq_sink_c.h" -#include "qtgui/freq_sink_f.h" -#include "qtgui/const_sink_c.h" -#include "qtgui/waterfall_sink_c.h" -#include "qtgui/waterfall_sink_f.h" +#include "gnuradio/qtgui/form_menus.h" +#include "gnuradio/qtgui/DisplayPlot.h" +#include "gnuradio/qtgui/displayform.h" +#include "gnuradio/qtgui/sink_c.h" +#include "gnuradio/qtgui/sink_f.h" +#include "gnuradio/qtgui/time_sink_c.h" +#include "gnuradio/qtgui/time_sink_f.h" +#include "gnuradio/qtgui/time_raster_sink_b.h" +#include "gnuradio/qtgui/time_raster_sink_f.h" +#include "gnuradio/qtgui/freq_sink_c.h" +#include "gnuradio/qtgui/freq_sink_f.h" +#include "gnuradio/qtgui/const_sink_c.h" +#include "gnuradio/qtgui/waterfall_sink_c.h" +#include "gnuradio/qtgui/waterfall_sink_f.h" %} -%include "qtgui/sink_c.h" -%include "qtgui/sink_f.h" -%include "qtgui/time_sink_c.h" -%include "qtgui/time_sink_f.h" -%include "qtgui/time_raster_sink_b.h" -%include "qtgui/time_raster_sink_f.h" -%include "qtgui/freq_sink_c.h" -%include "qtgui/freq_sink_f.h" -%include "qtgui/const_sink_c.h" -%include "qtgui/waterfall_sink_c.h" -%include "qtgui/waterfall_sink_f.h" +%include "gnuradio/qtgui/sink_c.h" +%include "gnuradio/qtgui/sink_f.h" +%include "gnuradio/qtgui/time_sink_c.h" +%include "gnuradio/qtgui/time_sink_f.h" +%include "gnuradio/qtgui/time_raster_sink_b.h" +%include "gnuradio/qtgui/time_raster_sink_f.h" +%include "gnuradio/qtgui/freq_sink_c.h" +%include "gnuradio/qtgui/freq_sink_f.h" +%include "gnuradio/qtgui/const_sink_c.h" +%include "gnuradio/qtgui/waterfall_sink_c.h" +%include "gnuradio/qtgui/waterfall_sink_f.h" GR_SWIG_BLOCK_MAGIC2(qtgui, sink_c); GR_SWIG_BLOCK_MAGIC2(qtgui, sink_f); |