global replace of filter.firdes.WIN_ with fft.window.WIN_

Signed-off-by: Josh Morman <jmorman@perspectalabs.com>

24 files changed, 46 insertions, 46 deletions

diff --git a/docs/usage-manual/(exported from wiki) Polyphase Filterbanks.txt b/docs/usage-manual/(exported from wiki) Polyphase Filterbanks.txt
index 1fb852682..f15235170 100644
--- a/docs/usage-manual/(exported from wiki) Polyphase Filterbanks.txt
+++ b/docs/usage-manual/(exported from wiki) Polyphase Filterbanks.txt
@@ -49,7 +49,7 @@ filter that is then split up between the N channels of the PFB.
     self._M = 9              # Number of channels to channelize
     self._taps = filter.firdes.low_pass_2(1, self._fs, 475.50, 50,
                                           attenuation_dB=100,
-                                          window=filter.firdes.WIN_BLACKMAN_hARRIS)
+                                          window=fft.window.WIN_BLACKMAN_hARRIS)
 
 In this example, the signal into the channelizer is sampled at 9 ksps
 (complex, so 9 kHz of bandwidth). The filter uses 9 channels, so each
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py
index 4afd1bd14..be0ec0469 100644
--- a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py
@@ -280,7 +280,7 @@ class GrDataPlotterPsdC(GrDataPlotParent):
         self._iscomplex = True
 
         self._npts = 2048
-        self._wintype = filter.firdes.WIN_BLACKMAN_hARRIS
+        self._wintype = fft.window.WIN_BLACKMAN_hARRIS
         self._fc = 0
 
         self._setup(1)
@@ -313,7 +313,7 @@ class GrDataPlotterPsdF(GrDataPlotParent):
         self._iscomplex = False
 
         self._npts = 2048
-        self._wintype = filter.firdes.WIN_BLACKMAN_hARRIS
+        self._wintype = fft.window.WIN_BLACKMAN_hARRIS
         self._fc = 0
 
         self._setup(1)
diff --git a/gr-analog/python/analog/nbfm_rx.py b/gr-analog/python/analog/nbfm_rx.py
index 2d2742374..129a4e9f0 100644
--- a/gr-analog/python/analog/nbfm_rx.py
+++ b/gr-analog/python/analog/nbfm_rx.py
@@ -66,7 +66,7 @@ class nbfm_rx(gr.hier_block2):
                                             quad_rate,      # sampling rate
                                             2.7e3,          # Audio LPF cutoff
                                             0.5e3,          # Transition band
-                                            filter.firdes.WIN_HAMMING)  # filter type
+                                            fft.window.WIN_HAMMING)  # filter type
 
         print("len(audio_taps) =", len(audio_taps))
 
diff --git a/gr-analog/python/analog/wfm_rcv.py b/gr-analog/python/analog/wfm_rcv.py
index 48501d47a..e3adc2dee 100644
--- a/gr-analog/python/analog/wfm_rcv.py
+++ b/gr-analog/python/analog/wfm_rcv.py
@@ -57,7 +57,7 @@ class wfm_rcv(gr.hier_block2):
                                               quad_rate,      # sampling rate
                                               audio_rate / 2 - width_of_transition_band,
                                               width_of_transition_band,
-                                              filter.firdes.WIN_HAMMING)
+                                              fft.window.WIN_HAMMING)
         # input: float; output: float
         self.audio_filter = filter.fir_filter_fff(audio_decimation, audio_coeffs)
 
diff --git a/gr-analog/python/analog/wfm_rcv_fmdet.py b/gr-analog/python/analog/wfm_rcv_fmdet.py
index 27a416aa1..703f39fce 100644
--- a/gr-analog/python/analog/wfm_rcv_fmdet.py
+++ b/gr-analog/python/analog/wfm_rcv_fmdet.py
@@ -60,7 +60,7 @@ class wfm_rcv_fmdet(gr.hier_block2):
                                               demod_rate,   # sampling rate
                                               15000 ,
                                               width_of_transition_band,
-                                              filter.firdes.WIN_HAMMING)
+                                              fft.window.WIN_HAMMING)
 
         # input: float; output: float
         self.audio_filter = filter.fir_filter_fff(audio_decimation, audio_coeffs)
@@ -78,7 +78,7 @@ class wfm_rcv_fmdet(gr.hier_block2):
                                                 -19020,
                                                 -18980,
                                                 width_of_transition_band,
