diff options
author | Johnathan Corgan | 2010-08-03 14:21:36 -0700 |
---|---|---|
committer | Johnathan Corgan | 2010-08-03 14:21:36 -0700 |
commit | 62328b4e78e2df20bccb2983bbe7591f99ba013f (patch) | |
tree | c249fa5639c2c46066782012b7075bb8b7879335 /gr-qtgui | |
parent | 8034e2cd49fd71bfdf1ed587d49781a444e1cced (diff) | |
parent | 0a9b999b5cce596f4de05828005f698047e14ce9 (diff) | |
download | gnuradio-62328b4e78e2df20bccb2983bbe7591f99ba013f.tar.gz gnuradio-62328b4e78e2df20bccb2983bbe7591f99ba013f.tar.bz2 gnuradio-62328b4e78e2df20bccb2983bbe7591f99ba013f.zip |
Merge branch 'maint'
Diffstat (limited to 'gr-qtgui')
-rw-r--r-- | gr-qtgui/src/lib/qtgui_sink_c.cc | 4 | ||||
-rw-r--r-- | gr-qtgui/src/lib/qtgui_sink_f.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gr-qtgui/src/lib/qtgui_sink_c.cc b/gr-qtgui/src/lib/qtgui_sink_c.cc index a148cf501..f77045938 100644 --- a/gr-qtgui/src/lib/qtgui_sink_c.cc +++ b/gr-qtgui/src/lib/qtgui_sink_c.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2008,2009 Free Software Foundation, Inc. + * Copyright 2008,2009,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -40,7 +40,7 @@ qtgui_make_sink_c (int fftsize, int wintype, bool use_openGL, QWidget *parent) { - return qtgui_sink_c_sptr (new qtgui_sink_c (fftsize, wintype, + return gnuradio::get_initial_sptr(new qtgui_sink_c (fftsize, wintype, fc, bw, name, plotfreq, plotwaterfall, plotwaterfall3d, plottime, diff --git a/gr-qtgui/src/lib/qtgui_sink_f.cc b/gr-qtgui/src/lib/qtgui_sink_f.cc index 8eb0a0347..976b1761b 100644 --- a/gr-qtgui/src/lib/qtgui_sink_f.cc +++ b/gr-qtgui/src/lib/qtgui_sink_f.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2008,2009 Free Software Foundation, Inc. + * Copyright 2008,2009,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -40,7 +40,7 @@ qtgui_make_sink_f (int fftsize, int wintype, bool use_openGL, QWidget *parent) { - return qtgui_sink_f_sptr (new qtgui_sink_f (fftsize, wintype, + return gnuradio::get_initial_sptr(new qtgui_sink_f (fftsize, wintype, fc, bw, name, plotfreq, plotwaterfall, plotwaterfall3d, plottime, |