Mercurial > octave
changeset 27600:bb9aecedc167
use single QVariant object for return values in qt_interpreter_events class
* qt-interpreter-events.h, qt-interpreter-events.cc
(qt_interpreter_events::m_result): New QVariant data member.
(qt_interpreter_events::m_shutdown_confirm_result,
(qt_interpreter_events::m_get_named_icon_result): Delete. Use
m_result to store and retrieve results instead.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 31 Oct 2019 11:40:30 -0400 |
| parents | ada24a1979c0 |
| children | 7a748f7545c9 |
| files | libgui/src/qt-interpreter-events.cc libgui/src/qt-interpreter-events.h |
| diffstat | 2 files changed, 11 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/qt-interpreter-events.cc Thu Oct 31 10:39:43 2019 -0400 +++ b/libgui/src/qt-interpreter-events.cc Thu Oct 31 11:40:30 2019 -0400 @@ -28,6 +28,7 @@ #include <QDialog> #include <QDir> +#include <QIcon> #include <QMetaType> #include <QPushButton> #include <QStringList> @@ -102,9 +103,8 @@ } qt_interpreter_events::qt_interpreter_events (base_qobject& oct_qobj) - : interpreter_events (), m_octave_qobj (oct_qobj), - m_shutdown_confirm_result (false), m_mutex (), - m_waitcondition (), m_uiwidget_creator () + : interpreter_events (), m_octave_qobj (oct_qobj), m_result (), + m_mutex (), m_waitcondition (), m_uiwidget_creator () { qRegisterMetaType<QIntList> ("QIntList"); qRegisterMetaType<QFloatList> ("QFloatList"); @@ -258,7 +258,7 @@ // Wait for result. wait (); - return m_shutdown_confirm_result; + return m_result.toBool (); } bool qt_interpreter_events::prompt_new_edit_file (const std::string& file) @@ -341,10 +341,12 @@ uint8NDArray empty_img; - if (m_get_named_icon_result.isNull ()) + QIcon icon = m_result.value<QIcon> (); + + if (icon.isNull ()) return empty_img; - QImage img = m_get_named_icon_result.pixmap (QSize (32, 32)).toImage (); + QImage img = icon.pixmap (QSize (32, 32)).toImage (); if (img.format () != QImage::Format_ARGB32_Premultiplied) return empty_img; @@ -375,7 +377,7 @@ { lock (); - m_get_named_icon_result = resource_manager::icon (name); + m_result = QVariant::fromValue (resource_manager::icon (name)); unlock (); @@ -544,7 +546,7 @@ { lock (); - m_shutdown_confirm_result = m_octave_qobj.confirm_shutdown (); + m_result = m_octave_qobj.confirm_shutdown (); unlock ();
--- a/libgui/src/qt-interpreter-events.h Thu Oct 31 10:39:43 2019 -0400 +++ b/libgui/src/qt-interpreter-events.h Thu Oct 31 11:40:30 2019 -0400 @@ -28,7 +28,6 @@ #include <list> #include <string> -#include <QIcon> #include <QList> #include <QMutex> #include <QObject> @@ -247,9 +246,7 @@ base_qobject& m_octave_qobj; - bool m_shutdown_confirm_result; - - QIcon m_get_named_icon_result; + QVariant m_result; QMutex m_mutex;