Mercurial > octave
comparison libgui/graphics/GLCanvas.h @ 31646:c6d54dd31a7e stable
maint: Use macros to begin/end C++ namespaces.
* 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, KeyMap.h,
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, QtHandlesUtils.cc, QtHandlesUtils.h,
RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc,
SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h,
TextEdit.cc, TextEdit.h, ToggleButtonControl.cc,
ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc,
ToolBar.h, ToolBarButton.cc, ToolBarButton.h, annotation-dialog.cc,
annotation-dialog.h, gl-select.cc, gl-select.h, qopengl-functions.h,
qt-graphics-toolkit.cc, qt-graphics-toolkit.h, QTerminal.h,
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, graphics-init.cc,
graphics-init.h, gui-settings.cc, gui-settings.h, gui-utils.cc,
gui-utils.h, history-dock-widget.cc, history-dock-widget.h,
interpreter-qobject.cc, interpreter-qobject.h, led-indicator.cc,
led-indicator.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, qt-utils.h,
release-notes.cc, release-notes.h, resource-manager.cc,
resource-manager.h, set-path-dialog.cc, set-path-dialog.h,
set-path-model.cc, set-path-model.h, settings-dialog.cc,
settings-dialog.h, shortcut-manager.cc, shortcut-manager.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:
Use new macros to begin/end C++ namespaces.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 06 Dec 2022 14:37:51 -0500 |
parents | 796f54d4ddbf |
children | 431f80aba37a 29d734430e5f |
comparison
equal
deleted
inserted
replaced
31644:9089bd969b37 | 31646:c6d54dd31a7e |
---|---|
47 #include "Canvas.h" | 47 #include "Canvas.h" |
48 | 48 |
49 #include "gl-render.h" | 49 #include "gl-render.h" |
50 #include "qopengl-functions.h" | 50 #include "qopengl-functions.h" |
51 | 51 |
52 namespace octave | 52 OCTAVE_BEGIN_NAMESPACE(octave) |
53 { | 53 |
54 class base_qobject; | 54 class base_qobject; |
55 } | 55 } |
56 | 56 |
57 namespace octave | 57 OCTAVE_BEGIN_NAMESPACE(octave) |
58 { | 58 |
59 class GLCanvas : public OCTAVE_QT_OPENGL_WIDGET, public Canvas | 59 class GLCanvas : public OCTAVE_QT_OPENGL_WIDGET, public Canvas |
60 { | 60 { |
61 public: | 61 public: |
62 GLCanvas (octave::base_qobject& oct_qobj, octave::interpreter& interp, | 62 GLCanvas (octave::base_qobject& oct_qobj, octave::interpreter& interp, |
63 const graphics_handle& handle, QWidget *parent); | 63 const graphics_handle& handle, QWidget *parent); |
98 QOpenGLContext m_os_context; | 98 QOpenGLContext m_os_context; |
99 QOffscreenSurface m_os_surface; | 99 QOffscreenSurface m_os_surface; |
100 # endif | 100 # endif |
101 }; | 101 }; |
102 | 102 |
103 } | 103 OCTAVE_END_NAMESPACE(octave) |
104 | 104 |
105 #endif | 105 #endif |