octave: libinterp/corefcn/graphics.cc comparison

comparison libinterp/corefcn/graphics.cc @ 31771:21f9b34eb893

maint: Eliminate "(void)" in C++ function prototypes/declarations. * mk-opts.pl, external.txi, embedded.cc, make_int.cc, standalone.cc, standalonebuiltin.cc, BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, gl-select.cc, gl-select.h, qopengl-functions.h, qt-graphics-toolkit.h, qdialog.cpp, qfontdialog.cpp, qprintdialog_win.cpp, liboctgui-build-info.h, liboctgui-build-info.in.cc, color-picker.cc, color-picker.h, command-widget.cc, command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.cc, find-files-model.h, gui-preferences.cc, gui-preferences.h, gui-settings.cc, gui-settings.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, interpreter-qobject.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h, qt-interpreter-events.cc, qt-interpreter-events.h, release-notes.cc, release-notes.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcuts-tree-widget.cc, shortcuts-tree-widget.h, tab-bar.cc, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc, variable-editor-model.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h, build-env.h, Cell.cc, Cell.h, __contourc__.cc, __magick_read__.cc, auto-shlib.cc, auto-shlib.h, base-text-renderer.h, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, debug.cc, defaults.cc, defaults.h, defun.cc, display.cc, display.h, dynamic-ld.cc, dynamic-ld.h, environment.cc, environment.h, error.cc, error.h, errwarn.cc, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, ft-text-renderer.cc, ft-text-renderer.h, genprops.awk, gh-manager.cc, gh-manager.h, gl-render.cc, gl-render.h, gl2ps-print.cc, graphics-toolkit.h, graphics.cc, graphics.in.h, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, jsondecode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, ls-hdf5.cc, ls-hdf5.h, mxarray.h, oct-errno.h, oct-errno.in.cc, oct-fstrm.cc, oct-fstrm.h, oct-handle.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc, oct-iostrm.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.cc, oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct-tex-lexer.in.ll, pager.cc, pager.h, pr-flt-fmt.cc, pr-flt-fmt.h, pr-output.cc, pr-output.h, procstream.cc, procstream.h, settings.cc, settings.h, sighandlers.cc, sighandlers.h, stack-frame.cc, stack-frame.h, svd.cc, syminfo.cc, syminfo.h, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, toplev.cc, url-handle-manager.cc, url-handle-manager.h, variables.cc, xpow.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, audiodevinfo.cc, gzip.cc, liboctinterp-build-info.h, liboctinterp-build-info.in.cc, mk-build-env-features.sh, mk-builtins.pl, cdef-class.cc, cdef-class.h, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-diag.h, ov-base-int.cc, ov-base-int.h, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h, ov-base-sparse.cc, ov-base-sparse.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.cc, ov-ch-mat.h, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-colon.h, ov-complex.cc, ov-complex.h, ov-cs-list.h, ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.cc, ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-java.h, ov-lazy-idx.cc, ov-lazy-idx.h, ov-legacy-range.cc, ov-legacy-range.h, ov-magic-int.cc, ov-magic-int.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-null-mat.h, ov-oncleanup.cc, ov-oncleanup.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.cc, ovl.h, octave.cc, octave.h, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, lex.ll, oct-lvalue.cc, oct-lvalue.h, oct-parse.yy, parse.h, profiler.cc, profiler.h, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.h, pt-cbinop.h, pt-cell.h, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.h, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.h, pt.cc, pt.h, token.cc, token.h, usage.h, Array-base.cc, Array.h, CColVector.cc, CColVector.h, CDiagMatrix.cc, CDiagMatrix.h, CMatrix.cc, CMatrix.h, CNDArray.cc, CNDArray.h, CRowVector.cc, CRowVector.h, CSparse.cc, CSparse.h, DiagArray2.cc, DiagArray2.h, MArray.cc, MArray.h, MDiagArray2.h, MSparse.h, MatrixType.cc, MatrixType.h, PermMatrix.cc, PermMatrix.h, Range.cc, Range.h, Sparse-b.cc, Sparse.cc, Sparse.h, boolMatrix.cc, boolMatrix.h, boolNDArray.cc, boolNDArray.h, boolSparse.cc, boolSparse.h, chMatrix.h, chNDArray.h, dColVector.cc, dColVector.h, dDiagMatrix.cc, dDiagMatrix.h, dMatrix.cc, dMatrix.h, dNDArray.cc, dNDArray.h, dRowVector.cc, dRowVector.h, dSparse.cc, dSparse.h, dim-vector.cc, dim-vector.h, fCColVector.cc, fCColVector.h, fCDiagMatrix.cc, fCDiagMatrix.h, fCMatrix.cc, fCMatrix.h, fCNDArray.cc, fCNDArray.h, fCRowVector.cc, fCRowVector.h, fColVector.cc, fColVector.h, fDiagMatrix.cc, fDiagMatrix.h, fMatrix.cc, fMatrix.h, fNDArray.cc, fNDArray.h, fRowVector.cc, fRowVector.h, idx-vector.cc, idx-vector.h, intNDArray.cc, intNDArray.h, liboctave-build-info.h, liboctave-build-info.in.cc, CollocWt.cc, CollocWt.h, DAE.h, DAEFunc.h, DAERT.h, DAERTFunc.h, DASPK.cc, DASPK.h, DASRT.cc, DASRT.h, DASSL.cc, DASSL.h, DET.h, EIG.h, LSODE.cc, LSODE.h, ODE.h, ODEFunc.h, ODES.h, ODESFunc.h, Quad.h, aepbalance.cc, aepbalance.h, base-dae.h, base-de.h, chol.cc, chol.h, eigs-base.cc, fEIG.h, gepbalance.h, gsvd.cc, gsvd.h, hess.h, lu.cc, lu.h, oct-fftw.cc, oct-fftw.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randmtzig.cc, randmtzig.h, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.h, base-list.h, caseless-str.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, data-conv.cc, file-info.h, glob-match.cc, glob-match.h, kpse.cc, kpse.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.cc, lo-ieee.h, lo-regexp.cc, lo-regexp.h, oct-inttypes.cc, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sort.h, oct-sparse.cc, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, singleton-cleanup.cc, singleton-cleanup.h, str-vec.cc, str-vec.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h, version.cc, version.in.h, cxx-signal-helpers.cc, acinclude.m4, main-cli.cc, main-gui.cc, main.in.cc, mkoctfile.in.cc, octave-build-info.h, octave-build-info.in.cc, octave-config.in.cc, octave-svgconvert.cc, shared-fcns.h: maint: Eliminate "(void)" in C++ function prototypes/declarations.

