# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1670357836 18000
# Node ID bd9da634f00d44e43c9725f1f770cf039447652d
# Parent  91680d96c860f33873d39586ef25718e054c5ca2# Parent  9089bd969b370f8613112bc58a0b32d6faa7fd79
maint: Merge stable to default.

diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/BaseControl.h
--- a/libgui/graphics/BaseControl.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/BaseControl.h	Tue Dec 06 15:17:16 2022 -0500
@@ -34,10 +34,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class BaseControl : public Object
   {
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/ButtonControl.h
--- a/libgui/graphics/ButtonControl.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/ButtonControl.h	Tue Dec 06 15:17:16 2022 -0500
@@ -33,10 +33,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class ButtonControl : public BaseControl
   {
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/ButtonGroup.h
--- a/libgui/graphics/ButtonGroup.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/ButtonGroup.h	Tue Dec 06 15:17:16 2022 -0500
@@ -37,10 +37,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class Container;
 
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/Canvas.h
--- a/libgui/graphics/Canvas.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/Canvas.h	Tue Dec 06 15:17:16 2022 -0500
@@ -44,10 +44,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class Canvas : public QObject
   {
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/CheckBoxControl.h
--- a/libgui/graphics/CheckBoxControl.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/CheckBoxControl.h	Tue Dec 06 15:17:16 2022 -0500
@@ -33,10 +33,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class CheckBoxControl : public ButtonControl
   {
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/ContextMenu.h
--- a/libgui/graphics/ContextMenu.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/ContextMenu.h	Tue Dec 06 15:17:16 2022 -0500
@@ -36,10 +36,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class ContextMenu : public Object, public MenuContainer
   {
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/EditControl.h
--- a/libgui/graphics/EditControl.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/EditControl.h	Tue Dec 06 15:17:16 2022 -0500
@@ -34,10 +34,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class TextEdit;
 
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/Figure.h
--- a/libgui/graphics/Figure.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/Figure.h	Tue Dec 06 15:17:16 2022 -0500
@@ -40,10 +40,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   enum MouseMode
   {
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/ListBoxControl.h
--- a/libgui/graphics/ListBoxControl.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/ListBoxControl.h	Tue Dec 06 15:17:16 2022 -0500
@@ -35,10 +35,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class ListBoxControl : public BaseControl
   {
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/Menu.h
--- a/libgui/graphics/Menu.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/Menu.h	Tue Dec 06 15:17:16 2022 -0500
@@ -36,10 +36,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class Menu : public Object, public MenuContainer
   {
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/Object.h
--- a/libgui/graphics/Object.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/Object.h	Tue Dec 06 15:17:16 2022 -0500
@@ -38,10 +38,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class Container;
   class ObjectProxy;
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/Panel.h
--- a/libgui/graphics/Panel.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/Panel.h	Tue Dec 06 15:17:16 2022 -0500
@@ -34,10 +34,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class Container;
 
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/PopupMenuControl.h
--- a/libgui/graphics/PopupMenuControl.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/PopupMenuControl.h	Tue Dec 06 15:17:16 2022 -0500
@@ -33,10 +33,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class PopupMenuControl : public BaseControl
   {
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/PushButtonControl.h
--- a/libgui/graphics/PushButtonControl.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/PushButtonControl.h	Tue Dec 06 15:17:16 2022 -0500
@@ -33,10 +33,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class PushButtonControl : public ButtonControl
   {
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/PushTool.h
--- a/libgui/graphics/PushTool.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/PushTool.h	Tue Dec 06 15:17:16 2022 -0500
@@ -31,10 +31,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class PushTool : public ToolBarButton<uipushtool>
   {
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/RadioButtonControl.h
--- a/libgui/graphics/RadioButtonControl.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/RadioButtonControl.h	Tue Dec 06 15:17:16 2022 -0500
@@ -33,10 +33,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class RadioButtonControl : public ButtonControl
   {
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/SliderControl.h
--- a/libgui/graphics/SliderControl.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/SliderControl.h	Tue Dec 06 15:17:16 2022 -0500
@@ -33,10 +33,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class SliderControl : public BaseControl
   {
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/Table.h
--- a/libgui/graphics/Table.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/Table.h	Tue Dec 06 15:17:16 2022 -0500
@@ -35,10 +35,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class Container;
 
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/TextControl.h
--- a/libgui/graphics/TextControl.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/TextControl.h	Tue Dec 06 15:17:16 2022 -0500
@@ -33,10 +33,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class TextControl : public BaseControl
   {
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/ToggleButtonControl.h
--- a/libgui/graphics/ToggleButtonControl.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/ToggleButtonControl.h	Tue Dec 06 15:17:16 2022 -0500
@@ -33,10 +33,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class ToggleButtonControl : public ButtonControl
   {
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/ToggleTool.h
--- a/libgui/graphics/ToggleTool.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/ToggleTool.h	Tue Dec 06 15:17:16 2022 -0500
@@ -31,10 +31,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class ToggleTool : public ToolBarButton<uitoggletool>
   {
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/ToolBar.h
--- a/libgui/graphics/ToolBar.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/ToolBar.h	Tue Dec 06 15:17:16 2022 -0500
@@ -34,10 +34,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class Figure;
 
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/ToolBarButton.h
--- a/libgui/graphics/ToolBarButton.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/ToolBarButton.h	Tue Dec 06 15:17:16 2022 -0500
@@ -34,10 +34,6 @@
 namespace octave
 {
   class interpreter;
-}
-
-namespace octave
-{
 
   class Container;
 
diff -r 91680d96c860 -r bd9da634f00d libgui/graphics/qt-graphics-toolkit.h
--- a/libgui/graphics/qt-graphics-toolkit.h	Tue Dec 06 15:16:16 2022 -0500
+++ b/libgui/graphics/qt-graphics-toolkit.h	Tue Dec 06 15:17:16 2022 -0500
@@ -34,10 +34,7 @@
 namespace octave
 {
   class interpreter;
-}
 
-namespace octave
-{
   class Object;
   class ObjectProxy;