-                                                filter.firdes.WIN_HAMMING)
+                                                fft.window.WIN_HAMMING)
 
             #print "len stereo carrier filter = ",len(stereo_carrier_filter_coeffs)
             #print "stereo carrier filter ", stereo_carrier_filter_coeffs
@@ -94,7 +94,7 @@ class wfm_rcv_fmdet(gr.hier_block2):
                                                 38000-15000 / 2,
                                                 38000+15000 / 2,
                                                 width_of_transition_band,
-                                                filter.firdes.WIN_HAMMING)
+                                                fft.window.WIN_HAMMING)
             #print "len stereo dsbsc filter = ",len(stereo_dsbsc_filter_coeffs)
             #print "stereo dsbsc filter ", stereo_dsbsc_filter_coeffs
 
@@ -115,7 +115,7 @@ class wfm_rcv_fmdet(gr.hier_block2):
                                                 57000 - 1500,
                                                 57000 + 1500,
                                                 width_of_transition_band,
-                                                filter.firdes.WIN_HAMMING)
+                                                fft.window.WIN_HAMMING)
             #print "len stereo dsbsc filter = ",len(stereo_dsbsc_filter_coeffs)
             #print "stereo dsbsc filter ", stereo_dsbsc_filter_coeffs
             # construct overlap add filter system from coefficients for stereo carrier
diff --git a/gr-filter/include/gnuradio/filter/pfb_arb_resampler.h b/gr-filter/include/gnuradio/filter/pfb_arb_resampler.h
index 007937e09..8d56dccfc 100644
--- a/gr-filter/include/gnuradio/filter/pfb_arb_resampler.h
+++ b/gr-filter/include/gnuradio/filter/pfb_arb_resampler.h
@@ -71,7 +71,7 @@ namespace kernel {
  * interpolation rate (<EM>32</EM>).
  *
  *   <B><EM>self._taps = filter.firdes.low_pass_2(32, 32*fs, BW, TB,
- *      attenuation_dB=ATT, window=filter.firdes.WIN_BLACKMAN_hARRIS)</EM></B>
+ *      attenuation_dB=ATT, window=fft.window.WIN_BLACKMAN_hARRIS)</EM></B>
  *
  * The theory behind this block can be found in Chapter 7.5 of
  * the following book:
@@ -392,7 +392,7 @@ public:
  * interpolation rate (<EM>32</EM>).
  *
  *   <B><EM>self._taps = filter.firdes.low_pass_2(32, 32*fs, BW, TB,
- *      attenuation_dB=ATT, window=filter.firdes.WIN_BLACKMAN_hARRIS)</EM></B>
+ *      attenuation_dB=ATT, window=fft.window.WIN_BLACKMAN_hARRIS)</EM></B>
  *
  * The theory behind this block can be found in Chapter 7.5 of
  * the following book:
diff --git a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h
index ec3c719c7..935157a6b 100644
--- a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h
+++ b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h
@@ -71,7 +71,7 @@ namespace filter {
  * rate (<EM>32</EM>).
  *
  *   <B><EM>self._taps = filter.firdes.low_pass_2(32, 32*fs, BW, TB,
- *      attenuation_dB=ATT, window=filter.firdes.WIN_BLACKMAN_hARRIS)</EM></B>
+ *      attenuation_dB=ATT, window=fft.window.WIN_BLACKMAN_hARRIS)</EM></B>
  *
  * The theory behind this block can be found in Chapter 7.5 of the
  * following book:
diff --git a/gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h b/gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h
index b71f6bfc3..5d0598d44 100644
--- a/gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h
+++ b/gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h
@@ -68,7 +68,7 @@ namespace filter {
  * is the gain of the filter, which we specify here as unity.
  *
  *    <B><EM>self._taps = filter.firdes.low_pass_2(1, fs, BW, TB,
- *       attenuation_dB=ATT, window=filter.firdes.WIN_BLACKMAN_hARRIS)</EM></B>
+ *       attenuation_dB=ATT, window=fft.window.WIN_BLACKMAN_hARRIS)</EM></B>
  *
  * The filter output can also be oversampled. The oversampling rate
  * is the ratio of the the actual output sampling rate to the normal