author	Rik <rik@octave.org>
date	Tue, 24 Jan 2023 17:19:44 -0800
parents	faf5d5960732
children	947b8c671680

comparison

equal deleted inserted replaced

-:1d1eff97670e
+:21f9b34eb893
 return caseless_str ();
 }
 static Matrix
-viridis_colormap (void)
+viridis_colormap ()
 {
 // The values below have been produced by viridis (64)(:)
 // It would be nice to be able to feval the
 // viridis function but since there is a static property object that includes
 // a colormap_property object, we need to initialize this before main is
 std::copy (cmapv, cmapv + (64*3), cmap.fortran_vec ());
 return cmap;
 }
 static double
-default_screendepth (void)
+default_screendepth ()
 {
 octave::display_info& dpy_info = octave::__get_display_info__ ();
 return dpy_info.depth ();
 }
 static Matrix
-default_screensize (void)
+default_screensize ()
 {
 Matrix retval (1, 4);
 octave::display_info& dpy_info = octave::__get_display_info__ ();
 return retval;
 }
 static double
-default_screenpixelsperinch (void)
+default_screenpixelsperinch ()
 {
 octave::display_info& dpy_info = octave::__get_display_info__ ();
 return (dpy_info.x_dpi () + dpy_info.y_dpi ()) / 2;
 }
 static Matrix
-default_colororder (void)
+default_colororder ()
 {
 Matrix retval (7, 3, 0.0);
 retval(0, 1) = 0.447;
 retval(0, 2) = 0.741;
 return m;
 }
 static Matrix
-default_data (void)
+default_data ()
 {
 Matrix retval (1, 2);
 retval(0) = 0;
 retval(1) = 1;
 return retval;
 }
 static Matrix
-default_data_lim (void)
+default_data_lim ()
 {
 Matrix retval (1, 4);
 retval(0) = 0;
 retval(1) = 1;
 return retval;
 }
 static Matrix
-default_image_cdata (void)
+default_image_cdata ()
 {
 Matrix m (64, 64);
 int i = 0;
 for (int col = 0; col < 64; col++)
 return m;
 }
 static Matrix
-default_surface_xdata (void)
+default_surface_xdata ()
 {
 Matrix m (3, 3);
 for (int col = 0; col < 3; col++)
 for (int row = 0; row < 3; row++)
 return m;
 }
 static Matrix
-default_surface_ydata (void)
+default_surface_ydata ()
 {
 Matrix m (3, 3);
 for (int row = 0; row < 3; row++)
 for (int col = 0; col < 3; col++)
 return m;
 }
 static Matrix
-default_surface_zdata (void)
+default_surface_zdata ()
 {
 Matrix m (3, 3, 0.0);
 for (int row = 0; row < 3; row++)
 m(row, row) = 1.0;
 return m;
 }
 static Matrix
-default_surface_cdata (void)
+default_surface_cdata ()
 {
 return default_surface_zdata ();
 }
 static Matrix
