Mercurial > octave
changeset 32943:5f4b519e4a5e
maint: merge stable to default
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 06 Feb 2024 12:51:10 -0500 |
| parents | a1c5450ae665 (current diff) c854ec36dcbe (diff) |
| children | 4e39502fef4d 78e9f6c4e138 |
| files | libgui/src/interpreter-qobject.cc libinterp/corefcn/interpreter.h libinterp/octave.cc libinterp/octave.h |
| diffstat | 4 files changed, 17 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/interpreter-qobject.cc Tue Feb 06 10:25:55 2024 +0100 +++ b/libgui/src/interpreter-qobject.cc Tue Feb 06 12:51:10 2024 -0500 @@ -72,7 +72,7 @@ interp.PS2 (""); } - if (interp.initialized ()) + if (interp.is_initialized ()) { // The interpreter should be completely ready at this point so let // the GUI know.
--- a/libinterp/corefcn/interpreter.h Tue Feb 06 10:25:55 2024 +0100 +++ b/libinterp/corefcn/interpreter.h Tue Feb 06 12:51:10 2024 -0500 @@ -219,9 +219,15 @@ return m_evaluator.in_top_level_repl (); } + bool is_initialized () const + { + return m_initialized; + } + + OCTAVE_DEPRECATED (9, "use octave::is_initialized instead") bool initialized () const { - return m_initialized; + return is_initialized (); } void interrupt_all_in_process_group (bool b)
--- a/libinterp/octave.cc Tue Feb 06 10:25:55 2024 +0100 +++ b/libinterp/octave.cc Tue Feb 06 12:51:10 2024 -0500 @@ -346,9 +346,9 @@ } bool -application::interpreter_initialized () +application::interpreter_is_initialized () const { - return m_interpreter ? m_interpreter->initialized () : false; + return m_interpreter ? m_interpreter->is_initialized () : false; } interpreter&
--- a/libinterp/octave.h Tue Feb 06 10:25:55 2024 +0100 +++ b/libinterp/octave.h Tue Feb 06 12:51:10 2024 -0500 @@ -278,7 +278,13 @@ bool is_octave_program () const { return m_is_octave_program; } - bool interpreter_initialized (); + bool interpreter_is_initialized () const; + + OCTAVE_DEPRECATED (9, "use octave::interpreter_is_initialized instead") + bool interpreter_initialized () + { + return interpreter_is_initialized (); + } virtual interpreter& create_interpreter ();