# HG changeset patch # User Torsten Lilge # Date 1626813725 -7200 # Node ID 0dd2742601e46c112dcf4c0a7417f5495bf40f13 # Parent 744bb06fea2a49f708d00982def85273b9a28f48 fix wring connection of interpreter events in QtHandles * Container.cc (canvas): use new connect syntax * Figure.cc (Figure): use new connect syntax * Figure.h: define signals for interpreter events diff -r 744bb06fea2a -r 0dd2742601e4 libgui/graphics/Container.cc --- a/libgui/graphics/Container.cc Mon Jul 19 20:09:56 2021 +0200 +++ b/libgui/graphics/Container.cc Tue Jul 20 22:42:05 2021 +0200 @@ -70,11 +70,11 @@ m_canvas = Canvas::create (m_octave_qobj, m_interpreter, gh, this, fig.get ("renderer").string_value ()); - connect (m_canvas, SIGNAL (interpeter_event (const fcn_callback&)), - this, SIGNAL (interpeter_event (const fcn_callback&))); + connect (m_canvas, QOverload::of (&Canvas::interpreter_event), + this, QOverload::of (&Container::interpreter_event)); - connect (m_canvas, SIGNAL (interpeter_event (const meth_callback&)), - this, SIGNAL (interpeter_event (const meth_callback&))); + connect (m_canvas, QOverload::of (&Canvas::interpreter_event), + this, QOverload::of (&Container::interpreter_event)); connect (m_canvas, SIGNAL (gh_callback_event (const graphics_handle&, diff -r 744bb06fea2a -r 0dd2742601e4 libgui/graphics/Figure.cc --- a/libgui/graphics/Figure.cc Mon Jul 19 20:09:56 2021 +0200 +++ b/libgui/graphics/Figure.cc Tue Jul 20 22:42:05 2021 +0200 @@ -125,11 +125,11 @@ m_container = new Container (win, oct_qobj, interp); win->setCentralWidget (m_container); - connect (m_container, SIGNAL (interpeter_event (const fcn_callback&)), - this, SIGNAL (interpeter_event (const fcn_callback&))); + connect (m_container, QOverload::of (&Container::interpreter_event), + this, QOverload::of (&Figure::interpreter_event)); - connect (m_container, SIGNAL (interpeter_event (const meth_callback&)), - this, SIGNAL (interpeter_event (const meth_callback&))); + connect (m_container, QOverload::of (&Container::interpreter_event), + this, QOverload::of (&Figure::interpreter_event)); figure::properties& fp = properties
(); diff -r 744bb06fea2a -r 0dd2742601e4 libgui/graphics/Figure.h --- a/libgui/graphics/Figure.h Mon Jul 19 20:09:56 2021 +0200 +++ b/libgui/graphics/Figure.h Tue Jul 20 22:42:05 2021 +0200 @@ -130,6 +130,8 @@ signals: void asyncUpdate (void); + void interpreter_event (const octave::fcn_callback& fcn); + void interpreter_event (const octave::meth_callback& meth); private: Container *m_container;