Mercurial > octave-libtiff
changeset 27823:83dd2bc500f0
Remove deprecated FORCE_GUI_OPTION from getopts parsing.
* octave.cc: Remove a comment that references FORCE_GUI_OPTION
* options-usage.h: Remove #define FORCE_GUI_OPTION. Remove "force-gui" entry
from octave_getopt_options struct.
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 13 Dec 2019 18:16:11 -0800 |
| parents | 78c171fe48fc |
| children | ab6b261872ce |
| files | libinterp/octave.cc libinterp/options-usage.h |
| diffstat | 2 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/octave.cc Fri Dec 13 18:10:20 2019 -0800 +++ b/libinterp/octave.cc Fri Dec 13 18:16:11 2019 -0800 @@ -154,7 +154,7 @@ m_exec_path = octave_optarg_wrapper (); break; - case GUI_OPTION: // same value as FORCE_GUI_OPTION + case GUI_OPTION: m_gui = true; break;
--- a/libinterp/options-usage.h Fri Dec 13 18:10:20 2019 -0800 +++ b/libinterp/options-usage.h Fri Dec 13 18:16:11 2019 -0800 @@ -59,8 +59,6 @@ #define DOC_CACHE_FILE_OPTION 2 #define EVAL_OPTION 3 #define EXEC_PATH_OPTION 4 -// FIXME: DEPRECATED: ignored since Octave 4.4, remove for version 6. -#define FORCE_GUI_OPTION 5 #define GUI_OPTION 5 #define IMAGE_PATH_OPTION 6 #define INFO_FILE_OPTION 7 @@ -86,7 +84,6 @@ { "echo-commands", octave_no_arg, 0, 'x' }, { "eval", octave_required_arg, 0, EVAL_OPTION }, { "exec-path", octave_required_arg, 0, EXEC_PATH_OPTION }, - { "force-gui", octave_no_arg, 0, FORCE_GUI_OPTION }, { "gui", octave_no_arg, 0, GUI_OPTION }, { "help", octave_no_arg, 0, 'h' }, { "image-path", octave_required_arg, 0, IMAGE_PATH_OPTION },