Mercurial > octave
changeset 33086:92844cd3b59c
maint: merge stable to default
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 23 Feb 2024 15:14:52 -0500 |
| parents | e073e676c416 (current diff) 2239226e99d1 (diff) |
| children | 4751f73c878e 49dec190c4da |
| files | libgui/src/qt-interpreter-events.cc libinterp/octave-value/ov-java.cc |
| diffstat | 3 files changed, 49 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/doxyhtml/Doxyfile.in Thu Feb 22 15:20:16 2024 -0500 +++ b/doc/doxyhtml/Doxyfile.in Fri Feb 23 15:14:52 2024 -0500 @@ -147,7 +147,7 @@ # operators of the base classes will not be shown. # The default value is: NO. -INLINE_INHERITED_MEMB = YES +INLINE_INHERITED_MEMB = NO # If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path # before files name in the file list and in the header files. If set to NO the @@ -271,7 +271,7 @@ # be included in the documentation. # The default value is: NO. -EXTRACT_PRIVATE = YES +EXTRACT_PRIVATE = NO # If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal # scope will be included in the documentation. @@ -283,7 +283,7 @@ # included in the documentation. # The default value is: NO. -EXTRACT_STATIC = YES +EXTRACT_STATIC = NO # If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined # locally in source files will be included in the documentation. If set to NO, @@ -291,7 +291,7 @@ # for Java sources. # The default value is: YES. -EXTRACT_LOCAL_CLASSES = YES +EXTRACT_LOCAL_CLASSES = NO # If this flag is set to YES, the members of anonymous namespaces will be @@ -384,13 +384,12 @@ INPUT = @abs_top_srcdir@/src/ \ @abs_top_srcdir@/liboctave/ \ @abs_top_srcdir@/libinterp \ - @abs_top_srcdir@/libgui \ @abs_top_srcdir@/doc/doxyhtml/pages \ @abs_top_builddir@/doc/doxyhtml/pages # The EXCLUDE tag is used to exclude files and/or directories that would # otherwise be included by the INPUT tag. -#EXCLUDE = +EXCLUDE = # This tag is used to exclude files and/or directories that would otherwise be # included by the INPUT tag using a pattern rather than an exact name as @@ -715,7 +714,39 @@ HAVE_QT=1 \ HAVE_UMFPACK=1 \ HAVE_X_WINDOWS=1 \ - HAVE_ZLIB=1 + HAVE_ZLIB=1 \ + OCTARRAY_API= \ + OCTARRAY_CLASS_TEMPLATE_INSTANTIATION_API= \ + OCTARRAY_EXCEPTION_API= \ + OCTARRAY_EXTERN_TEMPLATE_API= \ + OCTARRAY_OVERRIDABLE_FUNC_API= \ + OCTARRAY_TEMPLATE_API= \ + OCTAVE_API= \ + OCTAVE_CLASS_TEMPLATE_INSTANTIATION_API= \ + OCTAVE_EXCEPTION_API= \ + OCTAVE_EXPORT= \ + OCTAVE_EXTERN_TEMPLATE_API= \ + OCTAVE_IMPORT= \ + OCTAVE_OVERRIDABLE_FUNC_API= \ + OCTAVE_TEMPLATE_API= \ + OCTGRAPHICS_API= \ + OCTGRAPHICS_CLASS_TEMPLATE_INSTANTIATION_API= \ + OCTGRAPHICS_EXCEPTION_API= \ + OCTGRAPHICS_EXTERN_TEMPLATE_API= \ + OCTGRAPHICS_OVERRIDABLE_FUNC_API= \ + OCTGRAPHICS_TEMPLATE_API= \ + OCTGUI_API= \ + OCTGUI_CLASS_TEMPLATE_INSTANTIATION_API= \ + OCTGUI_EXCEPTION_API= \ + OCTGUI_EXTERN_TEMPLATE_API= \ + OCTGUI_OVERRIDABLE_FUNC_API= \ + OCTGUI_TEMPLATE_API= \ + OCTINTERP_API= \ + OCTINTERP_CLASS_TEMPLATE_INSTANTIATION_API= \ + OCTINTERP_EXCEPTION_API= \ + OCTINTERP_EXTERN_TEMPLATE_API= \ + OCTINTERP_OVERRIDABLE_FUNC_API= \ + OCTINTERP_TEMPLATE_API #--------------------------------------------------------------------------- # Configuration options related to the dot tool @@ -734,7 +765,7 @@ # set to NO # The default value is: NO. -HAVE_DOT = YES +HAVE_DOT = NO # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes @@ -748,7 +779,7 @@ # This tag requires that the tag HAVE_DOT is set to YES. # Some of our dependency graphs are really huge... -DOT_GRAPH_MAX_NODES = 100 +DOT_GRAPH_MAX_NODES = 300 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot # files that are used to generate the various graphs.
--- a/libgui/src/qt-interpreter-events.cc Thu Feb 22 15:20:16 2024 -0500 +++ b/libgui/src/qt-interpreter-events.cc Fri Feb 23 15:14:52 2024 -0500 @@ -675,13 +675,14 @@ emit exit_debugger_signal (); } -// Display (if @insert true) or remove the appropriate symbol for a breakpoint -// in @file at @line with condition @cond. +//! Display (if @c insert true) or remove the appropriate symbol for a +//! breakpoint in @c file at @c line with condition @c cond. + void qt_interpreter_events::update_breakpoint (bool insert, - const std::string& file, - int line, - const std::string& cond) + const std::string& file, + int line, + const std::string& cond) { emit update_breakpoint_marker_signal (insert, QString::fromStdString (file), line, QString::fromStdString (cond));
--- a/libinterp/octave-value/ov-java.cc Thu Feb 22 15:20:16 2024 -0500 +++ b/libinterp/octave-value/ov-java.cc Fri Feb 23 15:14:52 2024 -0500 @@ -403,7 +403,7 @@ //! Return the initial classpath. //! //! The initial classpath starts with a pointer to @c octave.jar which is -//! located in the initial java directory given by #java_init_dir(). +//! located in the initial java directory given by #initial_java_dir(). //! //! @attention This is nowhere documented and also the script //! @c javaclasspath.m drops this. On the other hand, this is vital because @@ -657,7 +657,7 @@ //! - '-Xrs' //! //! Further options are read from the file @c java.opts in the directory given -//! by #java_init_dir(). +//! by #initial_java_dir(). //! //! Note that #initial_class_path() determines the initial classpath. This //! is the static classpath which cannot be changed. Elements of the dynamic @@ -1336,6 +1336,7 @@ //! @c Integer, @c Long, @c Short, @c Float, or @c Double, then it will be //! converted using the @c java.lang.Number.doubleValue() method. //! +//! @param jni_env JNI environment pointer. //! @param jobj Java object being returned to Octave //! @return @c true if @c jobj shall be converted into a numeric value //! automatically, @c false otherwise