gr-qtgui: removing Guile-specific stuff since there is no way QtGui will work with Guile yet. Changed Python QA to complete properly.

6 files changed, 8 insertions, 98 deletions

diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
index a5eac6293..a4592fa41 100644
--- a/config/grc_gr_qtgui.m4
+++ b/config/grc_gr_qtgui.m4
@@ -88,13 +88,11 @@ AC_DEFUN([GRC_GR_QTGUI],[
         gr-qtgui/python/Makefile \
         gr-qtgui/python/run_tests \
         gr-qtgui/swig/Makefile \
-        gr-qtgui/swig/run_guile_tests \
     ])
 
     GRC_BUILD_CONDITIONAL(gr-qtgui,[
         dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_qtgui],
-			   [chmod +x gr-qtgui/python/run_tests
-			    chmod +x gr-qtgui/swig/run_guile_tests])
+			   [chmod +x gr-qtgui/python/run_tests])
     ])
 ])
diff --git a/gr-qtgui/python/qa_qtgui.py b/gr-qtgui/python/qa_qtgui.py
index dd6529ce0..9cafd4550 100755
--- a/gr-qtgui/python/qa_qtgui.py
+++ b/gr-qtgui/python/qa_qtgui.py
@@ -22,8 +22,6 @@
 
 from gnuradio import gr, gr_unittest
 import qtgui_swig
-from PyQt4 import QtGui, QtCore
-import sys, sip
 
 class test_qtgui(gr_unittest.TestCase):
 
@@ -34,12 +32,16 @@ class test_qtgui(gr_unittest.TestCase):
         self.tb = None
     
     def test01 (self):
-        #pass
-        # Test to make sure we can instantiate these
-        self.qapp = QtGui.QApplication(sys.argv)
+        # Test to make sure we can instantiate the sink
         self.qtsnk = qtgui_swig.sink_c(1024, gr.firdes.WIN_BLACKMAN_hARRIS, 
                                        0, 1, "Test",
                                        True, True, True, True)
+
+    def test02 (self):
+        # Test to make sure we can instantiate the sink
+        self.qtsnk = qtgui_swig.sink_f(1024, gr.firdes.WIN_BLACKMAN_hARRIS, 
+                                       0, 1, "Test",
+                                       True, True, True, True)
         
         
 if __name__ == '__main__':
diff --git a/gr-qtgui/swig/Makefile.am b/gr-qtgui/swig/Makefile.am
index ab1acce71..460868701 100644
--- a/gr-qtgui/swig/Makefile.am
+++ b/gr-qtgui/swig/Makefile.am
@@ -33,14 +33,6 @@ AM_CPPFLAGS = \
 	$(QT_INCLUDES) \
 	$(WITH_INCLUDES)
 
-if GUILE
-nobase_guile_DATA = \
-	gnuradio/qtgui.scm
-endif
-
-noinst_GUILE  = qtgui.test
-
-
 ##############################
 # SWIG interface and library
 TOP_SWIG_IFILES = \
@@ -59,7 +51,3 @@ qtgui_swig_la_swig_libadd = \
 
 # additional SWIG files to be installed
 qtgui_swig_swiginclude_headers = 
-
-if GUILE
-TESTS += run_guile_tests
-endif
\ No newline at end of file
diff --git a/gr-qtgui/swig/gnuradio/qtgui.scm b/gr-qtgui/swig/gnuradio/qtgui.scm
deleted file mode 100644
index fc650d022..000000000
--- a/gr-qtgui/swig/gnuradio/qtgui.scm
+++ /dev/null
@@ -1,28 +0,0 @@
-;;;
-;;; Copyright 2011 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Radio
-;;;
-;;; GNU Radio is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Radio is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-;;;
-
-;;; Module that just re-exports the qtgui_swig module
-
-(define-module (gnuradio qtgui)
-  #:use-module (gnuradio export-safely)
-  #:use-module (gnuradio qtgui_swig)
-  #:duplicates (merge-generics replace check))
-
-(re-export-all '(gnuradio qtgui_swig))
-
diff --git a/gr-qtgui/swig/qtgui.test b/gr-qtgui/swig/qtgui.test
deleted file mode 100644
index 956a97df9..000000000
--- a/gr-qtgui/swig/qtgui.test
+++ /dev/null
@@ -1,36 +0,0 @@
-;;; -*- Scheme -*-
-;;;
-;;; Copyright 2011 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Radio
-;;;
-;;; GNU Radio is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Radio is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-;;;
-
-;;; If you're using Emacs's Scheme mode:
-;;;   (put 'with-test-prefix 'scheme-indent-function 1)
-
-;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests.
-;;; See also the very end of the file, where the test-equal, test-eqv
-;;; and test-eq macros are defined.
-
-(define-module (test-module)
-  #:use-module (oop goops)
-  #:use-module (gnuradio core)
-  #:use-module (gnuradio test-suite lib)
-  #:duplicates (merge-generics replace check))
-
-;;; Confirm we can import the module...
-(use-modules (gnuradio qtgui))
-
diff --git a/gr-qtgui/swig/run_guile_tests.in b/gr-qtgui/swig/run_guile_tests.in
deleted file mode 100644
index 5d08b0dd5..000000000
--- a/gr-qtgui/swig/run_guile_tests.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-. @top_builddir@/setup_guile_test_env
-
-# 1st argument is absolute path to hand coded guile source directory
-# 2nd argument is absolute path to component C++ shared library build directory
-# 3nd argument is absolute path to component SWIG build directory
-
-add_local_paths \
-    @srcdir@ \
-    @abs_builddir@ \
-    @abs_builddir@
-
-@GUILE@ -e main -c '(use-modules (gnuradio test-suite guile-test))' -t @srcdir@