Mercurial > octave

changeset 32233:4b57dca6bfdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qt6: fix plot issues in variable editor in * variable-editor.cc (variable_editor_view::createContextMenu): replace obsolete mapped ny mappedString; (variable_editor_view::createColumnMenu): dito; (variable_editor_view::createRowMenu: dito (variable_editor::edit_variable): dito; (variable_editor::focusInEvent): use Qt::FindDirectChildrenOnly for findChild in order to prevent a segfault
author Torsten Lilge <ttl-octave@mailbox.org>
date Fri, 04 Aug 2023 21:57:11 +0200
parents 7d29c24117ae
children b92d2724c75a
files libgui/src/variable-editor.cc
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/variable-editor.cc	Fri Aug 04 20:21:09 2023 +0200
+++ b/libgui/src/variable-editor.cc	Fri Aug 04 21:57:11 2023 +0200
@@ -705,7 +705,7 @@
 
           QSignalMapper *plot_mapper = make_plot_mapper (menu);
 
-          connect (plot_mapper, SIGNAL (mapped (const QString&)),
+          connect (plot_mapper, SIGNAL (mappedString (const QString&)),
                    this, SLOT (selected_command_requested (const QString&)));
         }
 
@@ -753,7 +753,7 @@
 
   QSignalMapper *plot_mapper = make_plot_mapper (menu);
 
-  connect (plot_mapper, SIGNAL (mapped (const QString&)),
+  connect (plot_mapper, SIGNAL (mappedString (const QString&)),
            this, SLOT (selected_command_requested (const QString&)));
 
   QPoint menupos = pt;
@@ -800,7 +800,7 @@
 
   QSignalMapper *plot_mapper = make_plot_mapper (menu);
 
-  connect (plot_mapper, SIGNAL (mapped (const QString&)),
+  connect (plot_mapper, SIGNAL (mappedString (const QString&)),
            this, SLOT (selected_command_requested (const QString&)));
 
   QPoint menupos = pt;
@@ -1182,7 +1182,7 @@
         }
       else
         {
-          QDockWidget *any_qdw = m_main->findChild<QDockWidget *> ();
+          QDockWidget *any_qdw = m_main->findChild<QDockWidget *> (QString (), Qt::FindDirectChildrenOnly);
           if (any_qdw != nullptr)
             {
               activateWindow ();
@@ -1292,8 +1292,9 @@
   edit_view->verticalHeader ()->setDefaultSectionSize (m_default_height
                                                        + m_add_font_height);
 
-  connect (m_plot_mapper, SIGNAL (mapped (const QString&)),
+  connect (m_plot_mapper, SIGNAL (mappedString (const QString&)),
            edit_view, SLOT (selected_command_requested (const QString&)));
+
   connect (m_save_mapper, SIGNAL (mapped (const QString&)),
            stack, SLOT (save (const QString&)));