comparison libgui/src/gui-utils.cc @ 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 e2c8c852399e
children 29d734430e5f
comparison
equal deleted inserted replaced
31644:9089bd969b37 31646:c6d54dd31a7e
31 #include <QRect> 31 #include <QRect>
32 #include <QScreen> 32 #include <QScreen>
33 33
34 #include "gui-utils.h" 34 #include "gui-utils.h"
35 35
36 namespace octave 36 OCTAVE_BEGIN_NAMESPACE(octave)
37 { 37
38 OCTGUI_API QColor 38 OCTGUI_API QColor
39 interpolate_color (const QColor& col1, const QColor& col2, 39 interpolate_color (const QColor& col1, const QColor& col2,
40 double fs, double fv) 40 double fs, double fv)
41 { 41 {
42 qreal h1, s1, v1, h2, s2, v2; 42 qreal h1, s1, v1, h2, s2, v2;
53 QRect geom = QGuiApplication::primaryScreen ()->availableGeometry (); 53 QRect geom = QGuiApplication::primaryScreen ()->availableGeometry ();
54 54
55 width = geom.width (); 55 width = geom.width ();
56 height = geom.height (); 56 height = geom.height ();
57 } 57 }
58
59 58
60 OCTGUI_API void 59 OCTGUI_API void
61 adjust_to_screen (QRect& actual_geometry, const QRect& default_geometry) 60 adjust_to_screen (QRect& actual_geometry, const QRect& default_geometry)
62 { 61 {
63 62
120 // led to corners outside the screen 119 // led to corners outside the screen
121 actual_geometry = actual_screen_geom.intersected ( 120 actual_geometry = actual_screen_geom.intersected (
122 QRect (QPoint (isx1,isy1), QPoint (isx2,isy2))); 121 QRect (QPoint (isx1,isy1), QPoint (isx2,isy2)));
123 } 122 }
124 123
125 } 124 OCTAVE_END_NAMESPACE(octave)