-default_patch_faces (void)
+default_patch_faces ()
 {
 Matrix m (1, 3);
 m(0) = 1.0;
 m(1) = 2.0;
 return m;
 }
 static Matrix
-default_patch_vertices (void)
+default_patch_vertices ()
 {
 Matrix m (3, 2, 0.0);
 m(1) = 1.0;
 m(3) = 1.0;
 return m;
 }
 static Matrix
-default_patch_xdata (void)
+default_patch_xdata ()
 {
 Matrix m (3, 1, 0.0);
 m(1) = 1.0;
 return m;
 }
 static Matrix
-default_patch_ydata (void)
+default_patch_ydata ()
 {
 Matrix m (3, 1, 1.0);
 m(2) = 0.0;
 return m;
 }
 static Matrix
-default_axes_position (void)
+default_axes_position ()
 {
 Matrix m (1, 4);
 m(0) = 0.13;
 m(1) = 0.11;
 return m;
 }
 static Matrix
-default_axes_outerposition (void)
+default_axes_outerposition ()
 {
 Matrix m (1, 4);
 m(0) = 0.0;
 m(1) = 0.0;
 return m;
 }
 static Matrix
-default_axes_view (void)
+default_axes_view ()
 {
 Matrix m (1, 2);
 m(0) = 0.0;
 m(1) = 90.0;
 return m;
 }
 static Matrix
-default_axes_tick (void)
+default_axes_tick ()
 {
 Matrix m (1, 6);
 m(0) = 0.0;
 m(1) = 0.2;
 return m;
 }
 static Matrix
-default_axes_ticklength (void)
+default_axes_ticklength ()
 {
 Matrix m (1, 2);
 m(0) = 0.01;
 m(1) = 0.025;
 return m;
 }
 static Matrix
-default_figure_position (void)
+default_figure_position ()
 {
 Matrix m (1, 4);
 m(0) = 300;
 m(1) = 200;
 return m;
 }
 static Matrix
-default_figure_papersize (void)
+default_figure_papersize ()
 {
 Matrix m (1, 2);
 m(0) = 8.5;
 m(1) = 11.0;
 return m;
 }
 static Matrix
-default_figure_paperposition (void)
+default_figure_paperposition ()
 {
 Matrix m (1, 4);
 // Update if default_figure_position or default_figure_papersize change
 m(0) = 1.3421852580027660;
 return m;
 }
 static std::string
-default_graphics_toolkit (void)
+default_graphics_toolkit ()
 {
 octave::gtk_manager& gtk_mgr = octave::__get_gtk_manager__ ();
 return gtk_mgr.default_toolkit ();
 }
 static Matrix
-default_control_position (void)
+default_control_position ()
 {
 Matrix retval (1, 4);
 retval(0) = 0;
 retval(1) = 0;
 return retval;
 }
 static Matrix
-default_control_sliderstep (void)
+default_control_sliderstep ()
 {
 Matrix retval (1, 2);
 retval(0) = 0.01;
 retval(1) = 0.1;
 return retval;
 }
 static Matrix
-default_panel_position (void)
+default_panel_position ()
 {
 Matrix retval (1, 4);
 retval(0) = 0;
 retval(1) = 0;
 return retval;
 }
 static Matrix
-default_light_position (void)
+default_light_position ()
 {
 Matrix m (1, 3);
 m(0) = 1.0;
 m(1) = 0.0;
 return m;
 }
 static Matrix
-default_table_position (void)
+default_table_position ()
 {
 Matrix retval (1, 4);
 retval(0) = 20;
 retval(1) = 20;
 return retval;
 }
 static Matrix
-default_table_backgroundcolor (void)
+default_table_backgroundcolor ()
 {
 Matrix retval (2, 3);
 retval(0, 0) = 1;
 retval(0, 1) = 1;
 retval(0, 2) = 1;
 return retval;
 }
 // This function always returns the screensize in pixels
 static Matrix
-screen_size_pixels (void)
+screen_size_pixels ()
 {
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 graphics_object obj = gh_mgr.get_object (0);
 beg = end + 1;
 }
 }
 std::string
-radio_values::values_as_string (void) const
+radio_values::values_as_string () const
 {
 std::string retval;
 for (const auto& val : m_possible_vals)
 {
 return retval;
 }
 Cell
-radio_values::values_as_cell (void) const
+radio_values::values_as_cell () const
 {
 octave_idx_type i = 0;
 Cell retval (nelem (), 1);
 for (const auto& val : m_possible_vals)
 return false;
 }
 void
-array_property::get_data_limits (void)
+array_property::get_data_limits ()
 {
 m_min_val = m_min_pos = octave::numeric_limits<double>::Inf ();
 m_max_val = m_max_neg = -octave::numeric_limits<double>::Inf ();
 if (! m_data.isempty ())
 class callback_props
 {
 public:
-callback_props (void) : m_set () { }
+callback_props () : m_set () { }
 callback_props (const callback_props&) = delete;
 callback_props& operator = (const callback_props&) = delete;
-~callback_props (void) = default;
+~callback_props () = default;
-bool empty (void) const { return m_set.empty (); }
+bool empty () const { return m_set.empty (); }
 void insert (const callback_property *ptr)
 {
 m_set.insert (reinterpret_cast<intptr_t> (ptr));
 }
 }
 }
 }
 void