diff --git a/gr-filter/include/gnuradio/filter/pfb_decimator_ccf.h b/gr-filter/include/gnuradio/filter/pfb_decimator_ccf.h
index 34edd23b3..491c9f178 100644
--- a/gr-filter/include/gnuradio/filter/pfb_decimator_ccf.h
+++ b/gr-filter/include/gnuradio/filter/pfb_decimator_ccf.h
@@ -58,7 +58,7 @@ namespace filter {
  * unity.
  *
  *   <B><EM>self._taps = filter.firdes.low_pass_2(1, fs, BW, TB,
- *      attenuation_dB=ATT, window=filter.firdes.WIN_BLACKMAN_hARRIS)</EM></B>
+ *      attenuation_dB=ATT, window=fft.window.WIN_BLACKMAN_hARRIS)</EM></B>
  *
  * The PFB decimator code takes the taps generated above and
  * builds a set of filters. The set contains <EM>decim</EM>
diff --git a/gr-filter/include/gnuradio/filter/pfb_interpolator_ccf.h b/gr-filter/include/gnuradio/filter/pfb_interpolator_ccf.h
index 1303f3a6f..09eedacda 100644
--- a/gr-filter/include/gnuradio/filter/pfb_interpolator_ccf.h
+++ b/gr-filter/include/gnuradio/filter/pfb_interpolator_ccf.h
@@ -45,7 +45,7 @@ namespace filter {
  * overall increase in power).
  *
  *   <B><EM>self._taps = filter.firdes.low_pass_2(interp, interp*fs, BW, TB,
- *      attenuation_dB=ATT, window=filter.firdes.WIN_BLACKMAN_hARRIS)</EM></B>
+ *      attenuation_dB=ATT, window=fft.window.WIN_BLACKMAN_hARRIS)</EM></B>
  *
  * The PFB interpolator code takes the taps generated above and
  * builds a set of filters. The set contains <EM>interp</EM>
diff --git a/gr-filter/include/gnuradio/filter/polyphase_filterbank.h b/gr-filter/include/gnuradio/filter/polyphase_filterbank.h
index 64d315995..c7c60e3d3 100644
--- a/gr-filter/include/gnuradio/filter/polyphase_filterbank.h
+++ b/gr-filter/include/gnuradio/filter/polyphase_filterbank.h
@@ -75,7 +75,7 @@ namespace kernel {
  * unity.
  *
  *    <B><EM>self._taps = filter.firdes.low_pass_2(1, fs, BW, TB,
- *       attenuation_dB=ATT, window=filter.firdes.WIN_BLACKMAN_hARRIS)</EM></B>
+ *       attenuation_dB=ATT, window=fft.window.WIN_BLACKMAN_hARRIS)</EM></B>
  *
  * More on the theory of polyphase filterbanks can be found in
  * the following book:
diff --git a/gr-filter/python/filter/design/filter_design.py b/gr-filter/python/filter/design/filter_design.py
index 0addacbef..65acf31f4 100644
--- a/gr-filter/python/filter/design/filter_design.py
+++ b/gr-filter/python/filter/design/filter_design.py
@@ -488,12 +488,12 @@ class gr_plot_filter(QtGui.QMainWindow):
 
         self.gui.nTapsEdit.setText("0")
 
-        self.filterWindows = {"Hamming Window" : filter.firdes.WIN_HAMMING,
-                              "Hann Window" : filter.firdes.WIN_HANN,
-                              "Blackman Window" : filter.firdes.WIN_BLACKMAN,
-                              "Rectangular Window" : filter.firdes.WIN_RECTANGULAR,
-                              "Kaiser Window" : filter.firdes.WIN_KAISER,
-                              "Blackman-harris Window" : filter.firdes.WIN_BLACKMAN_hARRIS}
+        self.filterWindows = {"Hamming Window" : fft.window.WIN_HAMMING,
+                              "Hann Window" : fft.window.WIN_HANN,
+                              "Blackman Window" : fft.window.WIN_BLACKMAN,
+                              "Rectangular Window" : fft.window.WIN_RECTANGULAR,
+                              "Kaiser Window" : fft.window.WIN_KAISER,
+                              "Blackman-harris Window" : fft.window.WIN_BLACKMAN_hARRIS}
         self.EQUIRIPPLE_FILT = 6 # const for equiripple filter window types.
 
 
