gr-qtgui: making necessary changes to build a python package and export qtgui; also preserves old convention of 'from gnuradio.qtgui import qtgui'. Some of the examples have been updated to use the new (cleaner) convention.

3 files changed, 3 insertions, 3 deletions

diff --git a/gr-qtgui/apps/pyqt_example.py b/gr-qtgui/apps/pyqt_example_c.py
index 7c0cfc698..e8f377846 100755
--- a/gr-qtgui/apps/pyqt_example.py
+++ b/gr-qtgui/apps/pyqt_example_c.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 from gnuradio import gr
-from gnuradio.qtgui import qtgui
+from gnuradio import qtgui
 from PyQt4 import QtGui, QtCore
 import sys, sip
 
diff --git a/gr-qtgui/apps/pyqt_example_f.py b/gr-qtgui/apps/pyqt_example_f.py
index 4e36ccca5..ed525ae63 100755
--- a/gr-qtgui/apps/pyqt_example_f.py
+++ b/gr-qtgui/apps/pyqt_example_f.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 from gnuradio import gr, blks2
-from gnuradio.qtgui import qtgui
+from gnuradio import qtgui
 from PyQt4 import QtGui, QtCore
 import sys, sip
 
diff --git a/gr-qtgui/apps/qt_digital.py b/gr-qtgui/apps/qt_digital.py
index 679f144ef..7b9e9b773 100755
--- a/gr-qtgui/apps/qt_digital.py
+++ b/gr-qtgui/apps/qt_digital.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 from gnuradio import gr, blks2
-from gnuradio.qtgui import qtgui
+from gnuradio import qtgui
 from gnuradio import eng_notation
 from PyQt4 import QtGui, QtCore
 import sys, sip