2 files changed, 19 insertions, 7 deletions
diff --git a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
index c70fe04cdc..db4c22b77e 100644
--- a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
@@ -137,7 +137,16 @@ public:
     virtual int nsamps() const = 0;
     virtual void reset() = 0;
 
+    // Disallow copy/move because of the pointer.
+    const_sink_c(const const_sink_c&) = delete;
+    const_sink_c& operator=(const const_sink_c&) = delete;
+    const_sink_c(const_sink_c&&) = delete;
+    const_sink_c& operator=(const_sink_c&&) = delete;
+
     QApplication* d_qApplication;
+
+protected:
+    const_sink_c() = default;
 };
 
 } /* namespace qtgui */
diff --git a/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h
index 42a351f833..db96e07625 100644
--- a/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h
+++ b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h
@@ -14,6 +14,7 @@
 #include <gnuradio/high_res_timer.h>
 #include <gnuradio/qtgui/api.h>
 #include <gnuradio/tags.h>
+#include <volk/volk_alloc.hh>
 #include <QEvent>
 #include <QString>
 #include <complex>
@@ -109,7 +110,7 @@ private:
 class TimeUpdateEvent : public QEvent
 {
 public:
-    TimeUpdateEvent(const std::vector<double*> timeDomainPoints,
+    TimeUpdateEvent(const std::vector<volk::vector<double>> timeDomainPoints,
                     const uint64_t numTimeDomainDataPoints,
                     const std::vector<std::vector<gr::tag_t>> tags);
 
@@ -139,7 +140,8 @@ private:
 class FreqUpdateEvent : public QEvent
 {
 public:
-    FreqUpdateEvent(const std::vector<double*> dataPoints, const uint64_t numDataPoints);
+    FreqUpdateEvent(const std::vector<volk::vector<double>> dataPoints,
+                    const uint64_t numDataPoints);
 
     ~FreqUpdateEvent() override;
 
@@ -178,8 +180,8 @@ private:
 class QTGUI_API ConstUpdateEvent : public QEvent
 {
 public:
-    ConstUpdateEvent(const std::vector<double*> realDataPoints,
-                     const std::vector<double*> imagDataPoints,
+    ConstUpdateEvent(const std::vector<volk::vector<double>> realDataPoints,
+                     const std::vector<volk::vector<double>> imagDataPoints,
                      const uint64_t numDataPoints);
 
     ~ConstUpdateEvent() override;
@@ -207,7 +209,7 @@ private:
 class WaterfallUpdateEvent : public QEvent
 {
 public:
-    WaterfallUpdateEvent(const std::vector<double*> dataPoints,
+    WaterfallUpdateEvent(const std::vector<volk::vector<double>> dataPoints,
                          const uint64_t numDataPoints,
                          const gr::high_res_timer_type dataTimestamp);
 
@@ -238,7 +240,7 @@ private:
 class TimeRasterUpdateEvent : public QEvent
 {
 public:
-    TimeRasterUpdateEvent(const std::vector<double*> dataPoints,
+    TimeRasterUpdateEvent(const std::vector<volk::vector<double>> dataPoints,
                           const uint64_t numDataPoints);
     ~TimeRasterUpdateEvent() override;
 
@@ -280,7 +282,8 @@ private:
 class HistogramUpdateEvent : public QEvent
 {
 public:
-    HistogramUpdateEvent(const std::vector<double*> points, const uint64_t npoints);
+    HistogramUpdateEvent(const std::vector<volk::vector<double>> points,
+                         const uint64_t npoints);
 
     ~HistogramUpdateEvent() override;