Mercurial > octave

diff libgui/src/dialog.h @ 27643:337132e66ec2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate need for global access to resource manager in uiwidget objects * dialog.h, dialog.cc (QUIWidgetCreator::m_octave_qobj): New data member. (QUIWidgetCreator::QUIWidgetCreator, MessageDialog::MessageDialog, ListDialog::ListDialog, InputDialog::InputDialog, FileDialog::FileDialog): Accept reference to base_qobject argument. Change all uses. (FileDialog::FileDialog): Access resource_manager through local base_qobject object instead of using global __get_resource_manager__ function.
author John W. Eaton <jwe@octave.org>
date Tue, 05 Nov 2019 07:49:38 -0500
parents 9b72eb111b7e
children b442ec6dda5c
line wrap: on
line diff
--- a/libgui/src/dialog.h	Tue Nov 05 12:09:52 2019 -0800
+++ b/libgui/src/dialog.h	Tue Nov 05 07:49:38 2019 -0500
@@ -42,13 +42,15 @@
 
 namespace octave
 {
+  class base_qobject;
+
   class QUIWidgetCreator : public QObject
   {
     Q_OBJECT
 
   public:
 
-    QUIWidgetCreator (void);
+    QUIWidgetCreator (base_qobject& oct_qobj);
 
     ~QUIWidgetCreator (void) = default;
 
@@ -144,6 +146,8 @@
 
   private:
 
+    base_qobject& m_octave_qobj;
+
     int m_dialog_result;
     QString m_dialog_button;
 
@@ -170,10 +174,10 @@
 
   public:
 
-    explicit MessageDialog (const QString& message, const QString& title,
-                            const QString& icon, const QStringList& button,
-                            const QString& defbutton,
-                            const QStringList& role);
+    MessageDialog (base_qobject& oct_qobj, const QString& message,
+                   const QString& title, const QString& icon,
+                   const QStringList& button, const QString& defbutton,
+                   const QStringList& role);
 
   private:
 
@@ -193,11 +197,11 @@
 
   public:
 
-    explicit 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,
-                         const QString& cancel_string);
+    ListDialog (base_qobject& oct_qobj, const QStringList& list,
+                const QString& mode, int width, int height,
+                const QList<int>& initial, const QString& name,
+                const QStringList& prompt, const QString& ok_string,
+                const QString& cancel_string);
 
     ~ListDialog (void);
 
@@ -228,9 +232,9 @@
 
   public:
 
-    explicit InputDialog (const QStringList& prompt, const QString& title,
-                          const QFloatList& nr, const QFloatList& nc,
-                          const QStringList& defaults);
+    InputDialog (base_qobject& oct_qobj, const QStringList& prompt,
+                 const QString& title, const QFloatList& nr,
+                 const QFloatList& nc, const QStringList& defaults);
 
   signals:
 
@@ -251,9 +255,9 @@
 
   public:
 
-    explicit FileDialog (const QStringList& filters,
-                         const QString& title, const QString& filename,
-                         const QString& dirname, const QString& multimode);
+    FileDialog (base_qobject& oct_qobj, const QStringList& filters,
+                const QString& title, const QString& filename,
+                const QString& dirname, const QString& multimode);
 
   signals: