Mercurial > octave
view .hgignore @ 31762:d94ceed56929
GLCanvas: avoid multiple inheritance from both QWidget and QObject
To avoid having GLCanvas inherit from both QWidget and QObject, create
a separate class, GLWidget, derived from QOpenGLWidget and use that as
a member of GLCanvas instead of a base class.
* Canvas.h (class Canvas): Derive from QWidget instead of QObject.
(Canvas::Canvas): New argument for parent widget. Pass parent to
QWidget base class constructor.
* GLCanvas.h, GLCanvas.cc (class GLCanvas): Split QOpenGLWidget parts
into separate GLWidget class. GLCanvas now processes things related
to the interpreter and forwards to GLWidget for rendering. Use
unwind_action objects to ensure OpenGL context is restored.
(GLCanvas::m_glwidget): New data member for GLWidget.
* libbgui/graphics/module.mk (OCTAVE_GUI_GRAPHICS_MOC): Add
moc-GLCanvas.cc to the list.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 20 Jan 2023 08:49:19 -0500 |
parents | 12871ccce2e3 |
children | 16b233ccaeab |
line wrap: on
line source
syntax: regexp ## The recurrent (^|/) idiom in the regexps below should be understood ## to mean "at any directory" while the ^ idiom means "from the ## project's top-level directory". ## gnulib related files (^|/)gnulib$ # This directory gets created by gnulib during the build. (^|/)libgnu$ # gnulib makes these silly backup files. .~$ ## m4 related files # This directory mostly contains cruft during build time, but it does # contain some Octave code, so be more careful about what we ignore here. ^m4/(?!ax_).+\.m4$ ## Autoconf, Automake automatically generated files ^aclocal\.m4$ ^autom4te\.cache$ ^config\.in\.h$ ^configure$ (^|/)config.cache$ (^|/)config.h$ (^|/)config.log$ (^|/)config.status$ (^|/)Makefile\.in$ ^INSTALL$ ## CMake associated files # Octave doesn't use CMake, but some IDEs use this index file to indicate # what files are part of a project (e.g., CLion). Ignore it (bug #55901). ^CMakeLists.txt$ ## Emacs associated files (^|/)TAGS$ (^|/)semantic.cache$ ## Scripts associated with building Octave ^build-aux/config\.(guess|rpath|sub)$ (^|/)build-aux/check-subst-vars\.sh$ ^build-aux/compile$ ^build-aux/depcomp$ ^build-aux/install-sh$ ^build-aux/ltmain\.sh$ ^build-aux/mdate-sh$ ^build-aux/missing$ ^build-aux/move-if-change$ (^|/)build-aux/subst-config-vals\.sh$ (^|/)build-aux/subst-cross-config-vals\.sh$ (^|/)build-aux/subst-script-vals\.sh$ ^build-aux/texinfo\.tex$ ^build-aux/ylwrap$ ## Mercurial associated files (^|/)HG-ID$ ## Timestamp files used in build process .*/\.dirstamp$ .*/\.octave-dirstamp$ ## Intermediate compilation results for libraries \.la$ .*/\.libs/ \.Plo$ \.Po$ ## DLDFCN associated files ^libinterp/dldfcn/module\.mk$ (^|/)libinterp/dldfcn/PKG_ADD$ (^|/)libinterp/dldfcn/.*\.oct$ ## liboctave/ directory associated patterns # E.g., liboctave/operators/smx-op-inc.mk ^liboctave/operators/\w+-op-\w+\.mk$ ## scripts/ directory associated patterns # Package files (^|/)scripts/.*/PKG_ADD$ # Java files (^|/)scripts/java/octave\.jar$ (^|/)scripts/java/org/octave/.*\.class$ ## libgui/ directory associated patterns # Files generated by moc tool (^|/)libgui/.*/moc-.*\.(cc|h)$ (^|/)libgui/languages/.*\.qm$ ## Ignore patterns associated with documentation # Info generated files # E.g., doc/faq/OctaveFAQ.info, doc/interpreter/octave.info-4 ^doc/\w+/\w+\.info(-\d+)?$ # Texinfo created temporary directories (^|/)doc/(interpreter|liboctave)/(octave|liboctave)\.t2(d|p)/ # Texinfo created files (^|/)doc/interpreter/.*\.texi$ # DOCSTRINGS files built in the source tree (^|/)(libinterp|scripts)/DOCSTRINGS$ # Generated HTML directories (^|/)doc/interpreter/octave\.html/ (^|/)doc/liboctave/liboctave\.html/ # Miscellaneous auto-generated files (^|/)doc/interpreter/octave\.dvi$ (^|/)doc/interpreter/octave\.ps$ (^|/)doc/interpreter/doc-cache$ (^|/)doc/interpreter/octave_interpreter\.q(ch|hc)$ # Images and scripts for documentation ^doc/interpreter/images\.mk$ (^|/)doc/interpreter/.*\.eps$ (^|/)doc/interpreter/.*\.pdf$ (^|/)doc/interpreter/.*\.png$ (^|/)doc/interpreter/.*\.txt$ # timestamps for doc directory ^doc/\w+/stamp-(vti|\d+)$ ^doc/\w+/version-\w+\.texi$ ## Test associated patterns -tst$ ^.build/*