Replace all calls to `get_initial_sptr` with `make_block_sptr`

First batch of changes: ``` find […] -print0 | xargs -0 sed -i -r '/get_initial_sptr/{:nxt N;/;/!b nxt;s/get_initial_sptr\(\s*new ([^(]+)(.*)\)\)/make_block_sptr<\1>\2)/}' ``` Then: * Back out `sptr_magic.h` edits * Change some `friend` clauses * clang-format the whole thing * Update checksums in the pybind11 bindings files
author: Thomas Habets <thomas@habets.se> 2020-05-03 12:23:51 +0100
committer: Marcus Müller <marcus@hostalia.de> 2020-07-30 18:12:44 +0200
commit: 30643f01609e915296023adc37123e27e2c86d3f (patch)
tree: caf7141e8091cd30cde4e75ef0d1fcc5454ace77 /gr-qtgui
parent: 875148321bca3c39af9aec8dee3c24eb9f75d1e6 (diff)
18 files changed, 51 insertions, 52 deletions
diff --git a/gr-qtgui/lib/ber_sink_b_impl.cc b/gr-qtgui/lib/ber_sink_b_impl.cc
index f032f6ce26..0740858c66 100644
--- a/gr-qtgui/lib/ber_sink_b_impl.cc
+++ b/gr-qtgui/lib/ber_sink_b_impl.cc
@@ -30,8 +30,8 @@ ber_sink_b::sptr ber_sink_b::make(std::vector<float> esnos,
                                   std::vector<std::string> curvenames,
                                   QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(new ber_sink_b_impl(
-        esnos, curves, ber_min_errors, ber_limit, curvenames, parent));
+    return gnuradio::make_block_sptr<ber_sink_b_impl>(
+        esnos, curves, ber_min_errors, ber_limit, curvenames, parent);
 }
 
 ber_sink_b_impl::ber_sink_b_impl(std::vector<float> esnos,
diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc
index a9dfe70d17..622a328242 100644
--- a/gr-qtgui/lib/const_sink_c_impl.cc
+++ b/gr-qtgui/lib/const_sink_c_impl.cc
@@ -26,8 +26,7 @@ namespace qtgui {
 const_sink_c::sptr
 const_sink_c::make(int size, const std::string& name, int nconnections, QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(
-        new const_sink_c_impl(size, name, nconnections, parent));
+    return gnuradio::make_block_sptr<const_sink_c_impl>(size, name, nconnections, parent);
 }
 
 const_sink_c_impl::const_sink_c_impl(int size,
diff --git a/gr-qtgui/lib/edit_box_msg_impl.cc b/gr-qtgui/lib/edit_box_msg_impl.cc
index 8f33adb322..bb1b069857 100644
--- a/gr-qtgui/lib/edit_box_msg_impl.cc
+++ b/gr-qtgui/lib/edit_box_msg_impl.cc
@@ -30,8 +30,8 @@ edit_box_msg::sptr edit_box_msg::make(data_type_t type,
                                       const std::string& key,
                                       QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(
-        new edit_box_msg_impl(type, value, label, is_pair, is_static, key, parent));
+    return gnuradio::make_block_sptr<edit_box_msg_impl>(
+        type, value, label, is_pair, is_static, key, parent);
 }
 
 edit_box_msg_impl::edit_box_msg_impl(data_type_t type,
diff --git a/gr-qtgui/lib/eye_sink_c_impl.cc b/gr-qtgui/lib/eye_sink_c_impl.cc
index 7a3f1646d2..662f5a2bc5 100644
--- a/gr-qtgui/lib/eye_sink_c_impl.cc
+++ b/gr-qtgui/lib/eye_sink_c_impl.cc
@@ -33,8 +33,8 @@ eye_sink_c::sptr eye_sink_c::make(int size,
                                   unsigned int nconnections,
                                   QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(
-        new eye_sink_c_impl(size, samp_rate, name, nconnections, parent));
+    return gnuradio::make_block_sptr<eye_sink_c_impl>(
+        size, samp_rate, name, nconnections, parent);
 }
 
 eye_sink_c_impl::eye_sink_c_impl(int size,
diff --git a/gr-qtgui/lib/eye_sink_f_impl.cc b/gr-qtgui/lib/eye_sink_f_impl.cc
index 7e3efccb0e..ed7fea983a 100644
--- a/gr-qtgui/lib/eye_sink_f_impl.cc
+++ b/gr-qtgui/lib/eye_sink_f_impl.cc
@@ -33,8 +33,8 @@ eye_sink_f::sptr eye_sink_f::make(int size,
                                   unsigned int nconnections,
                                   QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(
-        new eye_sink_f_impl(size, samp_rate, name, nconnections, parent));
+    return gnuradio::make_block_sptr<eye_sink_f_impl>(
+        size, samp_rate, name, nconnections, parent);
 }
 
 eye_sink_f_impl::eye_sink_f_impl(int size,
diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc
index 63490e72ac..f3cb9eb00e 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.cc
+++ b/gr-qtgui/lib/freq_sink_c_impl.cc
@@ -34,8 +34,8 @@ freq_sink_c::sptr freq_sink_c::make(int fftsize,
                                     int nconnections,
                                     QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(
-        new freq_sink_c_impl(fftsize, wintype, fc, bw, name, nconnections, parent));
+    return gnuradio::make_block_sptr<freq_sink_c_impl>(
+        fftsize, wintype, fc, bw, name, nconnections, parent);
 }
 
 freq_sink_c_impl::freq_sink_c_impl(int fftsize,
diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc
index 0622fa2577..2dfafb71b8 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.cc
+++ b/gr-qtgui/lib/freq_sink_f_impl.cc
@@ -34,8 +34,8 @@ freq_sink_f::sptr freq_sink_f::make(int fftsize,
                                     int nconnections,
                                     QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(
-        new freq_sink_f_impl(fftsize, wintype, fc, bw, name, nconnections, parent));
+    return gnuradio::make_block_sptr<freq_sink_f_impl>(
+        fftsize, wintype, fc, bw, name, nconnections, parent);
 }
 
 freq_sink_f_impl::freq_sink_f_impl(int fftsize,
diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc
index 06280b8397..dbef86ee7a 100644
--- a/gr-qtgui/lib/histogram_sink_f_impl.cc
+++ b/gr-qtgui/lib/histogram_sink_f_impl.cc
@@ -33,8 +33,8 @@ histogram_sink_f::sptr histogram_sink_f::make(int size,
                                               int nconnections,
                                               QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(
-        new histogram_sink_f_impl(size, bins, xmin, xmax, name, nconnections, parent));
+    return gnuradio::make_block_sptr<histogram_sink_f_impl>(
+        size, bins, xmin, xmax, name, nconnections, parent);
 }
 
 histogram_sink_f_impl::histogram_sink_f_impl(int size,
diff --git a/gr-qtgui/lib/number_sink_impl.cc b/gr-qtgui/lib/number_sink_impl.cc
index 567fd1c3da..81611f5fb8 100644
--- a/gr-qtgui/lib/number_sink_impl.cc
+++ b/gr-qtgui/lib/number_sink_impl.cc
@@ -38,8 +38,8 @@ namespace qtgui {
 number_sink::sptr number_sink::make(
     size_t itemsize, float average, graph_t graph_type, int nconnections, QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(
-        new number_sink_impl(itemsize, average, graph_type, nconnections, parent));
+    return gnuradio::make_block_sptr<number_sink_impl>(
+        itemsize, average, graph_type, nconnections, parent);
 }
 
 number_sink_impl::number_sink_impl(
diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc
index 567f369e7e..39bd74aa3e 100644
--- a/gr-qtgui/lib/sink_c_impl.cc
+++ b/gr-qtgui/lib/sink_c_impl.cc
@@ -35,16 +35,16 @@ sink_c::sptr sink_c::make(int fftsize,
                           bool plotconst,
                           QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(new sink_c_impl(fftsize,
-                                                      wintype,
-                                                      fc,
-                                                      bw,
-                                                      name,
-                                                      plotfreq,
-                                                      plotwaterfall,
-                                                      plottime,
-                                                      plotconst,
-                                                      parent));
+    return gnuradio::make_block_sptr<sink_c_impl>(fftsize,
+                                                  wintype,
+                                                  fc,
+                                                  bw,
+                                                  name,
+                                                  plotfreq,
+                                                  plotwaterfall,
+                                                  plottime,
+                                                  plotconst,
+                                                  parent);
 }
 
 sink_c_impl::sink_c_impl(int fftsize,
diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc
index c7fb5d39f2..acaf4b4e09 100644
--- a/gr-qtgui/lib/sink_f_impl.cc
+++ b/gr-qtgui/lib/sink_f_impl.cc
@@ -35,16 +35,16 @@ sink_f::sptr sink_f::make(int fftsize,
                           bool plotconst,
                           QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(new sink_f_impl(fftsize,
-                                                      wintype,
-                                                      fc,
-                                                      bw,
-                                                      name,
-                                                      plotfreq,
-                                                      plotwaterfall,
-                                                      plottime,
-                                                      plotconst,
-                                                      parent));
+    return gnuradio::make_block_sptr<sink_f_impl>(fftsize,
+                                                  wintype,
+                                                  fc,
+                                                  bw,
+                                                  name,
+                                                  plotfreq,
+                                                  plotwaterfall,
+                                                  plottime,
+                                                  plotconst,
+                                                  parent);
 }
 
 sink_f_impl::sink_f_impl(int fftsize,
diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc
index ddc5809111..bf2812fd97 100644
--- a/gr-qtgui/lib/time_raster_sink_b_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc
@@ -33,8 +33,8 @@ time_raster_sink_b::sptr time_raster_sink_b::make(double samp_rate,
                                                   int nconnections,
                                                   QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(new time_raster_sink_b_impl(
-        samp_rate, rows, cols, mult, offset, name, nconnections, parent));
+    return gnuradio::make_block_sptr<time_raster_sink_b_impl>(
+        samp_rate, rows, cols, mult, offset, name, nconnections, parent);
 }
 
 time_raster_sink_b_impl::time_raster_sink_b_impl(double samp_rate,
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc
index 494860e37c..fd18413948 100644
--- a/gr-qtgui/lib/time_raster_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc
@@ -33,8 +33,8 @@ time_raster_sink_f::sptr time_raster_sink_f::make(double samp_rate,
                                                   int nconnections,
                                                   QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(new time_raster_sink_f_impl(
-        samp_rate, rows, cols, mult, offset, name, nconnections, parent));
+    return gnuradio::make_block_sptr<time_raster_sink_f_impl>(
+        samp_rate, rows, cols, mult, offset, name, nconnections, parent);
 }
 
 time_raster_sink_f_impl::time_raster_sink_f_impl(double samp_rate,
diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc
index 31e583583c..bea9f4d123 100644
--- a/gr-qtgui/lib/time_sink_c_impl.cc
+++ b/gr-qtgui/lib/time_sink_c_impl.cc
@@ -33,8 +33,8 @@ time_sink_c::sptr time_sink_c::make(int size,
                                     unsigned int nconnections,
                                     QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(
-        new time_sink_c_impl(size, samp_rate, name, nconnections, parent));
+    return gnuradio::make_block_sptr<time_sink_c_impl>(
+        size, samp_rate, name, nconnections, parent);
 }
 
 time_sink_c_impl::time_sink_c_impl(int size,
diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc
index 408c14c93b..f05166490e 100644
--- a/gr-qtgui/lib/time_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_sink_f_impl.cc
@@ -34,8 +34,8 @@ time_sink_f::sptr time_sink_f::make(int size,
                                     unsigned int nconnections,
                                     QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(
-        new time_sink_f_impl(size, samp_rate, name, nconnections, parent));
+    return gnuradio::make_block_sptr<time_sink_f_impl>(
+        size, samp_rate, name, nconnections, parent);
 }
 
 time_sink_f_impl::time_sink_f_impl(int size,
diff --git a/gr-qtgui/lib/vector_sink_f_impl.cc b/gr-qtgui/lib/vector_sink_f_impl.cc
index ca3c41e4ba..8babe5f5bf 100644
--- a/gr-qtgui/lib/vector_sink_f_impl.cc
+++ b/gr-qtgui/lib/vector_sink_f_impl.cc
@@ -36,8 +36,8 @@ vector_sink_f::sptr vector_sink_f::make(unsigned int vlen,
                                         int nconnections,
                                         QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(new vector_sink_f_impl(
-        vlen, x_start, x_step, x_axis_label, y_axis_label, name, nconnections, parent));
+    return gnuradio::make_block_sptr<vector_sink_f_impl>(
+        vlen, x_start, x_step, x_axis_label, y_axis_label, name, nconnections, parent);
 }
 
 vector_sink_f_impl::vector_sink_f_impl(unsigned int vlen,
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc
index 7ca1e62137..93ef5af275 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc
@@ -35,8 +35,8 @@ waterfall_sink_c::sptr waterfall_sink_c::make(int fftsize,
                                               int nconnections,
                                               QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(
-        new waterfall_sink_c_impl(fftsize, wintype, fc, bw, name, nconnections, parent));
+    return gnuradio::make_block_sptr<waterfall_sink_c_impl>(
+        fftsize, wintype, fc, bw, name, nconnections, parent);
 }
 
 waterfall_sink_c_impl::waterfall_sink_c_impl(int fftsize,
diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc
index d101a97f57..66e265d62d 100644
--- a/gr-qtgui/lib/waterfall_sink_f_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc
@@ -33,8 +33,8 @@ waterfall_sink_f::sptr waterfall_sink_f::make(int fftsize,
                                               int nconnections,
                                               QWidget* parent)
 {
-    return gnuradio::get_initial_sptr(
-        new waterfall_sink_f_impl(fftsize, wintype, fc, bw, name, nconnections, parent));
+    return gnuradio::make_block_sptr<waterfall_sink_f_impl>(
+        fftsize, wintype, fc, bw, name, nconnections, parent);
 }
 
 waterfall_sink_f_impl::waterfall_sink_f_impl(int fftsize,
author	Thomas Habets <thomas@habets.se>	2020-05-03 12:23:51 +0100
committer	Marcus Müller <marcus@hostalia.de>	2020-07-30 18:12:44 +0200
commit	30643f01609e915296023adc37123e27e2c86d3f (patch)
tree	caf7141e8091cd30cde4e75ef0d1fcc5454ace77 /gr-qtgui
parent	875148321bca3c39af9aec8dee3c24eb9f75d1e6 (diff)