summaryrefslogtreecommitdiff
path: root/gr-qtgui
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2012-07-24 09:45:46 -0400
committerTom Rondeau <trondeau@vt.edu>2012-07-24 09:52:58 -0400
commitbe72d11e4ef89e78863c3244be8e360fb71c5477 (patch)
tree3cc52b5c58466e4ec63dcad0d74558d1bb663eef /gr-qtgui
parent3152d29dcc16f93e98e2a3cc2601c8712133e174 (diff)
qtgui: fixing namespace to reflect new implementation style.
Diffstat (limited to 'gr-qtgui')
-rwxr-xr-xgr-qtgui/apps/uhd_display.py3
-rw-r--r--gr-qtgui/doc/qtgui.dox2
-rw-r--r--gr-qtgui/grc/qtgui_const_sink_x.xml2
-rw-r--r--gr-qtgui/grc/qtgui_freq_sink_x.xml2
-rw-r--r--gr-qtgui/grc/qtgui_sink_x.xml2
-rw-r--r--gr-qtgui/grc/qtgui_time_sink_x.xml2
-rw-r--r--gr-qtgui/grc/qtgui_waterfall_sink_x.xml2
7 files changed, 7 insertions, 8 deletions
diff --git a/gr-qtgui/apps/uhd_display.py b/gr-qtgui/apps/uhd_display.py
index d02fbad9ee..250d757b6c 100755
--- a/gr-qtgui/apps/uhd_display.py
+++ b/gr-qtgui/apps/uhd_display.py
@@ -24,12 +24,11 @@ from gnuradio import gr
from gnuradio import uhd
from gnuradio import eng_notation
from gnuradio.eng_option import eng_option
-from gnuradio.qtgui import qtgui
from optparse import OptionParser
import sys
try:
- from gnuradio.qtgui import qtgui
+ from gnuradio import qtgui
from PyQt4 import QtGui, QtCore
import sip
except ImportError:
diff --git a/gr-qtgui/doc/qtgui.dox b/gr-qtgui/doc/qtgui.dox
index 8664af163d..c12fbf0106 100644
--- a/gr-qtgui/doc/qtgui.dox
+++ b/gr-qtgui/doc/qtgui.dox
@@ -51,7 +51,7 @@ while the GUI is alive.
\code
from PyQt4 import Qt
-from gnuradio.qtgui import qtgui
+from gnuradio import qtgui
import sys, sip
class grclass(gr.top_block):
diff --git a/gr-qtgui/grc/qtgui_const_sink_x.xml b/gr-qtgui/grc/qtgui_const_sink_x.xml
index 00fff28185..536237d164 100644
--- a/gr-qtgui/grc/qtgui_const_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_const_sink_x.xml
@@ -8,7 +8,7 @@
<name>QT GUI Constellation Sink</name>
<key>qtgui_const_sink_x</key>
<import>from PyQt4 import Qt</import>
- <import>from gnuradio.qtgui import qtgui</import>
+ <import>from gnuradio import qtgui</import>
<import>import sip</import>
<make>#set $win = 'self._%s_win'%$id
qtgui.$(type.fcn)(
diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.xml b/gr-qtgui/grc/qtgui_freq_sink_x.xml
index 92df737aa1..69ce5f4e68 100644
--- a/gr-qtgui/grc/qtgui_freq_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_freq_sink_x.xml
@@ -8,7 +8,7 @@
<name>QT GUI Frequency Sink</name>
<key>qtgui_freq_sink_x</key>
<import>from PyQt4 import Qt</import>
- <import>from gnuradio.qtgui import qtgui</import>
+ <import>from gnuradio import qtgui</import>
<import>from gnuradio.gr import firdes</import>
<import>import sip</import>
<make>#set $win = 'self._%s_win'%$id
diff --git a/gr-qtgui/grc/qtgui_sink_x.xml b/gr-qtgui/grc/qtgui_sink_x.xml
index 56ea66a205..9ea9dc583f 100644
--- a/gr-qtgui/grc/qtgui_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_sink_x.xml
@@ -8,7 +8,7 @@
<name>QT GUI Sink</name>
<key>qtgui_sink_x</key>
<import>from PyQt4 import Qt</import>
- <import>from gnuradio.qtgui import qtgui</import>
+ <import>from gnuradio import qtgui</import>
<import>from gnuradio.gr import firdes</import>
<import>import sip</import>
<make>#set $win = 'self._%s_win'%$id
diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml b/gr-qtgui/grc/qtgui_time_sink_x.xml
index 239db7566e..17b2cfd016 100644
--- a/gr-qtgui/grc/qtgui_time_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_time_sink_x.xml
@@ -8,7 +8,7 @@
<name>QT GUI Time Sink</name>
<key>qtgui_time_sink_x</key>
<import>from PyQt4 import Qt</import>
- <import>from gnuradio.qtgui import qtgui</import>
+ <import>from gnuradio import qtgui</import>
<import>from gnuradio.gr import firdes</import>
<import>import sip</import>
<make>#set $win = 'self._%s_win'%$id
diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
index 9695a1628b..49ed73191e 100644
--- a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
@@ -8,7 +8,7 @@
<name>QT GUI Waterfall Sink</name>
<key>qtgui_waterfall_sink_x</key>
<import>from PyQt4 import Qt</import>
- <import>from gnuradio.qtgui import qtgui</import>
+ <import>from gnuradio import qtgui</import>
<import>from gnuradio.gr import firdes</import>
<import>import sip</import>
<make>#set $win = 'self._%s_win'%$id