diff --git a/gr-filter/python/filter/design/fir_design.py b/gr-filter/python/filter/design/fir_design.py
index 9ad0ace6f..22d978591 100644
--- a/gr-filter/python/filter/design/fir_design.py
+++ b/gr-filter/python/filter/design/fir_design.py
@@ -156,12 +156,12 @@ def design_win_hb(fs, gain, wintype, mainwin):
     ret = r and ret
     trwidth, r = getfloat(mainwin.gui.firhbtrEdit.text())
     ret = r and ret
-    filtwin = {filter.firdes.WIN_HAMMING: 'hamming',
-               filter.firdes.WIN_HANN: 'hanning',
-               filter.firdes.WIN_BLACKMAN: 'blackman',
-               filter.firdes.WIN_RECTANGULAR: 'boxcar',
-               filter.firdes.WIN_KAISER: ('kaiser', 4.0),
-               filter.firdes.WIN_BLACKMAN_hARRIS: 'blackmanharris'}
+    filtwin = {fft.window.WIN_HAMMING: 'hamming',
+               fft.window.WIN_HANN: 'hanning',
+               fft.window.WIN_BLACKMAN: 'blackman',
+               fft.window.WIN_RECTANGULAR: 'boxcar',
+               fft.window.WIN_KAISER: ('kaiser', 4.0),
+               fft.window.WIN_BLACKMAN_hARRIS: 'blackmanharris'}
 
     if int(filtord) & 1:
         reply = QtGui.QMessageBox.information(mainwin, "Filter order should be even",
diff --git a/gr-filter/python/filter/pfb.py b/gr-filter/python/filter/pfb.py
index f740de1dd..012bc1846 100644
--- a/gr-filter/python/filter/pfb.py
+++ b/gr-filter/python/filter/pfb.py
@@ -247,7 +247,7 @@ class arb_resampler_ccf(gr.hier_block2):
             # As we drop the bw factor, the optfir filter has a harder time converging;
             # using the firdes method here for better results.
             return filter.firdes.low_pass_2(flt_size, flt_size, bw, tb, atten,
-                                                  filter.firdes.WIN_BLACKMAN_HARRIS)
+                                                  fft.window.WIN_BLACKMAN_HARRIS)
         else:
             halfband = 0.5
             bw = percent*halfband
@@ -325,7 +325,7 @@ class arb_resampler_fff(gr.hier_block2):
             # As we drop the bw factor, the optfir filter has a harder time converging;
             # using the firdes method here for better results.
             return filter.firdes.low_pass_2(flt_size, flt_size, bw, tb, atten,
-                                                  filter.firdes.WIN_BLACKMAN_HARRIS)
+                                                  fft.window.WIN_BLACKMAN_HARRIS)
         else:
             halfband = 0.5
             bw = percent*halfband
diff --git a/gr-filter/python/filter/qa_filter_delay_fc.py b/gr-filter/python/filter/qa_filter_delay_fc.py
index b6a21c1cc..f0d729106 100644
--- a/gr-filter/python/filter/qa_filter_delay_fc.py
+++ b/gr-filter/python/filter/qa_filter_delay_fc.py
@@ -69,7 +69,7 @@ class test_filter_delay_fc(gr_unittest.TestCase):
         dst2 = blocks.vector_sink_c()
 
         # calculate taps
