changeset 31644:9089bd969b37 stable

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.
author John W. Eaton <jwe@octave.org>
date Tue, 06 Dec 2022 14:23:21 -0500
parents 670f3f17c280
children bd9da634f00d c6d54dd31a7e
files libgui/graphics/BaseControl.h libgui/graphics/ButtonControl.h libgui/graphics/ButtonGroup.h libgui/graphics/Canvas.h libgui/graphics/CheckBoxControl.h libgui/graphics/ContextMenu.h libgui/graphics/EditControl.h libgui/graphics/Figure.h libgui/graphics/ListBoxControl.h libgui/graphics/Menu.h libgui/graphics/Object.h libgui/graphics/Panel.h libgui/graphics/PopupMenuControl.h libgui/graphics/PushButtonControl.h libgui/graphics/PushTool.h libgui/graphics/RadioButtonControl.h libgui/graphics/SliderControl.h libgui/graphics/Table.h libgui/graphics/TextControl.h libgui/graphics/ToggleButtonControl.h libgui/graphics/ToggleTool.h libgui/graphics/ToolBar.h libgui/graphics/ToolBarButton.h libgui/graphics/qt-graphics-toolkit.h
diffstat 24 files changed, 0 insertions(+), 95 deletions(-) [+]
line wrap: on
line diff
--- 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
   {
--- 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
   {
--- 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;
 
--- 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
   {
--- 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
   {
--- 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
   {
--- 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;
 
--- 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
   {
--- 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
   {
--- 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
   {
--- 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;
--- 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;
 
--- 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
   {
--- 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
   {
--- 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>
   {
--- 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
   {
--- 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
   {
--- 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;
 
--- 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
   {
--- 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
   {
--- 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>
   {
--- 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;
 
--- 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;
 
--- 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;