diff options
author | David Winter <david.winter@analog.com> | 2021-08-09 13:24:24 +0200 |
---|---|---|
committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-09-03 16:12:30 -0400 |
commit | 956f332e410331fde426e1485589d905cdf80fb1 (patch) | |
tree | c1004bbc58e99afe1ed2daf404d11020626e2980 /gr-qtgui/lib/edit_box_msg_impl.cc | |
parent | 4d0f2900e887b87e547a1af5874b5d502b5fc71e (diff) |
qtgui: Replace pyqwidget() with qwidget()
Previously, two versions of the `qtwidget` functions existed,
`qwidget()` and `pyqwidget()`, with the only difference being that
`qwidget()` returned a pointer to the `QWidget` object managed by the
corresponding block, while `pyqwidget()` returned that same pointer, but as
an integer (Or `PyLong` in this case).
While `qwidget()` is used by C++ code accessing the widgets,
`pyqwidget()` is only used for the python interface. This makes these
two methods redundant, thus this commit entirely removes `pyqwidget()`,
and modifies the `qwidget()` python wrapper to behave like
`pyqwidget()`. Note that we can be fairly confident that this change
will not effect potential users of `qwidget()`, because any invocation
on the objects previously returned by `qwidget()` would cause a
segmentation fault.
This commit also fixes a memory leak:
Internally, the `pyqwidget()` functions were returning a PyLong `PyObject *`,
which was then upwrapped in a pybind trampoline without decrementing
the reference count of that python object.
Signed-off-by: David Winter <david.winter@analog.com>
Diffstat (limited to 'gr-qtgui/lib/edit_box_msg_impl.cc')
-rw-r--r-- | gr-qtgui/lib/edit_box_msg_impl.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/gr-qtgui/lib/edit_box_msg_impl.cc b/gr-qtgui/lib/edit_box_msg_impl.cc index 43edf15821..0794a1268c 100644 --- a/gr-qtgui/lib/edit_box_msg_impl.cc +++ b/gr-qtgui/lib/edit_box_msg_impl.cc @@ -170,17 +170,6 @@ void edit_box_msg_impl::exec_() { d_qApplication->exec(); } QWidget* edit_box_msg_impl::qwidget() { return (QWidget*)d_group; } -#ifdef ENABLE_PYTHON -PyObject* edit_box_msg_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_group); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* edit_box_msg_impl::pyqwidget() { return NULL; } -#endif - void edit_box_msg_impl::set_type(int type) { set_type(static_cast<data_type_t>(type)); } void edit_box_msg_impl::set_type(gr::qtgui::data_type_t type) |