summaryrefslogtreecommitdiff
path: root/gr-qtgui/lib
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2013-04-29 22:50:34 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2013-04-29 22:50:34 -0700
commit994db715b11e90de6f77af8aefedc0b8e8434c67 (patch)
treee53c91cfc42a144cf36171fd2ec09d2f6c460e51 /gr-qtgui/lib
parent3e3083d2b6722a137cc6850e9d8f8b74008601e0 (diff)
wip, gr-qtgui not compiling
Diffstat (limited to 'gr-qtgui/lib')
-rw-r--r--gr-qtgui/lib/CMakeLists.txt2
-rw-r--r--gr-qtgui/lib/ConstellationDisplayPlot.cc2
-rw-r--r--gr-qtgui/lib/DisplayPlot.cc2
-rw-r--r--gr-qtgui/lib/FrequencyDisplayPlot.cc4
-rw-r--r--gr-qtgui/lib/SpectrumGUIClass.cc2
-rw-r--r--gr-qtgui/lib/TimeDomainDisplayPlot.cc2
-rw-r--r--gr-qtgui/lib/TimeRasterDisplayPlot.cc4
-rw-r--r--gr-qtgui/lib/WaterfallDisplayPlot.cc4
-rw-r--r--gr-qtgui/lib/const_sink_c_impl.h4
-rw-r--r--gr-qtgui/lib/constellationdisplayform.cc2
-rw-r--r--gr-qtgui/lib/displayform.cc2
-rw-r--r--gr-qtgui/lib/freq_sink_c_impl.h4
-rw-r--r--gr-qtgui/lib/freq_sink_f_impl.h4
-rw-r--r--gr-qtgui/lib/freqdisplayform.cc2
-rw-r--r--gr-qtgui/lib/plot_raster.cc2
-rw-r--r--gr-qtgui/lib/plot_waterfall.cc2
-rw-r--r--gr-qtgui/lib/qtgui_util.cc2
-rw-r--r--gr-qtgui/lib/sink_c_impl.h4
-rw-r--r--gr-qtgui/lib/sink_f_impl.h4
-rw-r--r--gr-qtgui/lib/spectrumUpdateEvents.cc2
-rw-r--r--gr-qtgui/lib/spectrumdisplayform.cc4
-rw-r--r--gr-qtgui/lib/timeRasterGlobalData.cc2
-rw-r--r--gr-qtgui/lib/time_raster_sink_b_impl.h4
-rw-r--r--gr-qtgui/lib/time_raster_sink_c_impl.h4
-rw-r--r--gr-qtgui/lib/time_raster_sink_f_impl.h4
-rw-r--r--gr-qtgui/lib/time_sink_c_impl.h4
-rw-r--r--gr-qtgui/lib/time_sink_f_impl.h4
-rw-r--r--gr-qtgui/lib/timedisplayform.cc2
-rw-r--r--gr-qtgui/lib/timerasterdisplayform.cc2
-rw-r--r--gr-qtgui/lib/waterfallGlobalData.cc2
-rw-r--r--gr-qtgui/lib/waterfall_sink_c_impl.h4
-rw-r--r--gr-qtgui/lib/waterfall_sink_f_impl.h4
-rw-r--r--gr-qtgui/lib/waterfalldisplayform.cc2
33 files changed, 49 insertions, 49 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.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)