# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1670047204 18000
# Node ID 9034cf6637687c5455ea2558d7077318dfe5e5a9
# Parent  b26b768f23a46280e1363026e393784aa55dbef5
eliminate unnecessary base_qobject object from GUI dialog classes

* dialog.h, dialog.cc (QUIWidgetCreator::m_octave_qobj):
Delete unnecessary data member.
(QUIWidgetCreator::QUIWidgetCreator, MessageDialog::MessageDialog,
ListDialog::ListDialog, InputDialog::InputDialog,
FileDialog::FileDialog):  Eliminate base_qobject argument.
Change all uses.

diff -r b26b768f23a4 -r 9034cf663768 libgui/src/dialog.cc
--- a/libgui/src/dialog.cc	Sat Dec 03 00:52:02 2022 -0500
+++ b/libgui/src/dialog.cc	Sat Dec 03 01:00:04 2022 -0500
@@ -44,13 +44,12 @@
 #include "dialog.h"
 #include "gui-preferences-global.h"
 #include "gui-settings.h"
-#include "octave-qobject.h"
 
 namespace octave
 {
-  QUIWidgetCreator::QUIWidgetCreator (base_qobject& oct_qobj)
-    : QObject (), m_octave_qobj (oct_qobj), m_dialog_result (-1),
-      m_dialog_button (), m_string_list (), m_list_index (), m_path_name ()
+  QUIWidgetCreator::QUIWidgetCreator ()
+    : QObject (), m_dialog_result (-1), m_dialog_button (),
+      m_string_list (), m_list_index (), m_path_name ()
   {
     connect (this, &QUIWidgetCreator::create_dialog,
              this, &QUIWidgetCreator::handle_create_dialog);
@@ -181,8 +180,7 @@
                                                const QStringList& role)
   {
     MessageDialog *message_dialog
-      = new MessageDialog (m_octave_qobj, message, title, icon,
-                           button, defbutton, role);
+      = new MessageDialog (message, title, icon, button, defbutton, role);
 
     connect (message_dialog, &MessageDialog::buttonClicked,
              this, &QUIWidgetCreator::dialog_button_clicked);
@@ -233,7 +231,7 @@
                                                  const QString& cancel_string)
   {
     ListDialog *list_dialog
-      = new ListDialog (m_octave_qobj, list, mode, wd, ht, initial,
+      = new ListDialog (list, mode, wd, ht, initial,
                         name, prompt, ok_string, cancel_string);
 
     connect (list_dialog, &ListDialog::finish_selection,
@@ -265,7 +263,7 @@
                                                     const QStringList& defaults)
   {
     InputDialog *input_dialog
-      = new InputDialog (m_octave_qobj, prompt, title, nr, nc, defaults);
+      = new InputDialog (prompt, title, nr, nc, defaults);
 
     connect (input_dialog, &InputDialog::finish_input,
              this, &QUIWidgetCreator::input_finished);
@@ -293,8 +291,7 @@
                                                    const QString& multimode)
   {
     FileDialog *file_dialog
-      = new FileDialog (m_octave_qobj, filters, title, filename,
-                        dirname, multimode);
+      = new FileDialog (filters, title, filename, dirname, multimode);
 
     connect (file_dialog, &FileDialog::finish_input,
              this, &QUIWidgetCreator::filedialog_finished);
@@ -317,7 +314,7 @@
     wake_all ();
   }
 
-  MessageDialog::MessageDialog (base_qobject&, const QString& message,
+  MessageDialog::MessageDialog (const QString& message,
                                 const QString& title, const QString& qsicon,
                                 const QStringList& qsbutton,
                                 const QString& defbutton,
@@ -389,7 +386,7 @@
       }
   }
 
-  ListDialog::ListDialog (base_qobject&, const QStringList& list,
+  ListDialog::ListDialog (const QStringList& list,
                           const QString& mode, int wd, int ht,
                           const QList<int>& initial, const QString& title,
                           const QStringList& prompt,
@@ -525,7 +522,7 @@
     buttonOk_clicked ();
   }
 
-  InputDialog::InputDialog (base_qobject&, const QStringList& prompt,
+  InputDialog::InputDialog (const QStringList& prompt,
                             const QString& title, const QFloatList& nr,
                             const QFloatList& nc, const QStringList& defaults)
     : QDialog ()
@@ -619,8 +616,7 @@
     buttonCancel_clicked ();
   }
 
-  FileDialog::FileDialog (base_qobject& oct_qobj,
-                          const QStringList& name_filters,
+  FileDialog::FileDialog (const QStringList& name_filters,
                           const QString& title, const QString& filename,
                           const QString& dirname, const QString& multimode)
     : QFileDialog ()
diff -r b26b768f23a4 -r 9034cf663768 libgui/src/dialog.h
--- a/libgui/src/dialog.h	Sat Dec 03 00:52:02 2022 -0500
+++ b/libgui/src/dialog.h	Sat Dec 03 01:00:04 2022 -0500
@@ -44,15 +44,13 @@
 
 namespace octave
 {
-  class base_qobject;
-
   class QUIWidgetCreator : public QObject
   {
     Q_OBJECT
 
   public:
 
-    QUIWidgetCreator (base_qobject& oct_qobj);
+    QUIWidgetCreator (void);
 
     ~QUIWidgetCreator (void) = default;
 
@@ -148,8 +146,6 @@
 
   private:
 
-    base_qobject& m_octave_qobj;
-
     int m_dialog_result;
     QString m_dialog_button;
 
@@ -176,7 +172,7 @@
 
   public:
 
-    MessageDialog (base_qobject& oct_qobj, const QString& message,
+    MessageDialog (const QString& message,
                    const QString& title, const QString& icon,
                    const QStringList& button, const QString& defbutton,
                    const QStringList& role);
@@ -201,7 +197,7 @@
 
   public:
 
-    ListDialog (base_qobject& oct_qobj, const QStringList& list,
+    ListDialog (const QStringList& list,
                 const QString& mode, int width, int height,
                 const QList<int>& initial, const QString& name,
                 const QStringList& prompt, const QString& ok_string,
@@ -236,7 +232,7 @@
 
   public:
 
-    InputDialog (base_qobject& oct_qobj, const QStringList& prompt,
+    InputDialog (const QStringList& prompt,
                  const QString& title, const QFloatList& nr,
                  const QFloatList& nc, const QStringList& defaults);
 
@@ -261,7 +257,7 @@
 
   public:
 
-    FileDialog (base_qobject& oct_qobj, const QStringList& filters,
+    FileDialog (const QStringList& filters,
                 const QString& title, const QString& filename,
                 const QString& dirname, const QString& multimode);
 
diff -r b26b768f23a4 -r 9034cf663768 libgui/src/qt-interpreter-events.cc
--- a/libgui/src/qt-interpreter-events.cc	Sat Dec 03 00:52:02 2022 -0500
+++ b/libgui/src/qt-interpreter-events.cc	Sat Dec 03 01:00:04 2022 -0500
@@ -110,7 +110,7 @@
 
   qt_interpreter_events::qt_interpreter_events (base_qobject& oct_qobj)
     : interpreter_events (), m_octave_qobj (oct_qobj),
-      m_uiwidget_creator (oct_qobj), m_result (), m_mutex (),
+      m_uiwidget_creator (), m_result (), m_mutex (),
       m_waitcondition ()
   {
     qRegisterMetaType<QIntList> ("QIntList");