diff libgui/src/qt-interpreter-events.h @ 27643:337132e66ec2

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 8b6e928e0705
children 271b5cd640d7
line wrap: on
line diff
--- a/libgui/src/qt-interpreter-events.h	Tue Nov 05 12:09:52 2019 -0800
+++ b/libgui/src/qt-interpreter-events.h	Tue Nov 05 07:49:38 2019 -0500
@@ -257,13 +257,13 @@
 
     base_qobject& m_octave_qobj;
 
+    QUIWidgetCreator m_uiwidget_creator;
+
     QVariant m_result;
 
     QMutex m_mutex;
 
     QWaitCondition m_waitcondition;
-
-    QUIWidgetCreator m_uiwidget_creator;
   };
 }