diff options
| author | Thomas Habets <thomas@habets.se> | 2021-02-19 17:38:58 +0000 |
|---|---|---|
| committer | Martin Braun <martin@gnuradio.org> | 2021-02-26 01:17:25 -0800 |
| commit | 4b7006db76b570e4d916e263301333d2f4d2a2df (patch) | |
| tree | fb618398b0a1900f2b47749d6a2928570c9ebbf2 /gr-qtgui/lib/histogram_sink_f_impl.h | |
| parent | 044b4a3b49b67adfe53e0e88f9adf847a25fad61 (diff) | |
qtgui: Remove manual memory management
Signed-off-by: Thomas Habets <thomas@habets.se>
Diffstat (limited to 'gr-qtgui/lib/histogram_sink_f_impl.h')
| -rw-r--r-- | gr-qtgui/lib/histogram_sink_f_impl.h | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/gr-qtgui/lib/histogram_sink_f_impl.h b/gr-qtgui/lib/histogram_sink_f_impl.h index f181654108..3c9e682790 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.h +++ b/gr-qtgui/lib/histogram_sink_f_impl.h @@ -30,13 +30,18 @@ private: const std::string d_name; int d_nconnections; - int d_index; - std::vector<double*> d_residbufs; - - int d_argc; - char* d_argv; + int d_index = 0; + std::vector<volk::vector<double>> d_residbufs; + + // Required now for Qt; argc must be greater than 0 and argv + // must have at least one valid character. Must be valid through + // life of the qApplication: + // http://harmattan-dev.nokia.com/docs/library/html/qt4/qapplication.html + char d_zero = 0; + int d_argc = 1; + char* d_argv = &d_zero; QWidget* d_parent; - HistogramDisplayForm* d_main_gui; + HistogramDisplayForm* d_main_gui = nullptr; gr::high_res_timer_type d_update_time; gr::high_res_timer_type d_last_time; @@ -56,6 +61,12 @@ public: QWidget* parent = NULL); ~histogram_sink_f_impl() override; + // Disallow copy/move because of the raw pointers. + histogram_sink_f_impl(const histogram_sink_f_impl&) = delete; + histogram_sink_f_impl& operator=(const histogram_sink_f_impl&) = delete; + histogram_sink_f_impl(histogram_sink_f_impl&&) = delete; + histogram_sink_f_impl& operator=(histogram_sink_f_impl&&) = delete; + bool check_topology(int ninputs, int noutputs) override; void exec_() override; |