# HG changeset patch # User John W. Eaton # Date 1608098717 18000 # Wed Dec 16 01:05:17 2020 -0500 # Node ID c68edca73b7f0ed413ab58f5849d6dd13ff655a5 # Parent 8469b3aad7ac7d870ab168758564e84bb304b3c0 Use map instead of octave_struct (patch #8919). * libgui/graphics/ButtonGroup.cc, libgui/graphics/Table.cc: Use map instead of octave_struct. diff -r 8469b3aad7ac -r c68edca73b7f libgui/graphics/ButtonGroup.cc --- a/libgui/graphics/ButtonGroup.cc Wed Dec 23 11:23:44 2020 +0100 +++ b/libgui/graphics/ButtonGroup.cc Wed Dec 16 01:05:17 2020 -0500 @@ -48,7 +48,7 @@ #include "octave-qobject.h" #include "interpreter.h" -#include "ov-struct.h" +#include "oct-map.h" namespace QtHandles { @@ -520,7 +520,7 @@ eventData.setfield ("NewValue", newValue.as_octave_value ()); eventData.setfield ("Source", bp.get___myhandle__ ().as_octave_value ()); eventData.setfield ("EventName", "SelectionChanged"); - octave_value selectionChangedEventObject (new octave_struct (eventData)); + octave_value selectionChangedEventObject (eventData); emit gh_callback_event (m_handle, "selectionchangedfcn", selectionChangedEventObject); } diff -r 8469b3aad7ac -r c68edca73b7f libgui/graphics/Table.cc --- a/libgui/graphics/Table.cc Wed Dec 23 11:23:44 2020 +0100 +++ b/libgui/graphics/Table.cc Wed Dec 16 01:05:17 2020 -0500 @@ -52,10 +52,10 @@ #include "graphics.h" #include "interpreter.h" +#include "oct-map.h" #include "oct-stream.h" #include "oct-string.h" #include "oct-strstrm.h" -#include "ov-struct.h" namespace QtHandles { @@ -503,8 +503,7 @@ } octave_scalar_map eventData; eventData.setfield ("Indices", indices); - octave_value cellSelectionCallbackEventObject = - octave_value (new octave_struct (eventData)); + octave_value cellSelectionCallbackEventObject (eventData); emit gh_callback_event (m_handle, "cellselectioncallback", cellSelectionCallbackEventObject); } @@ -551,8 +550,7 @@ eventData.setfield ("EditData", edit_data); eventData.setfield ("Error", error); - octave_value cellEditCallbackEventObject = - octave_value (new octave_struct (eventData)); + octave_value cellEditCallbackEventObject (eventData); emit gh_callback_event (m_handle, "celleditcallback", cellEditCallbackEventObject);