-figure::properties::update_handlevisibility (void)
+figure::properties::update_handlevisibility ()
 {
 if (! is_handle_visible ())
 {
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 }
 }
 }
 void
-figure::properties::update___device_pixel_ratio__ (void)
+figure::properties::update___device_pixel_ratio__ ()
 {
 update_text_pos (get___myhandle__ ());
 }
 // ---------------------------------------------------------------------
 %! end_unwind_protect
 */
 // This function is NOT equivalent to the scripting language function gcf.
 graphics_handle
-gcf (void)
+gcf ()
 {
 octave_value val = xget (0, "currentfigure");
 return val.isempty () ? octave::numeric_limits<double>::NaN ()
 : val.double_value ();
 }
 // This function is NOT equivalent to the scripting language function gca.
 graphics_handle
-gca (void)
+gca ()
 {
 octave_value val = xget (gcf (), "currentaxes");
 return val.isempty () ? octave::numeric_limits<double>::NaN ()
 : val.double_value ();
 return m;
 }
 std::set<std::string>
-base_properties::dynamic_property_names (void) const
+base_properties::dynamic_property_names () const
 {
 return m_dynamic_properties;
 }
 bool
 %!   close (hf);
 %! end_unwind_protect
 */
 void
-base_properties::mark_modified (void)
+base_properties::mark_modified ()
 {
 // Mark existing object as modified
 m___modified__ = "on";
 // Attempt to mark parent object as modified if it exists
 if (go)
 go.update_axis_limits (axis_type, h);
 }
 void
-base_properties::update_contextmenu (void) const
+base_properties::update_contextmenu () const
 {
 if (m_contextmenu.get ().isempty ())
 return;
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 props.add_dependent_obj (m___myhandle__);
 }
 }
 bool
-base_properties::is_handle_visible (void) const
+base_properties::is_handle_visible () const
 {
 return (m_handlevisibility.is ("on")
 || (! executing_callbacks.empty () && ! m_handlevisibility.is ("off")));
 }
 octave::graphics_toolkit
-base_properties::get_toolkit (void) const
+base_properties::get_toolkit () const
 {
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 graphics_object go = gh_mgr.get_object (get_parent ());
 else
 return octave::graphics_toolkit ();
 }
 void
-base_properties::update_boundingbox (void)
+base_properties::update_boundingbox ()
 {
 Matrix kids = get_children ();
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 if (parent_go.valid_object ())
 parent_go.get_properties ().update_autopos (elem_type);
 }
 void
-base_properties::update_handlevisibility (void)
+base_properties::update_handlevisibility ()
 {
 if (is_handle_visible ())
 return;
 // This object should not be the figure "currentobject"
 if (parent_go)
 parent_go.update_axis_limits (axis_type, h);
 }
 void
-base_graphics_object::remove_all_listeners (void)
+base_graphics_object::remove_all_listeners ()
 {
 int state = toggle_warn ("Octave:deprecated-property", false);
 octave_map m = get (true).map_value ();
 toggle_warn ("Octave:deprecated-property", true, state);
 if (parent_go)
 parent_go.build_user_defaults_map (def, go_name);
 }
 void
-base_graphics_object::reset_default_properties (void)
+base_graphics_object::reset_default_properties ()
 {
 if (valid_object ())
 {
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 xreset_default_properties (get_handle (), factory_pval);
 }
 }
 std::string
-base_graphics_object::values_as_string (void)
+base_graphics_object::values_as_string ()
 {
 if (! valid_object ())
 error ("base_graphics_object::values_as_string: invalid graphics object");
 std::string retval;
 return retval;
 }
 octave_scalar_map
-base_graphics_object::values_as_struct (void)
+base_graphics_object::values_as_struct ()
 {
 octave_scalar_map retval;
 if (! valid_object ())
 error ("base_graphics_object::values_as_struct: invalid graphics object");
 }
 // FIXME: This should update monitorpositions and pointerlocation, but as these
 // properties aren't yet used, it doesn't matter that they aren't set either.
 void
-root_figure::properties::update_units (void)
+root_figure::properties::update_units ()
 {
 std::string xunits = get_units ();
 Matrix scrn_sz = default_screensize ();
 base_properties::remove_child (h, true);
 }
 void
-root_figure::reset_default_properties (void)
+root_figure::reset_default_properties ()
 {
 // empty list of local defaults
 m_default_properties = property_list ();
 remove_all_listeners ();
 m_currentaxes = new_currentaxes;
 }
 }
 octave_value
