Mercurial > octave

changeset 29544:4eeef8cdaa2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backout changes to octave-qobject.cc in cset 3d34b70b5a49 (bug #60420) * octave-qobject.cc: Reverse changes in cset 3d34b70b5a49.
author Rik <rik@octave.org>
date Tue, 20 Apr 2021 09:53:31 -0700
parents 97238418c028
children 58e1230b9503
files libgui/src/octave-qobject.cc
diffstat 1 files changed, 32 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/octave-qobject.cc	Mon Apr 19 17:16:20 2021 -0400
+++ b/libgui/src/octave-qobject.cc	Tue Apr 20 09:53:31 2021 -0700
@@ -206,36 +206,37 @@
 
     if (! m_app_context.experimental_terminal_widget ())
       {
-        connect (m_interpreter_qobj, &interpreter_qobject::execution_finished,
-                 this, &base_qobject::handle_interpreter_execution_finished);
+        connect (m_interpreter_qobj, SIGNAL (execution_finished (int)),
+                 this, SLOT (handle_interpreter_execution_finished (int)));
 
-        connect (this, &base_qobject::request_interpreter_shutdown,
-                 m_interpreter_qobj, &interpreter_qobject::shutdown);
+        connect (this, SIGNAL (request_interpreter_shutdown (int)),
+                 m_interpreter_qobj, SLOT (shutdown (int)));
       }
 
-    connect (m_interpreter_qobj, &interpreter_qobject::shutdown_finished,
-             this, &base_qobject::handle_interpreter_shutdown_finished);
+    connect (m_interpreter_qobj, SIGNAL (shutdown_finished (int)),
+             this, SLOT (handle_interpreter_shutdown_finished (int)));
 
-    connect (m_main_thread, &QThread::finished,
-             m_main_thread, &QThread::deleteLater);
+    connect (m_main_thread, SIGNAL (finished (void)),
+             m_main_thread, SLOT (deleteLater (void)));
 
     // Handle any interpreter_event signal from the octave_qapplication
     // object here.
 
-    connect (m_qapplication, QOverload<const fcn_callback&>::of (&octave_qapplication::interpreter_event),
-             this, QOverload<const fcn_callback&>::of (&base_qobject::interpreter_event));
+    connect (m_qapplication, SIGNAL (interpreter_event (const fcn_callback&)),
+             this, SLOT (interpreter_event (const fcn_callback&)));
 
-    connect (m_qapplication, QOverload<const meth_callback&>::of (&octave_qapplication::interpreter_event),
-             this, QOverload<const meth_callback&>::of (&base_qobject::interpreter_event));
+    connect (m_qapplication, SIGNAL (interpreter_event (const meth_callback&)),
+             this, SLOT (interpreter_event (const meth_callback&)));
 
     if (m_app_context.experimental_terminal_widget ())
       {
-        connect (qt_link (), &qt_interpreter_events::start_gui_signal,
-                 this, &base_qobject::start_gui);
+        connect (qt_link (), SIGNAL (start_gui_signal (bool)),
+                 this, SLOT (start_gui (bool)));
       }
 
-    connect (qt_link (), &qt_interpreter_events::copy_image_to_clipboard_signal,
-             this, &base_qobject::copy_image_to_clipboard);
+    connect (qt_link (),
+             SIGNAL (copy_image_to_clipboard_signal (const QString&, bool)),
+             this, SLOT (copy_image_to_clipboard (const QString&, bool)));
 
     if (m_app_context.experimental_terminal_widget ())
       {
@@ -256,11 +257,12 @@
             if (m_interpreter_ready)
               m_main_window->handle_octave_ready ();
             else
-              connect (m_interpreter_qobj, &interpreter_qobject::ready,
-                       m_main_window, &main_window::handle_octave_ready);
+              connect (m_interpreter_qobj, SIGNAL (ready ()),
+                       m_main_window, SLOT (handle_octave_ready ()));
 
-            connect (qt_link (), &qt_interpreter_events::focus_window_signal,
-                     m_main_window, &main_window::focus_window);
+            connect (qt_link (),
+                     SIGNAL (focus_window_signal (const QString&)),
+                     m_main_window, SLOT (focus_window (const QString&)));
 
             m_app_context.gui_running (true);
           }
@@ -321,7 +323,7 @@
     // the interpreter until after the main window and QApplication are
     // running to prevent race conditions.
 
-    QTimer::singleShot (0, m_interpreter_qobj, &interpreter_qobject::execute);
+    QTimer::singleShot (0, m_interpreter_qobj, SLOT (execute (void)));
 
     m_interpreter_qobj->moveToThread (m_main_thread);
 
@@ -377,20 +379,21 @@
 
         m_main_window = new main_window (*this);
 
-        connect (qt_link (), &qt_interpreter_events::focus_window_signal,
-                 m_main_window, &main_window::focus_window);
+        connect (qt_link (),
+                 SIGNAL (focus_window_signal (const QString&)),
+                 m_main_window, SLOT (focus_window (const QString&)));
 
-        connect (qt_link (), &qt_interpreter_events::close_gui_signal,
-                 this, &base_qobject::close_gui);
+        connect (qt_link (), SIGNAL (close_gui_signal ()),
+                 this, SLOT (close_gui ()));
 
-        connect (m_main_window, &main_window::close_gui_signal,
-                 this, &base_qobject::close_gui);
+        connect (m_main_window, SIGNAL (close_gui_signal ()),
+                 this, SLOT (close_gui ()));
 
         if (m_interpreter_ready)
           m_main_window->handle_octave_ready ();
         else
-          connect (m_interpreter_qobj, &interpreter_qobject::ready,
-                   m_main_window, &main_window::handle_octave_ready);
+          connect (m_interpreter_qobj, SIGNAL (ready ()),
+                   m_main_window, SLOT (handle_octave_ready ()));
 
         if (m_gui_app)
           m_qapplication->setQuitOnLastWindowClosed (true);