Mercurial > octave

changeset 29992:6ea4a84df9c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author John W. Eaton <jwe@octave.org>
date Wed, 18 Aug 2021 00:21:26 -0400
parents 3988112c7116
children b5fae48ad807
files libgui/graphics/BaseControl.cc libgui/graphics/BaseControl.h libgui/graphics/ButtonControl.cc libgui/graphics/ButtonControl.h libgui/graphics/ButtonGroup.cc libgui/graphics/ButtonGroup.h libgui/graphics/Canvas.cc libgui/graphics/Canvas.h libgui/graphics/CheckBoxControl.cc libgui/graphics/CheckBoxControl.h libgui/graphics/Container.cc libgui/graphics/Container.h libgui/graphics/ContextMenu.cc libgui/graphics/ContextMenu.h libgui/graphics/EditControl.cc libgui/graphics/EditControl.h libgui/graphics/Figure.cc libgui/graphics/Figure.h libgui/graphics/FigureWindow.cc libgui/graphics/FigureWindow.h libgui/graphics/GLCanvas.cc libgui/graphics/GLCanvas.h libgui/graphics/GenericEventNotify.h libgui/graphics/KeyMap.cc libgui/graphics/KeyMap.h libgui/graphics/ListBoxControl.cc libgui/graphics/ListBoxControl.h libgui/graphics/Logger.cc libgui/graphics/Logger.h libgui/graphics/Menu.cc libgui/graphics/Menu.h libgui/graphics/MenuContainer.h libgui/graphics/Object.cc libgui/graphics/Object.h libgui/graphics/ObjectProxy.cc libgui/graphics/ObjectProxy.h libgui/graphics/Panel.cc libgui/graphics/Panel.h libgui/graphics/PopupMenuControl.cc libgui/graphics/PopupMenuControl.h libgui/graphics/PushButtonControl.cc libgui/graphics/PushButtonControl.h libgui/graphics/PushTool.cc libgui/graphics/PushTool.h libgui/graphics/QtHandlesUtils.cc libgui/graphics/QtHandlesUtils.h libgui/graphics/RadioButtonControl.cc libgui/graphics/RadioButtonControl.h libgui/graphics/SliderControl.cc libgui/graphics/SliderControl.h libgui/graphics/Table.cc libgui/graphics/Table.h libgui/graphics/TextControl.cc libgui/graphics/TextControl.h libgui/graphics/TextEdit.cc libgui/graphics/TextEdit.h libgui/graphics/ToggleButtonControl.cc libgui/graphics/ToggleButtonControl.h libgui/graphics/ToggleTool.cc libgui/graphics/ToggleTool.h libgui/graphics/ToolBar.cc libgui/graphics/ToolBar.h libgui/graphics/ToolBarButton.cc libgui/graphics/ToolBarButton.h libgui/graphics/annotation-dialog.cc libgui/graphics/qt-graphics-toolkit.cc libgui/graphics/qt-graphics-toolkit.h libgui/src/graphics-init.cc
diffstat 68 files changed, 75 insertions(+), 76 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
--- 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,
--- 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
--- 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
--- 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;
--- 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
--- 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
--- 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*
--- 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
--- 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,
--- 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);
--- 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*
--- 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
--- 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*
--- 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;
--- 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);
--- 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
--- 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)
--- 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);
--- 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
--- 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
   {
--- 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;
--- 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
   {
--- 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
--- 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
--- 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
--- 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;
--- 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
--- 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
--- 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
--- 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
--- 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));
--- 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;
--- 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)
--- 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;
--- 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
--- 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;
--- 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*
--- 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
--- 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*
--- 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
--- 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*
--- 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>
--- 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
--- 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
--- 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*
--- 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
--- 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*
--- 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
--- 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 ())
--- 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;
--- 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*
--- 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
--- 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
--- 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
--- 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*
--- 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
--- 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*
--- 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>
--- 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)
   {
--- 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;
--- 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,
--- 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;
--- 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):
--- 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 "";
--- 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;
--- 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 ())