-figure::properties::get_number (void) const
+figure::properties::get_number () const
 {
 if (m_integerhandle.is_on ())
 return m___myhandle__.value ();
 else
 return Matrix ();
 }
 octave::graphics_toolkit
-figure::properties::get_toolkit (void) const
+figure::properties::get_toolkit () const
 {
 return m_toolkit;
 }
 void
 return retval;
 }
 Matrix
-figure::properties::get_auto_paperposition (void)
+figure::properties::get_auto_paperposition ()
 {
 Matrix pos = get_position ().matrix_value ();
 Matrix sz;
 caseless_str funits = get_units ();
 m_papersize.set (octave_value (sz));
 m_paperposition.set (octave_value (pos));
 }
 void
-figure::properties::update_papertype (void)
+figure::properties::update_papertype ()
 {
 std::string typ = get_papertype ();
 if (typ != "<custom>")
 {
 Matrix sz = papersize_from_type (get_paperunits (), typ);
 if (m_paperpositionmode.is ("auto"))
 m_paperposition.set (get_auto_paperposition ());
 }
 void
-figure::properties::update_papersize (void)
+figure::properties::update_papersize ()
 {
 Matrix sz = get_papersize ().matrix_value ();
 if (sz(0) > sz(1))
 {
 std::swap (sz(0), sz(1));
 %!   close (hf);
 %! end_unwind_protect
 */
 void
-figure::properties::update_paperorientation (void)
+figure::properties::update_paperorientation ()
 {
 std::string porient = get_paperorientation ();
 Matrix sz = get_papersize ().matrix_value ();
 if ((sz(0) > sz(1) && porient == "portrait")
 || (sz(0) < sz(1) && porient == "landscape"))
 %!   set (0, "units", old_units);
 %! end_unwind_protect
 */
 std::string
-figure::properties::get_title (void) const
+figure::properties::get_title () const
 {
 std::string title;
 if (! get_number ().isempty () && is_numbertitle ())
 {
 std::ostringstream os;
 return retval;
 }
 void
-figure::reset_default_properties (void)
+figure::reset_default_properties ()
 {
 // empty list of local defaults
 m_default_properties = property_list ();
 property_list::pval_map_type plist = m_properties.factory_defaults ();
 }
 // ---------------------------------------------------------------------
 void
-axes::properties::init (void)
+axes::properties::init ()
 {
 m_position.add_constraint (dim_vector (1, 4));
 m_outerposition.add_constraint (dim_vector (1, 4));
 m_tightinset.add_constraint (dim_vector (1, 4));
 m_looseinset.add_constraint (dim_vector (1, 4));
 return pos;
 }
 void
-axes::properties::sync_positions (void)
+axes::properties::sync_positions ()
 {
 // First part is equivalent to 'update_tightinset ()'
 if (m_positionconstraint.is ("innerposition"))
 update_position ();
 else
 sync_positions ();
 override_defaults (bgo);
 }
 octave_value
-axes::properties::get_colormap (void) const
+axes::properties::get_colormap () const
 {
 if (m___colormap__.get ().isempty ())
 {
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 if (climmode_is ("auto"))
 update_axis_limits ("alim");
 }
 inline Matrix
-xform_matrix (void)
+xform_matrix ()
 {
 Matrix m (4, 4, 0.0);
 for (int i = 0; i < 4; i++)
 m(i, i) = 1;
 return m;
 }
 inline ColumnVector
-xform_vector (void)
+xform_vector ()
 {
 ColumnVector v (4, 0.0);
 v(3) = 1;
 return r;
 }
 inline Matrix
-unit_cube (void)
+unit_cube ()
 {
 static double data[32] =
 {
 0, 0, 0, 1,
 1, 0, 0, 1,
 {
 return v.extract_n (0, 3).transpose ();
 }
 void
-axes::properties::update_camera (void)
+axes::properties::update_camera ()
 {
 double xd = (xdir_is ("normal") ? 1 : -1);
 double yd = (ydir_is ("normal") ? 1 : -1);
 double zd = (zdir_is ("normal") ? 1 : -1);
 }
 static bool updating_axes_layout = false;
 void
-axes::properties::update_axes_layout (void)
+axes::properties::update_axes_layout ()
 {
 if (updating_axes_layout)
 return;
 graphics_xform xform = get_transform ();
 update_ticklength ();
 }
 void
-axes::properties::update_ticklength (void)
+axes::properties::update_ticklength ()
 {
 bool mode2D = (((m_xstate > AXE_DEPTH_DIR ? 1 : 0) +
 (m_ystate > AXE_DEPTH_DIR ? 1 : 0) +
 (m_zstate > AXE_DEPTH_DIR ? 1 : 0)) == 2);
 }
 static bool updating_xlabel_position = false;
 void
-axes::properties::update_xlabel_position (void)
+axes::properties::update_xlabel_position ()
 {
 if (updating_xlabel_position)
 return;
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 }
 static bool updating_ylabel_position = false;
 void
-axes::properties::update_ylabel_position (void)
+axes::properties::update_ylabel_position ()
 {
 if (updating_ylabel_position)
 return;
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 }
 static bool updating_zlabel_position = false;
 void
-axes::properties::update_zlabel_position (void)
+axes::properties::update_zlabel_position ()
 {
 if (updating_zlabel_position)
 return;
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 }
 static bool updating_title_position = false;
 void
-axes::properties::update_title_position (void)
+axes::properties::update_title_position ()
 {
 if (updating_title_position)
 return;
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 }
 static std::set<double> updating_aspectratios;
 void
-axes::properties::update_aspectratios (void)
+axes::properties::update_aspectratios ()
 {
 if (updating_aspectratios.find (get___myhandle__ ().value ())
 != updating_aspectratios.end ())
 return;
 {
 return octave::xform_vector (x, y, z);
 }
 Matrix
-graphics_xform::xform_eye (void)
+graphics_xform::xform_eye ()
 {
 return octave::xform_matrix ();
 }
 ColumnVector
 a = x / std::pow (10.0, b);
 }
 }
 void
-axes::properties::update_outerposition (void)
+axes::properties::update_outerposition ()
 {
 set_positionconstraint ("outerposition");
 caseless_str old_units = get_units ();
 set_units ("normalized");
 set_units (old_units);
 update_transform ();
 }
 void
-axes::properties::update_position (void)
+axes::properties::update_position ()
 {
 set_positionconstraint ("innerposition");
 caseless_str old_units = get_units ();
 set_units ("normalized");
 set_units (old_units);
 update_transform ();
 }
 void
-axes::properties::update_looseinset (void)
+axes::properties::update_looseinset ()
 {
 caseless_str old_units = get_units ();
 set_units ("normalized");
 Matrix linset = m_looseinset.get ().matrix_value ();
 zoom_about_point (mode, x, y, factor, push_to_zoom_stack);
 }
 void
-axes::properties::push_zoom_stack (void)
+axes::properties::push_zoom_stack ()
 {
 if (m_zoom_stack.empty ())
 {
 m_zoom_stack.push_front (m_xlimmode.get ());
 m_zoom_stack.push_front (m_xlim.get ());
 update_transform ();
 }
 void
-axes::properties::unzoom (void)
+axes::properties::unzoom ()
 {
 if (m_zoom_stack.size () >= 7)
 {
 m_view = m_zoom_stack.front ();
 m_zoom_stack.pop_front ();
 update_view ();
 }
 }
 void
-axes::properties::update_handlevisibility (void)
+axes::properties::update_handlevisibility ()
 {
 if (! is_handle_visible ())
 {
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 base_properties::update_handlevisibility ();
 }
 void
-figure::properties::init_toolkit (void)
+figure::properties::init_toolkit ()
 {
 octave::gtk_manager& gtk_mgr = octave::__get_gtk_manager__ ();
 m_toolkit = gtk_mgr.get_toolkit ();
 }
 if (do_unzoom)
 unzoom ();
 }
 void
-axes::properties::trigger_normals_calc (void)
+axes::properties::trigger_normals_calc ()
 {
 // Find all patch (and surface) objects within axes
 std::list<graphics_object> children_list;
 std::list<graphics_object>::iterator children_list_iter;
 get_children_of_type ("patch", false, true, children_list);
 }
 }
 }
 void
-axes::reset_default_properties (void)
+axes::reset_default_properties ()
 {
 // empty list of local defaults
 m_default_properties = property_list ();
 // Save warning state of "Octave:deprecated-property"
 }
 // ---------------------------------------------------------------------
 Matrix
-line::properties::compute_xlim (void) const
+line::properties::compute_xlim () const
 {
 Matrix m (1, 4);
 m(0) = m_xdata.min_val ();
 m(1) = m_xdata.max_val ();
 return m;
 }
 Matrix
-line::properties::compute_ylim (void) const
+line::properties::compute_ylim () const
 {
 Matrix m (1, 4);
 m(0) = m_ydata.min_val ();
 m(1) = m_ydata.max_val ();
 }
 // ---------------------------------------------------------------------
 Matrix
-text::properties::get_data_position (void) const
+text::properties::get_data_position () const
 {
 Matrix pos = get_position ().matrix_value ();
 if (! units_is ("data"))
 pos = convert_text_position (pos, *this, get_units (), "data");
 return ext;
 }
 octave_value
-text::properties::get_extent (void) const
+text::properties::get_extent () const
 {
 // FIXME: This doesn't work right for 3D plots.
 // (It doesn't in Matlab either, at least not in version 6.5.)
 Matrix m = get_extent_matrix (true);
 Matrix pos = get_position ().matrix_value ();
 set_fontsize (octave_value (fontsz));
 }
 void
-text::properties::update_font (void)
+text::properties::update_font ()
 {
 double dpr = device_pixel_ratio (get___myhandle__ ());
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 m_txt_renderer.set_color (c);
 }
 void
-text::properties::update_text_extent (void)
+text::properties::update_text_extent ()
 {
 int halign = 0;
 int valign = 0;
 if (horizontalalignment_is ("center"))
 || __autopos_tag___is ("zlabel") || __autopos_tag___is ("title"))
 update_autopos ("sync");
 }
 void
-text::properties::request_autopos (void)
+text::properties::request_autopos ()
 {
 if (__autopos_tag___is ("xlabel") || __autopos_tag___is ("ylabel")
 || __autopos_tag___is ("zlabel") || __autopos_tag___is ("title"))
 update_autopos (get___autopos_tag__ ());
 }
 void
-text::properties::update_units (void)
+text::properties::update_units ()
 {
 if (! units_is ("data"))
 {
 set_xliminclude ("off");
 set_yliminclude ("off");
 }
 // ---------------------------------------------------------------------
 octave_value
-image::properties::get_color_data (void) const
+image::properties::get_color_data () const
 {
 return convert_cdata (*this, get_cdata (), cdatamapping_is ("scaled"), 3);
 }
 // ---------------------------------------------------------------------
 = dynamic_cast<axes::properties&> (go.get_ancestor ("axes").get_properties ());
 parent_axes_prop.trigger_normals_calc ();
 }
 void
-light::properties::update_visible (void)
+light::properties::update_visible ()
 {
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 graphics_object go = gh_mgr.get_object (get___myhandle__ ());
 }
 // ---------------------------------------------------------------------
 bool
-patch::properties::get_do_lighting (void) const
+patch::properties::get_do_lighting () const
 {
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 graphics_object go = gh_mgr.get_object (get___myhandle__ ());
 return (ax_props.get_num_lights () > 0);
 }
 octave_value
-patch::properties::get_color_data (void) const
+patch::properties::get_color_data () const
 {
 octave_value fvc = get_facevertexcdata ();
 if (fvc.is_undefined () || fvc.isempty ())
 return Matrix ();
 else
 }
 static bool updating_patch_data = false;
 void
-patch::properties::update_fvc (void)
+patch::properties::update_fvc ()
 {
 if (updating_patch_data)
 return;
 Matrix xd = get_xdata ().matrix_value ();
 }
 return coplanar_ends;
 }
 void
-patch::properties::update_data (void)
+patch::properties::update_data ()
 {
 if (updating_patch_data)
 return;
 Matrix idx = get_faces ().matrix_value ().transpose ();
 m_properties.update_normals (true);
 }
 void
-patch::reset_default_properties (void)
+patch::reset_default_properties ()
 {
 // empty list of local defaults
 m_default_properties = property_list ();
 xreset_default_properties (get_handle (), m_properties.factory_defaults ());
 }
 // ---------------------------------------------------------------------
 octave_value
-scatter::properties::get_color_data (void) const
+scatter::properties::get_color_data () const
 {
 octave_value c = get_cdata ();
 if (c.is_undefined () || c.isempty ())
 return Matrix ();
 else
 return convert_cdata (*this, c, c.columns () == 1, 2);
 }
 void
-scatter::properties::update_data (void)
+scatter::properties::update_data ()
 {
 Matrix xd = get_xdata ().matrix_value ();
 Matrix yd = get_ydata ().matrix_value ();
 Matrix zd = get_zdata ().matrix_value ();
 Matrix cd = get_cdata ().matrix_value ();
 }
 static bool updating_scatter_cdata = false;
 void
-scatter::properties::update_color (void)
+scatter::properties::update_color ()
 {
 if (updating_scatter_cdata)
 return;
 Matrix series_idx = get_seriesindex ().matrix_value ();
 }
 // ---------------------------------------------------------------------
 octave_value
-surface::properties::get_color_data (void) const
+surface::properties::get_color_data () const
 {
 return convert_cdata (*this, get_cdata (), cdatamapping_is ("scaled"), 3);
 }
 bool
-surface::properties::get_do_lighting (void) const
+surface::properties::get_do_lighting () const
 {
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 graphics_object go = gh_mgr.get_object (get___myhandle__ ());
 base_properties::adopt (h);
 update_limits (h);
 }
 void
-hggroup::properties::update_limits (void) const
+hggroup::properties::update_limits () const
 {
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 graphics_object go = gh_mgr.get_object (m___myhandle__);
 }
 // ---------------------------------------------------------------------
 void
-uicontextmenu::properties::update_beingdeleted (void)
+uicontextmenu::properties::update_beingdeleted ()
 {
 // Clear the uicontextmenu property of dependent objects
 if (m_beingdeleted.is ("on"))
 {
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 */
 // ---------------------------------------------------------------------
 octave_value
-uicontrol::properties::get_extent (void) const
+uicontrol::properties::get_extent () const
 {
 Matrix m = m_extent.get ().matrix_value ();
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 return convert_position (m, "pixels", get_units (), parent_size);
 }
 void
-uicontrol::properties::update_text_extent (void)
+uicontrol::properties::update_text_extent ()
 {
 // FIXME: support multiline text
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 set_extent (go.get_toolkit ().get_text_extent (go));
 }
 void
-uicontrol::properties::update_units (void)
+uicontrol::properties::update_units ()
 {
 Matrix pos = get_position ().matrix_value ();
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 return convert_font_size (fontsz, get_fontunits (), "pixels", parent_height);
 }
 Matrix
-uitable::properties::get_backgroundcolor_rgb (void)
+uitable::properties::get_backgroundcolor_rgb ()
 {
 Matrix bg = m_backgroundcolor.get ().matrix_value ();
 return bg.row (0);
 }
 Matrix
-uitable::properties::get_alternatebackgroundcolor_rgb (void)
+uitable::properties::get_alternatebackgroundcolor_rgb ()
 {
 int i = 0;
 Matrix bg = m_backgroundcolor.get ().matrix_value ();
 if (bg.rows () > 1)
 i = 1;
 return bg.row (i);
 }
 Matrix
-uitable::properties::get_extent_matrix (void) const
+uitable::properties::get_extent_matrix () const
 {
 return m_extent.get ().matrix_value ();
 }
 octave_value
-uitable::properties::get_extent (void) const
+uitable::properties::get_extent () const
 {
 // FIXME: Is it really acceptable to just let the toolkit update the extent?
 Matrix m = m_extent.get ().matrix_value ();
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 return retval;
 }
 void
-uitoolbar::reset_default_properties (void)
+uitoolbar::reset_default_properties ()
 {
 // empty list of local defaults
 m_default_properties = property_list ();
 remove_all_listeners ();
 const octave_value& data = Matrix (),
 int busyaction = base_graphics_event::QUEUE)
 : base_graphics_event (busyaction), m_handle (h), m_callback_name (),
 m_callback (cb), m_callback_data (data) { }
-void execute (void)
+void execute ()
 {
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 if (m_callback.is_defined ())
 gh_mgr.execute_callback (m_handle, m_callback, m_callback_data);
 else
 gh_mgr.execute_callback (m_handle, m_callback_name, m_callback_data);
 }
 private:
-callback_event (void)
+callback_event ()
 : base_graphics_event (), m_handle (), m_callback_name (),
 m_callback_data ()
 { }
 private:
 mcode_event (const graphics_handle& h, const std::string& cmd,
 int busyaction = base_graphics_event::QUEUE)
 : base_graphics_event (busyaction), m_handle (h), m_mcode (cmd)
 { }
-void execute (void)
+void execute ()
 {
 if (! m_mcode.empty ())
 {
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 }
 }
 }
 private:
-mcode_event (void)
+mcode_event ()
 : base_graphics_event (), m_handle (), m_mcode ()
 { }
 private:
 graphics_handle m_handle;
 {
 public:
 // function_event objects must be created with at least a function.
-function_event (void) = delete;
+function_event () = delete;
 function_event (graphics_event::event_fcn fcn, void *data = nullptr)
 : base_graphics_event (), m_function (fcn), m_function_data (data)
 { }
 function_event (const function_event&) = delete;
 function_event& operator = (const function_event&) = delete;
-void execute (void)
+void execute ()
 {
 m_function (m_function_data);
 }
 private:
 : base_graphics_event (), m_handle (h), m_property_name (name),
 m_property_value (value), m_notify_toolkit (do_notify_toolkit),
 m_redraw_figure (redraw_figure)
 { }
-void execute (void)
+void execute ()
 {
 gh_manager& gh_mgr = octave::__get_gh_manager__ ();
 octave::autolock guard (gh_mgr.graphics_lock ());
 }
 }
 }
 private:
-set_event (void)
+set_event ()
 : base_graphics_event (), m_handle (), m_property_name (), m_property_value ()
 { }
 private:
 graphics_handle m_handle;
 return graphics_event (new set_event (h, name, data, notify_toolkit,
 redraw_figure));
 }
 property_list::plist_map_type
-root_figure::init_factory_properties (void)
+root_figure::init_factory_properties ()
 {
 property_list::plist_map_type plist_map;
 plist_map["figure"] = figure::properties::factory_defaults ();
 plist_map["axes"] = axes::properties::factory_defaults ();

Mercurial > octave

comparison libinterp/corefcn/graphics.cc @ 31771:21f9b34eb893