Mercurial > octave

changeset 29896:0dd2742601e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Torsten Lilge <ttl-octave@mailbox.org>
date Tue, 20 Jul 2021 22:42:05 +0200
parents 744bb06fea2a
children 7c7599ad9c5a
files libgui/graphics/Container.cc libgui/graphics/Figure.cc libgui/graphics/Figure.h
diffstat 3 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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<const octave::fcn_callback&>::of (&Canvas::interpreter_event),
+                     this, QOverload<const octave::fcn_callback&>::of (&Container::interpreter_event));
 
-            connect (m_canvas, SIGNAL (interpeter_event (const meth_callback&)),
-                     this, SIGNAL (interpeter_event (const meth_callback&)));
+            connect (m_canvas, QOverload<const octave::meth_callback&>::of (&Canvas::interpreter_event),
+                     this, QOverload<const octave::meth_callback&>::of (&Container::interpreter_event));
 
             connect (m_canvas,
                      SIGNAL (gh_callback_event (const graphics_handle&,
--- 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<const octave::fcn_callback&>::of (&Container::interpreter_event),
+             this, QOverload<const octave::fcn_callback&>::of (&Figure::interpreter_event));
 
-    connect (m_container, SIGNAL (interpeter_event (const meth_callback&)),
-             this, SIGNAL (interpeter_event (const meth_callback&)));
+    connect (m_container, QOverload<const octave::meth_callback&>::of (&Container::interpreter_event),
+             this, QOverload<const octave::meth_callback&>::of (&Figure::interpreter_event));
 
     figure::properties& fp = properties<figure> ();
 
--- 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;