-        taps = filter.firdes.hilbert(ntaps, filter.firdes.WIN_HAMMING)
+        taps = filter.firdes.hilbert(ntaps, fft.window.WIN_HAMMING)
         hd = filter.filter_delay_fc(taps)
 
         expected_result = fir_filter(data, taps, (ntaps - 1) // 2)
@@ -97,7 +97,7 @@ class test_filter_delay_fc(gr_unittest.TestCase):
         dst2 = blocks.vector_sink_c()
 
         # calculate taps
-        taps = filter.firdes.hilbert(ntaps, filter.firdes.WIN_HAMMING)
+        taps = filter.firdes.hilbert(ntaps, fft.window.WIN_HAMMING)
         hd = filter.filter_delay_fc(taps)
 
         expected_result = fir_filter2(data, data, taps, (ntaps - 1) // 2)
@@ -125,7 +125,7 @@ class test_filter_delay_fc(gr_unittest.TestCase):
         src1 = blocks.vector_source_f(data1)
         src2 = blocks.vector_source_f(data2)
 
-        taps = filter.firdes.hilbert(ntaps, filter.firdes.WIN_HAMMING)
+        taps = filter.firdes.hilbert(ntaps, fft.window.WIN_HAMMING)
         hd = filter.filter_delay_fc(taps)
 
         expected_result = fir_filter2(data1, data2, taps, (ntaps - 1) // 2)
diff --git a/gr-filter/python/filter/qa_firdes.py b/gr-filter/python/filter/qa_firdes.py
index 16a4054c2..416ac9306 100644
--- a/gr-filter/python/filter/qa_firdes.py
+++ b/gr-filter/python/filter/qa_firdes.py
@@ -151,7 +151,7 @@ class test_firdes(gr_unittest.TestCase):
                       0.5732954144477844, 0.0,
                       0.08335155993700027, 0.0,
                       0.010056184604763985)
-        new_taps = filter.firdes.hilbert(11, filter.firdes.WIN_HAMMING)
+        new_taps = filter.firdes.hilbert(11, fft.window.WIN_HAMMING)
         self.assertFloatTuplesAlmostEqual(known_taps, new_taps, 5)
 
     def test_root_raised_cosine(self):
diff --git a/gr-filter/python/filter/qa_hilbert.py b/gr-filter/python/filter/qa_hilbert.py
index 7363750d3..b309915d9 100644
--- a/gr-filter/python/filter/qa_hilbert.py
+++ b/gr-filter/python/filter/qa_hilbert.py
@@ -48,7 +48,7 @@ class test_hilbert(gr_unittest.TestCase):
         data = sig_source_f(sampling_freq, sampling_freq * 0.10, 1.0, N)
         src1 = blocks.vector_source_f(data)
 
-        taps = filter.firdes.hilbert(ntaps, filter.firdes.WIN_HAMMING)
+        taps = filter.firdes.hilbert(ntaps, fft.window.WIN_HAMMING)
         expected_result = fir_filter(data, taps)
 
         hilb = filter.hilbert_fc(ntaps)
diff --git a/gr-filter/python/filter/qa_pfb_arb_resampler.py b/gr-filter/python/filter/qa_pfb_arb_resampler.py
index 62f8acbdc..8e4c33b47 100644
--- a/gr-filter/python/filter/qa_pfb_arb_resampler.py
+++ b/gr-filter/python/filter/qa_pfb_arb_resampler.py
@@ -46,7 +46,7 @@ class test_pfb_arb_resampler(gr_unittest.TestCase):
             fs / 2,
             fs / 10,
             attenuation_dB=80,
-            window=filter.firdes.WIN_BLACKMAN_hARRIS)
+            window=fft.window.WIN_BLACKMAN_hARRIS)
 
         freq = 121.213
         data = sig_source_f(fs, freq, 1, N)
@@ -88,7 +88,7 @@ class test_pfb_arb_resampler(gr_unittest.TestCase):
             fs / 2,
             fs / 10,
             attenuation_dB=80,
-            window=filter.firdes.WIN_BLACKMAN_hARRIS)
+            window=fft.window.WIN_BLACKMAN_hARRIS)
 
         freq = 211.123
         data = sig_source_c(fs, freq, 1, N)
@@ -143,7 +143,7 @@ class test_pfb_arb_resampler(gr_unittest.TestCase):
             fs / 4,
             fs / 10,
             attenuation_dB=80,
-            window=filter.firdes.WIN_BLACKMAN_hARRIS)
+            window=fft.window.WIN_BLACKMAN_hARRIS)
 
         freq = 211.123
         data = sig_source_c(fs, freq, 1, N)
@@ -199,7 +199,7 @@ class test_pfb_arb_resampler(gr_unittest.TestCase):
             400,
             fs / 10,
             attenuation_dB=80,
-            window=filter.firdes.WIN_BLACKMAN_hARRIS)
+            window=fft.window.WIN_BLACKMAN_hARRIS)
 
         freq = 211.123
         data = sig_source_c(fs, freq, 1, N)
@@ -255,7 +255,7 @@ class test_pfb_arb_resampler(gr_unittest.TestCase):
             400,
             fs / 10,
             attenuation_dB=80,
-            window=filter.firdes.WIN_BLACKMAN_hARRIS)
+            window=fft.window.WIN_BLACKMAN_hARRIS)
 
         freq = 211.123
         data = sig_source_c(fs, freq, 1, N)
