# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1629260486 14400
# Node ID 6ea4a84df9c742db5d0ba86b7aade65b7c7f07fa
# Parent  3988112c71166989331a8957628008ea7f2a9a47
rename QtHandles namespace to octave

To simplify the codebase, replace QtHandles top-level namespace by
octave.  Since the header files for the Qt graphics code are not
installed, this change shouldn't cause trouble for any external
packages so we shouldn't need to provide an alias, even temporarily.

Modified files: 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,
qt-graphics-toolkit.cc, qt-graphics-toolkit.h, and graphics-init.cc.

diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/BaseControl.cc
--- a/libgui/graphics/BaseControl.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/BaseControl.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -39,7 +39,7 @@
 #include "graphics.h"
 #include "interpreter.h"
 
-namespace QtHandles
+namespace octave
 {
 
   static void
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/BaseControl.h
--- a/libgui/graphics/BaseControl.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/BaseControl.h	Wed Aug 18 00:21:26 2021 -0400
@@ -37,7 +37,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class BaseControl : public Object
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ButtonControl.cc
--- a/libgui/graphics/ButtonControl.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ButtonControl.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -37,7 +37,7 @@
 #include "graphics.h"
 #include "interpreter.h"
 
-namespace QtHandles
+namespace octave
 {
 
   ButtonControl::ButtonControl (octave::base_qobject& oct_qobj,
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ButtonControl.h
--- a/libgui/graphics/ButtonControl.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ButtonControl.h	Wed Aug 18 00:21:26 2021 -0400
@@ -36,7 +36,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class ButtonControl : public BaseControl
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ButtonGroup.cc
--- a/libgui/graphics/ButtonGroup.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ButtonGroup.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -51,7 +51,7 @@
 #include "interpreter.h"
 #include "oct-map.h"
 
-namespace QtHandles
+namespace octave
 {
 
   static int
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ButtonGroup.h
--- a/libgui/graphics/ButtonGroup.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ButtonGroup.h	Wed Aug 18 00:21:26 2021 -0400
@@ -40,7 +40,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class Container;
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/Canvas.cc
--- a/libgui/graphics/Canvas.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/Canvas.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -51,7 +51,7 @@
 #include "interpreter.h"
 #include "oct-opengl.h"
 
-namespace QtHandles
+namespace octave
 {
 
   void
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/Canvas.h
--- a/libgui/graphics/Canvas.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/Canvas.h	Wed Aug 18 00:21:26 2021 -0400
@@ -47,7 +47,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class Canvas : public QObject
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/CheckBoxControl.cc
--- a/libgui/graphics/CheckBoxControl.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/CheckBoxControl.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -34,7 +34,7 @@
 
 #include "octave-qobject.h"
 
-namespace QtHandles
+namespace octave
 {
 
   CheckBoxControl*
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/CheckBoxControl.h
--- a/libgui/graphics/CheckBoxControl.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/CheckBoxControl.h	Wed Aug 18 00:21:26 2021 -0400
@@ -36,7 +36,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class CheckBoxControl : public ButtonControl
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/Container.cc
--- a/libgui/graphics/Container.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/Container.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -38,7 +38,7 @@
 #include "graphics.h"
 #include "interpreter.h"
 
-namespace QtHandles
+namespace octave
 {
 
   Container::Container (QWidget *xparent, octave::base_qobject& oct_qobj,
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/Container.h
--- a/libgui/graphics/Container.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/Container.h	Wed Aug 18 00:21:26 2021 -0400
@@ -38,7 +38,7 @@
   class base_qobject;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   DECLARE_GENERICEVENTNOTIFY_SENDER(ContainerBase, QWidget);
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ContextMenu.cc
--- a/libgui/graphics/ContextMenu.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ContextMenu.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -37,7 +37,7 @@
 
 #include "interpreter.h"
 
-namespace QtHandles
+namespace octave
 {
 
   ContextMenu*
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ContextMenu.h
--- a/libgui/graphics/ContextMenu.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ContextMenu.h	Wed Aug 18 00:21:26 2021 -0400
@@ -39,7 +39,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class ContextMenu : public Object, public MenuContainer
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/EditControl.cc
--- a/libgui/graphics/EditControl.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/EditControl.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -36,7 +36,7 @@
 
 #include "octave-qobject.h"
 
-namespace QtHandles
+namespace octave
 {
 
   EditControl*
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/EditControl.h
--- a/libgui/graphics/EditControl.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/EditControl.h	Wed Aug 18 00:21:26 2021 -0400
@@ -37,7 +37,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class TextEdit;
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/Figure.cc
--- a/libgui/graphics/Figure.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/Figure.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -65,7 +65,7 @@
 #include "builtin-defun-decls.h"
 #include "interpreter.h"
 
-namespace QtHandles
+namespace octave
 {
 
   DECLARE_GENERICEVENTNOTIFY_SENDER(MenuBar, QMenuBar);
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/Figure.h
--- a/libgui/graphics/Figure.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/Figure.h	Wed Aug 18 00:21:26 2021 -0400
@@ -43,7 +43,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   enum MouseMode
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/FigureWindow.cc
--- a/libgui/graphics/FigureWindow.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/FigureWindow.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -31,7 +31,7 @@
 
 #include "FigureWindow.h"
 
-namespace QtHandles
+namespace octave
 {
 
   FigureWindow::FigureWindow (QWidget *xparent)
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/FigureWindow.h
--- a/libgui/graphics/FigureWindow.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/FigureWindow.h	Wed Aug 18 00:21:26 2021 -0400
@@ -30,7 +30,7 @@
 
 #include "GenericEventNotify.h"
 
-namespace QtHandles
+namespace octave
 {
 
   DECLARE_GENERICEVENTNOTIFY_SENDER(FigureWindowBase, QMainWindow);
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/GLCanvas.cc
--- a/libgui/graphics/GLCanvas.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/GLCanvas.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -35,7 +35,7 @@
 #include "graphics.h"
 #include "interpreter.h"
 
-namespace QtHandles
+namespace octave
 {
 #if defined (HAVE_QOPENGLWIDGET)
 #  define OCTAVE_QT_OPENGL_WIDGET_FORMAT_ARGS
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/GLCanvas.h
--- a/libgui/graphics/GLCanvas.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/GLCanvas.h	Wed Aug 18 00:21:26 2021 -0400
@@ -54,7 +54,7 @@
   class base_qobject;
 }
 
-namespace QtHandles
+namespace octave
 {
   class GLCanvas : public OCTAVE_QT_OPENGL_WIDGET, public Canvas
   {
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/GenericEventNotify.h
--- a/libgui/graphics/GenericEventNotify.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/GenericEventNotify.h	Wed Aug 18 00:21:26 2021 -0400
@@ -32,7 +32,7 @@
 class QObject;
 class QWidget;
 
-namespace QtHandles
+namespace octave
 {
 
   class GenericEventNotifyReceiver;
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/KeyMap.cc
--- a/libgui/graphics/KeyMap.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/KeyMap.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -32,7 +32,7 @@
 
 #include "KeyMap.h"
 
-namespace QtHandles
+namespace octave
 {
   namespace KeyMap
   {
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/KeyMap.h
--- a/libgui/graphics/KeyMap.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/KeyMap.h	Wed Aug 18 00:21:26 2021 -0400
@@ -28,7 +28,7 @@
 
 #include <string>
 
-namespace QtHandles
+namespace octave
 {
 
   namespace KeyMap
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ListBoxControl.cc
--- a/libgui/graphics/ListBoxControl.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ListBoxControl.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -37,7 +37,7 @@
 
 #include "octave-qobject.h"
 
-namespace QtHandles
+namespace octave
 {
 
   static void
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ListBoxControl.h
--- a/libgui/graphics/ListBoxControl.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ListBoxControl.h	Wed Aug 18 00:21:26 2021 -0400
@@ -38,7 +38,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class ListBoxControl : public BaseControl
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/Logger.cc
--- a/libgui/graphics/Logger.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/Logger.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -35,7 +35,7 @@
 
 #include "Logger.h"
 
-namespace QtHandles
+namespace octave
 {
 
   Logger *Logger::s_instance = nullptr;
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/Logger.h
--- a/libgui/graphics/Logger.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/Logger.h	Wed Aug 18 00:21:26 2021 -0400
@@ -30,7 +30,7 @@
 
 class QMutex;
 
-namespace QtHandles
+namespace octave
 {
 
   class Logger
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/Menu.cc
--- a/libgui/graphics/Menu.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/Menu.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -38,7 +38,7 @@
 
 #include "octave-qobject.h"
 
-namespace QtHandles
+namespace octave
 {
 
   static QKeySequence
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/Menu.h
--- a/libgui/graphics/Menu.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/Menu.h	Wed Aug 18 00:21:26 2021 -0400
@@ -39,7 +39,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class Menu : public Object, public MenuContainer
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/MenuContainer.h
--- a/libgui/graphics/MenuContainer.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/MenuContainer.h	Wed Aug 18 00:21:26 2021 -0400
@@ -28,7 +28,7 @@
 
 class QWidget;
 
-namespace QtHandles
+namespace octave
 {
 
   class MenuContainer
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/Object.cc
--- a/libgui/graphics/Object.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/Object.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -38,7 +38,7 @@
 #include "graphics.h"
 #include "interpreter.h"
 
-namespace QtHandles
+namespace octave
 {
 
   Object::Object (octave::base_qobject& oct_qobj, octave::interpreter& interp,
@@ -51,7 +51,7 @@
     octave::autolock guard (gh_mgr.graphics_lock ());
 
     if (! guard)
-      qCritical ("QtHandles::Object::Object: "
+      qCritical ("octave::Object::Object: "
                  "creating Object (h=%g) without a valid lock!!!",
                  m_handle.value ());
 
@@ -62,14 +62,14 @@
   Object::init (QObject *obj, bool)
   {
     if (m_qobject)
-      qCritical ("QtHandles::Object::init: "
+      qCritical ("octave::Object::init: "
                  "resetting QObject while in invalid state");
 
     m_qobject = obj;
 
     if (m_qobject)
       {
-        m_qobject->setProperty ("QtHandles::Object",
+        m_qobject->setProperty ("octave::Object",
                                 QVariant::fromValue<void*> (this));
         connect (m_qobject, &QObject::destroyed,
                  this, &Object::objectDestroyed);
@@ -87,7 +87,7 @@
     octave::autolock guard (gh_mgr.graphics_lock (), false);
 
     if (! guard)
-      qCritical ("QtHandles::Object::object: "
+      qCritical ("octave::Object::object: "
                  "accessing graphics object (h=%g) without a valid lock!!!",
                  m_handle.value ());
 
@@ -213,7 +213,7 @@
   Object*
   Object::fromQObject (QObject *obj)
   {
-    QVariant v = obj->property ("QtHandles::Object");
+    QVariant v = obj->property ("octave::Object");
 
     if (v.isValid ())
       return reinterpret_cast<Object *> (qvariant_cast<void*> (v));
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/Object.h
--- a/libgui/graphics/Object.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/Object.h	Wed Aug 18 00:21:26 2021 -0400
@@ -41,7 +41,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class Container;
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ObjectProxy.cc
--- a/libgui/graphics/ObjectProxy.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ObjectProxy.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -37,7 +37,7 @@
 #include "oct-mutex.h"
 #include "utils.h"
 
-namespace QtHandles
+namespace octave
 {
 
   ObjectProxy::ObjectProxy (Object *obj)
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ObjectProxy.h
--- a/libgui/graphics/ObjectProxy.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ObjectProxy.h	Wed Aug 18 00:21:26 2021 -0400
@@ -32,7 +32,7 @@
 
 class QString;
 
-namespace QtHandles
+namespace octave
 {
 
   class Object;
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/Panel.cc
--- a/libgui/graphics/Panel.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/Panel.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -44,7 +44,7 @@
 #include "graphics.h"
 #include "interpreter.h"
 
-namespace QtHandles
+namespace octave
 {
 
   static int
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/Panel.h
--- a/libgui/graphics/Panel.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/Panel.h	Wed Aug 18 00:21:26 2021 -0400
@@ -37,7 +37,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class Container;
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/PopupMenuControl.cc
--- a/libgui/graphics/PopupMenuControl.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/PopupMenuControl.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -36,7 +36,7 @@
 #include "octave-qobject.h"
 #include "octave-qtutils.h"
 
-namespace QtHandles
+namespace octave
 {
 
   PopupMenuControl*
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/PopupMenuControl.h
--- a/libgui/graphics/PopupMenuControl.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/PopupMenuControl.h	Wed Aug 18 00:21:26 2021 -0400
@@ -36,7 +36,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class PopupMenuControl : public BaseControl
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/PushButtonControl.cc
--- a/libgui/graphics/PushButtonControl.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/PushButtonControl.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -36,7 +36,7 @@
 
 #include "octave-qobject.h"
 
-namespace QtHandles
+namespace octave
 {
 
   PushButtonControl*
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/PushButtonControl.h
--- a/libgui/graphics/PushButtonControl.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/PushButtonControl.h	Wed Aug 18 00:21:26 2021 -0400
@@ -36,7 +36,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class PushButtonControl : public ButtonControl
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/PushTool.cc
--- a/libgui/graphics/PushTool.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/PushTool.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -33,7 +33,7 @@
 
 #include "octave-qobject.h"
 
-namespace QtHandles
+namespace octave
 {
 
   PushTool*
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/PushTool.h
--- a/libgui/graphics/PushTool.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/PushTool.h	Wed Aug 18 00:21:26 2021 -0400
@@ -34,7 +34,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class PushTool : public ToolBarButton<uipushtool>
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/QtHandlesUtils.cc
--- a/libgui/graphics/QtHandlesUtils.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/QtHandlesUtils.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -44,7 +44,7 @@
 #include "graphics.h"
 #include "ov.h"
 
-namespace QtHandles
+namespace octave
 {
 
   namespace Utils
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/QtHandlesUtils.h
--- a/libgui/graphics/QtHandlesUtils.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/QtHandlesUtils.h	Wed Aug 18 00:21:26 2021 -0400
@@ -40,7 +40,7 @@
 class QMouseEvent;
 class QWheelEvent;
 
-namespace QtHandles
+namespace octave
 {
 
   namespace Utils
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/RadioButtonControl.cc
--- a/libgui/graphics/RadioButtonControl.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/RadioButtonControl.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -36,7 +36,7 @@
 
 #include "octave-qobject.h"
 
-namespace QtHandles
+namespace octave
 {
 
   RadioButtonControl*
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/RadioButtonControl.h
--- a/libgui/graphics/RadioButtonControl.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/RadioButtonControl.h	Wed Aug 18 00:21:26 2021 -0400
@@ -36,7 +36,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class RadioButtonControl : public ButtonControl
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/SliderControl.cc
--- a/libgui/graphics/SliderControl.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/SliderControl.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -40,7 +40,7 @@
 
 #define RANGE_INT_MAX 1000000
 
-namespace QtHandles
+namespace octave
 {
 
   SliderControl*
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/SliderControl.h
--- a/libgui/graphics/SliderControl.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/SliderControl.h	Wed Aug 18 00:21:26 2021 -0400
@@ -36,7 +36,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class SliderControl : public BaseControl
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/Table.cc
--- a/libgui/graphics/Table.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/Table.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -57,7 +57,7 @@
 #include "oct-string.h"
 #include "oct-strstrm.h"
 
-namespace QtHandles
+namespace octave
 {
 
   static const int AUTO_WIDTH = 75;
@@ -198,7 +198,7 @@
     QString text;
     if (val.is_string ())
       {
-        text = QtHandles::Utils::fromStdString (val.string_value ());
+        text = octave::Utils::fromStdString (val.string_value ());
         flag = Qt::AlignLeft ;
       }
     else if (val.iscomplex ())
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/Table.h
--- a/libgui/graphics/Table.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/Table.h	Wed Aug 18 00:21:26 2021 -0400
@@ -38,7 +38,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class Container;
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/TextControl.cc
--- a/libgui/graphics/TextControl.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/TextControl.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -35,7 +35,7 @@
 
 #include "octave-qobject.h"
 
-namespace QtHandles
+namespace octave
 {
 
   TextControl*
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/TextControl.h
--- a/libgui/graphics/TextControl.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/TextControl.h	Wed Aug 18 00:21:26 2021 -0400
@@ -36,7 +36,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class TextControl : public BaseControl
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/TextEdit.cc
--- a/libgui/graphics/TextEdit.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/TextEdit.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -31,7 +31,7 @@
 
 #include "TextEdit.h"
 
-namespace QtHandles
+namespace octave
 {
 
   void
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/TextEdit.h
--- a/libgui/graphics/TextEdit.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/TextEdit.h	Wed Aug 18 00:21:26 2021 -0400
@@ -28,7 +28,7 @@
 
 #include <QTextEdit>
 
-namespace QtHandles
+namespace octave
 {
 
   class TextEdit : public QTextEdit
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ToggleButtonControl.cc
--- a/libgui/graphics/ToggleButtonControl.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ToggleButtonControl.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -36,7 +36,7 @@
 
 #include "octave-qobject.h"
 
-namespace QtHandles
+namespace octave
 {
 
   ToggleButtonControl*
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ToggleButtonControl.h
--- a/libgui/graphics/ToggleButtonControl.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ToggleButtonControl.h	Wed Aug 18 00:21:26 2021 -0400
@@ -36,7 +36,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class ToggleButtonControl : public ButtonControl
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ToggleTool.cc
--- a/libgui/graphics/ToggleTool.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ToggleTool.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -33,7 +33,7 @@
 
 #include "octave-qobject.h"
 
-namespace QtHandles
+namespace octave
 {
 
   ToggleTool*
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ToggleTool.h
--- a/libgui/graphics/ToggleTool.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ToggleTool.h	Wed Aug 18 00:21:26 2021 -0400
@@ -34,7 +34,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class ToggleTool : public ToolBarButton<uitoggletool>
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ToolBar.cc
--- a/libgui/graphics/ToolBar.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ToolBar.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -44,7 +44,7 @@
 #include "gui-preferences-global.h"
 #include "octave-qobject.h"
 
-namespace QtHandles
+namespace octave
 {
   static QIcon makeEmptyIcon (void)
   {
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ToolBar.h
--- a/libgui/graphics/ToolBar.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ToolBar.h	Wed Aug 18 00:21:26 2021 -0400
@@ -37,7 +37,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class Figure;
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ToolBarButton.cc
--- a/libgui/graphics/ToolBarButton.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ToolBarButton.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -35,7 +35,7 @@
 #include "QtHandlesUtils.h"
 #include "octave-qobject.h"
 
-namespace QtHandles
+namespace octave
 {
   template <typename T>
   ToolBarButton<T>::ToolBarButton (octave::base_qobject& oct_qobj,
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/ToolBarButton.h
--- a/libgui/graphics/ToolBarButton.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/ToolBarButton.h	Wed Aug 18 00:21:26 2021 -0400
@@ -37,7 +37,7 @@
   class interpreter;
 }
 
-namespace QtHandles
+namespace octave
 {
 
   class Container;
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/annotation-dialog.cc
--- a/libgui/graphics/annotation-dialog.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/annotation-dialog.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -39,7 +39,7 @@
 #include "annotation-dialog.h"
 #include "ui-annotation-dialog.h"
 
-using namespace QtHandles;
+using namespace octave;
 
 annotation_dialog::annotation_dialog (octave::base_qobject& oct_qobj,
                                       QWidget *p, const octave_value_list& pr):
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/qt-graphics-toolkit.cc
--- a/libgui/graphics/qt-graphics-toolkit.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/qt-graphics-toolkit.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -73,7 +73,7 @@
 # define OCTAVE_PTR_SCALAR uint64_scalar_value
 //#endif
 
-namespace QtHandles
+namespace octave
 {
 
   static std::string
@@ -92,7 +92,7 @@
              || go.isa ("uitoggletool"))
       return "__object__";
     else
-      qCritical ("QtHandles::qt_graphics_toolkit: no __object__ property known for object "
+      qCritical ("octave::qt_graphics_toolkit: no __object__ property known for object "
                  "of type %s", go.type ().c_str ());
 
     return "";
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/graphics/qt-graphics-toolkit.h
--- a/libgui/graphics/qt-graphics-toolkit.h	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/graphics/qt-graphics-toolkit.h	Wed Aug 18 00:21:26 2021 -0400
@@ -37,7 +37,7 @@
   class base_qobject;
 }
 
-namespace QtHandles
+namespace octave
 {
   class Object;
   class ObjectProxy;
diff -r 3988112c7116 -r 6ea4a84df9c7 libgui/src/graphics-init.cc
--- a/libgui/src/graphics-init.cc	Tue Aug 17 11:17:36 2021 -0400
+++ b/libgui/src/graphics-init.cc	Wed Aug 18 00:21:26 2021 -0400
@@ -54,8 +54,7 @@
 
     gh_mgr.enable_event_processing (true);
 
-    QtHandles::qt_graphics_toolkit *qt_gtk
-      = new QtHandles::qt_graphics_toolkit (interp, oct_qobj);
+    qt_graphics_toolkit *qt_gtk = new qt_graphics_toolkit (interp, oct_qobj);
 
     if (QThread::currentThread ()
         != QApplication::instance ()->thread ())