# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1670354601 18000
# Node ID 9089bd969b370f8613112bc58a0b32d6faa7fd79
# Parent  670f3f17c280c1bc54ac08e2b9d439d1466a9951
merge adjacent octave namespace blocks in libgui/graphics header files

* BaseControl.h, ButtonControl.h, ButtonGroup.h, Canvas.h,
CheckBoxControl.h, ContextMenu.h, EditControl.h, Figure.h, GLCanvas.h,
ListBoxControl.h, Menu.h, Object.h, Panel.h, PopupMenuControl.h,
PushButtonControl.h, PushTool.h, RadioButtonControl.h,
SliderControl.h, Table.h, TextControl.h, ToggleButtonControl.h,
ToggleTool.h, ToolBar.h, ToolBarButton.h, qt-graphics-toolkit.h:
Merge adjacent octave namespace blocks.

diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/BaseControl.h
--- a/libgui/graphics/BaseControl.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/BaseControl.h	Tue Dec 06 14:23:21 2022 -0500
@@ -35,10 +35,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class BaseControl : public Object
   {
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/ButtonControl.h
--- a/libgui/graphics/ButtonControl.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/ButtonControl.h	Tue Dec 06 14:23:21 2022 -0500
@@ -34,10 +34,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class ButtonControl : public BaseControl
   {
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/ButtonGroup.h
--- a/libgui/graphics/ButtonGroup.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/ButtonGroup.h	Tue Dec 06 14:23:21 2022 -0500
@@ -38,10 +38,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class Container;
 
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/Canvas.h
--- a/libgui/graphics/Canvas.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/Canvas.h	Tue Dec 06 14:23:21 2022 -0500
@@ -45,10 +45,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class Canvas : public QObject
   {
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/CheckBoxControl.h
--- a/libgui/graphics/CheckBoxControl.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/CheckBoxControl.h	Tue Dec 06 14:23:21 2022 -0500
@@ -34,10 +34,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class CheckBoxControl : public ButtonControl
   {
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/ContextMenu.h
--- a/libgui/graphics/ContextMenu.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/ContextMenu.h	Tue Dec 06 14:23:21 2022 -0500
@@ -37,10 +37,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class ContextMenu : public Object, public MenuContainer
   {
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/EditControl.h
--- a/libgui/graphics/EditControl.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/EditControl.h	Tue Dec 06 14:23:21 2022 -0500
@@ -35,10 +35,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class TextEdit;
 
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/Figure.h
--- a/libgui/graphics/Figure.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/Figure.h	Tue Dec 06 14:23:21 2022 -0500
@@ -41,10 +41,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   enum MouseMode
   {
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/ListBoxControl.h
--- a/libgui/graphics/ListBoxControl.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/ListBoxControl.h	Tue Dec 06 14:23:21 2022 -0500
@@ -36,10 +36,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class ListBoxControl : public BaseControl
   {
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/Menu.h
--- a/libgui/graphics/Menu.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/Menu.h	Tue Dec 06 14:23:21 2022 -0500
@@ -37,10 +37,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class Menu : public Object, public MenuContainer
   {
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/Object.h
--- a/libgui/graphics/Object.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/Object.h	Tue Dec 06 14:23:21 2022 -0500
@@ -39,10 +39,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class Container;
   class ObjectProxy;
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/Panel.h
--- a/libgui/graphics/Panel.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/Panel.h	Tue Dec 06 14:23:21 2022 -0500
@@ -35,10 +35,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class Container;
 
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/PopupMenuControl.h
--- a/libgui/graphics/PopupMenuControl.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/PopupMenuControl.h	Tue Dec 06 14:23:21 2022 -0500
@@ -34,10 +34,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class PopupMenuControl : public BaseControl
   {
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/PushButtonControl.h
--- a/libgui/graphics/PushButtonControl.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/PushButtonControl.h	Tue Dec 06 14:23:21 2022 -0500
@@ -34,10 +34,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class PushButtonControl : public ButtonControl
   {
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/PushTool.h
--- a/libgui/graphics/PushTool.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/PushTool.h	Tue Dec 06 14:23:21 2022 -0500
@@ -32,10 +32,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class PushTool : public ToolBarButton<uipushtool>
   {
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/RadioButtonControl.h
--- a/libgui/graphics/RadioButtonControl.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/RadioButtonControl.h	Tue Dec 06 14:23:21 2022 -0500
@@ -34,10 +34,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class RadioButtonControl : public ButtonControl
   {
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/SliderControl.h
--- a/libgui/graphics/SliderControl.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/SliderControl.h	Tue Dec 06 14:23:21 2022 -0500
@@ -34,10 +34,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class SliderControl : public BaseControl
   {
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/Table.h
--- a/libgui/graphics/Table.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/Table.h	Tue Dec 06 14:23:21 2022 -0500
@@ -36,10 +36,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class Container;
 
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/TextControl.h
--- a/libgui/graphics/TextControl.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/TextControl.h	Tue Dec 06 14:23:21 2022 -0500
@@ -34,10 +34,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class TextControl : public BaseControl
   {
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/ToggleButtonControl.h
--- a/libgui/graphics/ToggleButtonControl.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/ToggleButtonControl.h	Tue Dec 06 14:23:21 2022 -0500
@@ -34,10 +34,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class ToggleButtonControl : public ButtonControl
   {
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/ToggleTool.h
--- a/libgui/graphics/ToggleTool.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/ToggleTool.h	Tue Dec 06 14:23:21 2022 -0500
@@ -32,10 +32,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class ToggleTool : public ToolBarButton<uitoggletool>
   {
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/ToolBar.h
--- a/libgui/graphics/ToolBar.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/ToolBar.h	Tue Dec 06 14:23:21 2022 -0500
@@ -35,10 +35,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class Figure;
 
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/ToolBarButton.h
--- a/libgui/graphics/ToolBarButton.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/ToolBarButton.h	Tue Dec 06 14:23:21 2022 -0500
@@ -35,10 +35,6 @@
 {
   class base_qobject;
   class interpreter;
-}
-
-namespace octave
-{
 
   class Container;
 
diff -r 670f3f17c280 -r 9089bd969b37 libgui/graphics/qt-graphics-toolkit.h
--- a/libgui/graphics/qt-graphics-toolkit.h	Tue Dec 06 14:19:16 2022 -0500
+++ b/libgui/graphics/qt-graphics-toolkit.h	Tue Dec 06 14:23:21 2022 -0500
@@ -35,10 +35,7 @@
 {
   class interpreter;
   class base_qobject;
-}
 
-namespace octave
-{
   class Object;
   class ObjectProxy;