diff --git a/gr-filter/python/filter/qa_pfb_channelizer.py b/gr-filter/python/filter/qa_pfb_channelizer.py
index d09b1281b..4f6670749 100644
--- a/gr-filter/python/filter/qa_pfb_channelizer.py
+++ b/gr-filter/python/filter/qa_pfb_channelizer.py
@@ -38,7 +38,7 @@ class test_pfb_channelizer(gr_unittest.TestCase):
         self.taps = filter.firdes.low_pass_2(
             1, self.ifs, self.fs / 2, self.fs / 10,
             attenuation_dB=80,
-            window=filter.firdes.WIN_BLACKMAN_hARRIS)
+            window=fft.window.WIN_BLACKMAN_hARRIS)
 
         self.Ntest = 50
 
diff --git a/gr-filter/python/filter/qa_pfb_decimator.py b/gr-filter/python/filter/qa_pfb_decimator.py
index 58150fa4c..4716fa282 100644
--- a/gr-filter/python/filter/qa_pfb_decimator.py
+++ b/gr-filter/python/filter/qa_pfb_decimator.py
@@ -28,7 +28,7 @@ def run_test(tb, channel, fft_rotate, fft_filter):
 
     taps = filter.firdes.low_pass_2(1, ifs, fs / 2, fs / 10,
                                     attenuation_dB=80,
-                                    window=filter.firdes.WIN_BLACKMAN_hARRIS)
+                                    window=fft.window.WIN_BLACKMAN_hARRIS)
 
     signals = list()
     add = blocks.add_cc()
diff --git a/gr-filter/python/filter/qa_pfb_interpolator.py b/gr-filter/python/filter/qa_pfb_interpolator.py
index 1003c4ace..f3684288e 100644
--- a/gr-filter/python/filter/qa_pfb_interpolator.py
+++ b/gr-filter/python/filter/qa_pfb_interpolator.py
@@ -41,7 +41,7 @@ class test_pfb_interpolator(gr_unittest.TestCase):
             fs / 4,
             fs / 10,
             attenuation_dB=80,
-            window=filter.firdes.WIN_BLACKMAN_hARRIS)
+            window=fft.window.WIN_BLACKMAN_hARRIS)
 
         freq = 123.456
         data = sig_source_c(fs, freq, 1, N)
diff --git a/gr-filter/python/filter/qa_pfb_synthesizer.py b/gr-filter/python/filter/qa_pfb_synthesizer.py
index eb46bbe92..6239f982b 100644
--- a/gr-filter/python/filter/qa_pfb_synthesizer.py
+++ b/gr-filter/python/filter/qa_pfb_synthesizer.py
@@ -41,7 +41,7 @@ class test_pfb_synthesizer(gr_unittest.TestCase):
             fs / 2,
             fs / 10,
             attenuation_dB=80,
-            window=filter.firdes.WIN_BLACKMAN_hARRIS)
+            window=fft.window.WIN_BLACKMAN_hARRIS)
 
         signals = list()
         freqs = [0, 100, 200, -200, -100]
diff --git a/gr-qtgui/apps/uhd_display.py b/gr-qtgui/apps/uhd_display.py
index 71d84d3fe..43e71ba1f 100644
--- a/gr-qtgui/apps/uhd_display.py
+++ b/gr-qtgui/apps/uhd_display.py
@@ -182,7 +182,7 @@ class my_top_block(gr.top_block):
         self._fftsize = options.fft_size
 
         self.snk = qtgui.sink_c(options.fft_size,
-                                filter.firdes.WIN_BLACKMAN_hARRIS,
+                                fft.window.WIN_BLACKMAN_hARRIS,
                                 self._freq, self._bandwidth,
                                 "UHD Display",
                                 True, True, True, False)
diff --git a/gr-qtgui/python/qtgui/qa_qtgui.py b/gr-qtgui/python/qtgui/qa_qtgui.py
index d33884d3b..87ac67335 100644
--- a/gr-qtgui/python/qtgui/qa_qtgui.py
+++ b/gr-qtgui/python/qtgui/qa_qtgui.py
@@ -21,7 +21,7 @@ class test_qtgui(gr_unittest.TestCase):
         self.tb = None
 
     # Tests to make sure we can instantiate the sink.
-    # We use '5' in place of filter.firdes.WIN_BLACKMAN_hARRIS so we
+    # We use '5' in place of fft.window.WIN_BLACKMAN_hARRIS so we
     # don't have to worry about importing filter just for this one
     # constant.
     def test01(self):