gr-fft: window cleanup - remove nuttal (sic) windows

These have been deprecated for over 6 years

Signed-off-by: Jacob Gilbert <jacob.gilbert@protonmail.com>

4 files changed, 1 insertions, 45 deletions

diff --git a/gr-fft/include/gnuradio/fft/window.h b/gr-fft/include/gnuradio/fft/window.h
index ab71b2a48..b0f726fd5 100644
--- a/gr-fft/include/gnuradio/fft/window.h
+++ b/gr-fft/include/gnuradio/fft/window.h
@@ -214,11 +214,6 @@ public:
     static std::vector<float> nuttall(int ntaps);
 
     /*!
-     * Deprecated: use nuttall window instead.
-     */
-    static std::vector<float> nuttal(int ntaps);
-
-    /*!
      * \brief Alias to the Nuttall window.
      *
      * \param ntaps Number of coefficients in the window.
@@ -226,11 +221,6 @@ public:
     static std::vector<float> blackman_nuttall(int ntaps);
 
     /*!
-     * Deprecated: use blackman_nuttall window instead.
-     */
-    static std::vector<float> blackman_nuttal(int ntaps);
-
-    /*!
      * \brief Build a Nuttall 4-term continuous first derivative window, referred to by
      * Heinzel G. et al. as a Nuttall4b window
      *
@@ -249,11 +239,6 @@ public:
     static std::vector<float> nuttall_cfd(int ntaps);
 
     /*!
-     * Deprecated: use nuttall_cfd window instead.
-     */
-    static std::vector<float> nuttal_cfd(int ntaps);
-
-    /*!
      * \brief Build a flat top window per the SRS specification
      *
      * See:
diff --git a/gr-fft/lib/window.cc b/gr-fft/lib/window.cc
index d79c62a74..2dd8cf5ad 100644
--- a/gr-fft/lib/window.cc
+++ b/gr-fft/lib/window.cc
@@ -211,19 +211,12 @@ std::vector<float> window::blackmanharris(int ntaps, int atten)
     return blackman_harris(ntaps, atten);
 }
 
-std::vector<float> window::nuttal(int ntaps) { return nuttall(ntaps); }
-
 std::vector<float> window::nuttall(int ntaps)
 {
     return coswindow(ntaps, 0.3635819, 0.4891775, 0.1365995, 0.0106411);
 }
 
-std::vector<float> window::blackman_nuttal(int ntaps) { return nuttall(ntaps); }
-
 std::vector<float> window::blackman_nuttall(int ntaps) { return nuttall(ntaps); }
-
-std::vector<float> window::nuttal_cfd(int ntaps) { return nuttall_cfd(ntaps); }
-
 std::vector<float> window::nuttall_cfd(int ntaps)
 {
     return coswindow(ntaps, 0.355768, 0.487396, 0.144232, 0.012604);
diff --git a/gr-fft/python/fft/bindings/docstrings/window_pydoc_template.h b/gr-fft/python/fft/bindings/docstrings/window_pydoc_template.h
index 5988deb37..4aabaedf2 100644
--- a/gr-fft/python/fft/bindings/docstrings/window_pydoc_template.h
+++ b/gr-fft/python/fft/bindings/docstrings/window_pydoc_template.h
@@ -69,21 +69,12 @@ static const char* __doc_gr_fft_window_blackmanharris = R"doc()doc";
 static const char* __doc_gr_fft_window_nuttall = R"doc()doc";
 
 
-static const char* __doc_gr_fft_window_nuttal = R"doc()doc";
-
-
 static const char* __doc_gr_fft_window_blackman_nuttall = R"doc()doc";
 
 
-static const char* __doc_gr_fft_window_blackman_nuttal = R"doc()doc";
-
-
 static const char* __doc_gr_fft_window_nuttall_cfd = R"doc()doc";
 
 
-static const char* __doc_gr_fft_window_nuttal_cfd = R"doc()doc";
-
-
 static const char* __doc_gr_fft_window_flattop = R"doc()doc";
 
 
diff --git a/gr-fft/python/fft/bindings/window_python.cc b/gr-fft/python/fft/bindings/window_python.cc
index 6fb429022..28e4b8ccf 100644
--- a/gr-fft/python/fft/bindings/window_python.cc
+++ b/gr-fft/python/fft/bindings/window_python.cc
@@ -14,7 +14,7 @@
 /* BINDTOOL_GEN_AUTOMATIC(0)                                                       */
 /* BINDTOOL_USE_PYGCCXML(0)                                                        */
 /* BINDTOOL_HEADER_FILE(window.h)                                                  */
-/* BINDTOOL_HEADER_FILE_HASH(a44a323c53d5dd52382d240afdd4b984)                     */
+/* BINDTOOL_HEADER_FILE_HASH(4de3c97757728a4acfbd8b1c29181431)                     */
 /***********************************************************************************/
 
 #include <pybind11/complex.h>
@@ -142,29 +142,16 @@ void bind_window(py::module& m)
         .def_static("nuttall", &window::nuttall, py::arg("ntaps"), D(window, nuttall))
 
 
-        .def_static("nuttal", &window::nuttal, py::arg("ntaps"), D(window, nuttal))
-
-
         .def_static("blackman_nuttall",
                     &window::blackman_nuttall,
                     py::arg("ntaps"),
                     D(window, blackman_nuttall))
 
 
-        .def_static("blackman_nuttal",
-                    &window::blackman_nuttal,
-                    py::arg("ntaps"),
-                    D(window, blackman_nuttal))
-
-
         .def_static(
             "nuttall_cfd", &window::nuttall_cfd, py::arg("ntaps"), D(window, nuttall_cfd))
 
 
-        .def_static(
-            "nuttal_cfd", &window::nuttal_cfd, py::arg("ntaps"), D(window, nuttal_cfd))
-
-
         .def_static("flattop", &window::flattop, py::arg("ntaps"), D(window, flattop))