# HG changeset patch
# User Rik <rik@octave.org>
# Date 1638230331 28800
# Node ID d4d83344d6531391d60797ab070c8bc6862e56eb
# Parent  bbf1293bd255377fe3190972bb84172b66d39236
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.

* ButtonGroup.cc, Canvas.cc, CheckBoxControl.cc, Container.cc,
ContextMenu.cc, EditControl.cc, Figure.cc, Figure.h, FigureWindow.cc,
GenericEventNotify.h, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Menu.cc,
Object.cc, Panel.cc, PopupMenuControl.cc, PushButtonControl.cc, PushTool.cc,
RadioButtonControl.cc, SliderControl.cc, Table.cc, Table.h, TextControl.cc,
ToggleButtonControl.cc, ToggleTool.cc, ToolBar.cc, annotation-dialog.cc,
qt-graphics-toolkit.cc, documentation-bookmarks.cc, documentation-bookmarks.h,
documentation-dock-widget.h, documentation.cc, documentation.h,
dw-main-window.h, files-dock-widget.cc, files-dock-widget.h,
find-files-dialog.cc, find-files-model.cc, gui-preferences-dw.h,
gui-preferences-ed.h, gui-preferences-global.h, gui-settings.h,
interpreter-qobject.cc, led-indicator.cc, file-editor-interface.h,
file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h,
find-dialog.cc, find-dialog.h, marker.cc, octave-qscintilla.cc,
octave-qscintilla.h, main-window.cc, main-window.h, octave-dock-widget.cc,
octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, octave-qtutils.h,
qt-interpreter-events.cc, release-notes.cc, resource-manager.cc,
set-path-dialog.cc, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc,
shortcut-manager.h, tab-bar.cc, tab-bar.h, variable-editor-model.cc,
variable-editor-model.h, variable-editor.cc, variable-editor.h,
workspace-model.cc, workspace-view.cc, mkoctfile.in.cc, octave-config.in.cc:
Style check C++ files in src/ and libgui/ ahead of 7.1 release.

diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/ButtonGroup.cc
--- a/libgui/graphics/ButtonGroup.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/ButtonGroup.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -99,7 +99,7 @@
     return bw;
   }
 
-  ButtonGroup*
+  ButtonGroup *
   ButtonGroup::create (octave::base_qobject& oct_qobj,
                        octave::interpreter& interp, const graphics_object& go)
   {
@@ -155,9 +155,9 @@
 
     if (frame->hasMouseTracking ())
       {
-        for (auto *w : frame->findChildren<QWidget*> ())
+        for (auto *w : frame->findChildren<QWidget *> ())
           w->setMouseTracking (true);
-        for (auto *w : buttongroup->findChildren<QWidget*> ())
+        for (auto *w : buttongroup->findChildren<QWidget *> ())
           w->setMouseTracking (true);
       }
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/Canvas.cc
--- a/libgui/graphics/Canvas.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/Canvas.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -208,8 +208,8 @@
 
             Matrix cp (2, 3, 0.0);
 
-            cp(0,0) = p1(0); cp(0,1) = p1(1); cp(0,2) = p1(2);
-            cp(1,0) = p2(0); cp(1,1) = p2(1); cp(1,2) = p2(2);
+            cp(0, 0) = p1(0); cp(0, 1) = p1(1); cp(0, 2) = p1(2);
+            cp(1, 0) = p2(0); cp(1, 1) = p2(1); cp(1, 2) = p2(2);
 
             emit gh_set_event (childObj.get_handle (), "currentpoint", cp,
                                false);
@@ -250,8 +250,8 @@
 
             Matrix cp (2, 3, 0.0);
 
-            cp(0,0) = p1(0); cp(0,1) = p1(1); cp(0,2) = p1(2);
-            cp(1,0) = p2(0); cp(1,1) = p2(1); cp(1,2) = p2(2);
+            cp(0, 0) = p1(0); cp(0, 1) = p1(1); cp(0, 2) = p1(2);
+            cp(1, 0) = p2(0); cp(1, 1) = p2(1); cp(1, 2) = p2(2);
 
             emit gh_set_event (childObj.get_handle (), "currentpoint", cp,
                                false);
@@ -622,9 +622,9 @@
 
         // Make selected axes current
         bool valid_axes = axesObj.valid_object ()
-          && axesObj.get_properties ().handlevisibility_is ("on")
-          && axesObj.get_properties ().get_tag () != "legend"
-          && axesObj.get_properties ().get_tag () != "colorbar";
+                          && axesObj.get_properties ().handlevisibility_is ("on")
+                          && axesObj.get_properties ().get_tag () != "legend"
+                          && axesObj.get_properties ().get_tag () != "colorbar";
 
         if (valid_axes)
           Utils::properties<figure> (figObj)
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/CheckBoxControl.cc
--- a/libgui/graphics/CheckBoxControl.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/CheckBoxControl.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -37,7 +37,7 @@
 namespace octave
 {
 
-  CheckBoxControl*
+  CheckBoxControl *
   CheckBoxControl::create (octave::base_qobject& oct_qobj,
                            octave::interpreter& interp,
                            const graphics_object& go)
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/Container.cc
--- a/libgui/graphics/Container.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/Container.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -52,7 +52,7 @@
   Container::~Container (void)
   { }
 
-  Canvas*
+  Canvas *
   Container::canvas (const graphics_handle& gh, bool xcreate)
   {
     if (! m_canvas && xcreate)
@@ -131,7 +131,7 @@
   }
 
   void
-  Container::resizeEvent (QResizeEvent* /* event */)
+  Container::resizeEvent (QResizeEvent * /* event */)
   {
     if (m_canvas)
       m_canvas->qWidget ()->setGeometry (0, 0, width (), height ());
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/ContextMenu.cc
--- a/libgui/graphics/ContextMenu.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/ContextMenu.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -40,7 +40,7 @@
 namespace octave
 {
 
-  ContextMenu*
+  ContextMenu *
   ContextMenu::create (octave::base_qobject& oct_qobj,
                        octave::interpreter& interp, const graphics_object& go)
   {
@@ -113,7 +113,7 @@
     emit gh_set_event (m_handle, "visible", "off", false);
   }
 
-  QWidget*
+  QWidget *
   ContextMenu::menu (void)
   {
     return qWidget<QWidget> ();
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/EditControl.cc
--- a/libgui/graphics/EditControl.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/EditControl.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -39,7 +39,7 @@
 namespace octave
 {
 
-  EditControl*
+  EditControl *
   EditControl::create (octave::base_qobject& oct_qobj,
                        octave::interpreter& interp, const graphics_object& go)
   {
@@ -143,7 +143,7 @@
   { }
 
   void
-  EditControl::initCommon (QWidget*)
+  EditControl::initCommon (QWidget *)
   {
     m_textChanged = false;
   }
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/Figure.cc
--- a/libgui/graphics/Figure.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/Figure.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -96,9 +96,9 @@
     for (octave_idx_type ii = 0; ii < cdata.rows (); ii++)
       for (octave_idx_type jj = 0; jj < cdata.columns (); jj++)
         {
-          if (cdata(ii,jj) == 1.0)
+          if (cdata(ii, jj) == 1.0)
             tmp = black;
-          else if (cdata(ii,jj) == 2.0)
+          else if (cdata(ii, jj) == 2.0)
             tmp = white;
           else
             tmp.setAlpha (0);
@@ -109,7 +109,7 @@
     return retval;
   }
 
-  Figure*
+  Figure *
   Figure::create (octave::base_qobject& oct_qobj, octave::interpreter& interp,
                   const graphics_object& go)
   {
@@ -279,7 +279,7 @@
       }
   }
 
-  Container*
+  Container *
   Figure::innerContainer (void)
   {
     return m_container;
@@ -293,7 +293,7 @@
     if (canvas)
       canvas->redraw ();
 
-    for (auto *qobj : qWidget<QWidget> ()->findChildren<QObject*> ())
+    for (auto *qobj : qWidget<QWidget> ()->findChildren<QObject *> ())
       {
         if (qobj->objectName () == "UIPanel"
             || qobj->objectName () == "UIButtonGroup"
@@ -383,7 +383,7 @@
           int toffset = 0;
           int boffset = 0;
 
-          for (auto *tb : win->findChildren<QToolBar*> ())
+          for (auto *tb : win->findChildren<QToolBar *> ())
             if (! tb->isHidden ())
               toffset += tb->sizeHint ().height ();
 
@@ -449,7 +449,7 @@
         else
           m_container->canvas (m_handle)->addEventMask (Canvas::KeyPress);
         // Signal the change to uipanels as well
-        for (auto *qobj : qWidget<QWidget> ()->findChildren<QObject*> ())
+        for (auto *qobj : qWidget<QWidget> ()->findChildren<QObject *> ())
           {
             if (qobj->objectName () == "UIPanel")
               {
@@ -475,7 +475,7 @@
           m_container->canvas (m_handle)->addEventMask (Canvas::KeyRelease);
         break;
         // Signal the change to uipanels as well
-        for (auto *qobj : qWidget<QWidget> ()->findChildren<QObject*> ())
+        for (auto *qobj : qWidget<QWidget> ()->findChildren<QObject *> ())
           {
             if (qobj->objectName () == "UIPanel")
               {
@@ -592,13 +592,13 @@
   }
 
   void
-  Figure::do_connections (const QObject *receiver, const QObject* /* emitter */)
+  Figure::do_connections (const QObject *receiver, const QObject * /* emitter */)
   {
     Object::do_connections (receiver);
     Object::do_connections (receiver, m_container->canvas (m_handle));
   }
 
-  QWidget*
+  QWidget *
   Figure::menu (void)
   {
     return qWidget<QMainWindow> ()->menuBar ();
@@ -857,8 +857,8 @@
   Figure::figureWindowShown ()
   {
 #if defined (HAVE_QSCREEN_DEVICEPIXELRATIO)
-    QWindow* window = qWidget<QMainWindow> ()->windowHandle ();
-    QScreen* screen = window->screen ();
+    QWindow *window = qWidget<QMainWindow> ()->windowHandle ();
+    QScreen *screen = window->screen ();
 
     gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
 
@@ -872,7 +872,7 @@
   }
 
   void
-  Figure::screenChanged (QScreen* screen)
+  Figure::screenChanged (QScreen *screen)
   {
 #if defined (HAVE_QSCREEN_DEVICEPIXELRATIO)
     gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
@@ -901,7 +901,7 @@
     // Enable mouse tracking on every widgets
     m_container->setMouseTracking (true);
     m_container->canvas (m_handle)->qWidget ()->setMouseTracking (true);
-    for (auto *w : m_container->findChildren<QWidget*> ())
+    for (auto *w : m_container->findChildren<QWidget *> ())
       w->setMouseTracking (true);
   }
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/Figure.h
--- a/libgui/graphics/Figure.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/Figure.h	Mon Nov 29 15:58:51 2021 -0800
@@ -63,9 +63,9 @@
   class ToolBar;
 
   class Figure :
-  public Object,
-  public MenuContainer,
-  public GenericEventNotifyReceiver
+    public Object,
+    public MenuContainer,
+    public GenericEventNotifyReceiver
   {
     Q_OBJECT
 
@@ -123,7 +123,7 @@
     void updateFigureHeight (int delta_h);
     void updateContainer (void);
     void figureWindowShown ();
-    void screenChanged (QScreen*);
+    void screenChanged (QScreen *);
 
   public slots:
     uint8NDArray slotGetPixels (void);
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/FigureWindow.cc
--- a/libgui/graphics/FigureWindow.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/FigureWindow.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -44,14 +44,14 @@
   FigureWindow::~FigureWindow (void)
   { }
 
-  QMenu*
+  QMenu *
   FigureWindow::createPopupMenu (void)
   {
     // For the time being, disable menubar/toolbar popup menu
     return nullptr;
   }
 
-  void FigureWindow::showEvent (QShowEvent* ev)
+  void FigureWindow::showEvent (QShowEvent *ev)
   {
     QMainWindow::showEvent (ev);
     emit figureWindowShown();
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/GenericEventNotify.h
--- a/libgui/graphics/GenericEventNotify.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/GenericEventNotify.h	Mon Nov 29 15:58:51 2021 -0800
@@ -54,7 +54,7 @@
     void notifyReceiversAfter (QObject *obj, QEvent *evt);
 
   private:
-    QSet<GenericEventNotifyReceiver*> m_receivers;
+    QSet<GenericEventNotifyReceiver *> m_receivers;
   };
 
   class GenericEventNotifyReceiver
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/ListBoxControl.cc
--- a/libgui/graphics/ListBoxControl.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/ListBoxControl.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -69,7 +69,7 @@
       }
   }
 
-  ListBoxControl*
+  ListBoxControl *
   ListBoxControl::create (octave::base_qobject& oct_qobj,
                           octave::interpreter& interp,
                           const graphics_object& go)
@@ -209,12 +209,12 @@
   }
 
   void
-  ListBoxControl::itemActivated (const QModelIndex &)
+  ListBoxControl::itemActivated (const QModelIndex&)
   {
     m_selectionChanged = true;
   }
   void
-  ListBoxControl::itemPressed (QListWidgetItem*)
+  ListBoxControl::itemPressed (QListWidgetItem *)
   {
     m_selectionChanged = true;
   }
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/ListBoxControl.h
--- a/libgui/graphics/ListBoxControl.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/ListBoxControl.h	Mon Nov 29 15:58:51 2021 -0800
@@ -62,8 +62,8 @@
 
   private slots:
     void itemSelectionChanged (void);
-    void itemActivated (const QModelIndex &);
-    void itemPressed (QListWidgetItem*);
+    void itemActivated (const QModelIndex&);
+    void itemPressed (QListWidgetItem *);
 
   private:
     bool m_blockCallback;
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/Logger.cc
--- a/libgui/graphics/Logger.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/Logger.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -53,7 +53,7 @@
   Logger::~Logger (void)
   { }
 
-  Logger*
+  Logger *
   Logger::instance (void)
   {
     if (! s_instance)
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/Menu.cc
--- a/libgui/graphics/Menu.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/Menu.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -62,7 +62,7 @@
     return QKeySequence ();
   }
 
-  Menu*
+  Menu *
   Menu::create (octave::base_qobject& oct_qobj, octave::interpreter& interp,
                 const graphics_object& go)
   {
@@ -270,7 +270,7 @@
       }
   }
 
-  QWidget*
+  QWidget *
   Menu::menu (void)
   {
     QAction *action = qWidget<QAction> ();
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/Object.cc
--- a/libgui/graphics/Object.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/Object.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -70,7 +70,7 @@
     if (m_qobject)
       {
         m_qobject->setProperty ("octave::Object",
-                                QVariant::fromValue<void*> (this));
+                                QVariant::fromValue<void *> (this));
         connect (m_qobject, &QObject::destroyed,
                  this, &Object::objectDestroyed);
       }
@@ -197,7 +197,7 @@
       m_qobject = nullptr;
   }
 
-  Object*
+  Object *
   Object::parentObject (octave::interpreter& interp, const graphics_object& go)
   {
     gh_manager& gh_mgr = interp.get_gh_manager ();
@@ -210,13 +210,13 @@
     return parent;
   }
 
-  Object*
+  Object *
   Object::fromQObject (QObject *obj)
   {
     QVariant v = obj->property ("octave::Object");
 
     if (v.isValid ())
-      return reinterpret_cast<Object *> (qvariant_cast<void*> (v));
+      return reinterpret_cast<Object *> (qvariant_cast<void *> (v));
 
     return nullptr;
   }
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/Panel.cc
--- a/libgui/graphics/Panel.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/Panel.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -92,7 +92,7 @@
     return bw;
   }
 
-  Panel*
+  Panel *
   Panel::create (octave::base_qobject& oct_qobj, octave::interpreter& interp,
                  const graphics_object& go)
   {
@@ -139,7 +139,7 @@
 
     if (frame->hasMouseTracking ())
       {
-        for (auto *w : frame->findChildren<QWidget*> ())
+        for (auto *w : frame->findChildren<QWidget *> ())
           w->setMouseTracking (true);
       }
 
@@ -421,7 +421,7 @@
   }
 
   void
-  Panel::do_connections (const QObject *receiver, const QObject* /* emitter */)
+  Panel::do_connections (const QObject *receiver, const QObject * /* emitter */)
   {
     Object::do_connections (receiver);
     Object::do_connections (receiver, m_container->canvas (m_handle));
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/PopupMenuControl.cc
--- a/libgui/graphics/PopupMenuControl.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/PopupMenuControl.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -39,7 +39,7 @@
 namespace octave
 {
 
-  PopupMenuControl*
+  PopupMenuControl *
   PopupMenuControl::create (octave::base_qobject& oct_qobj,
                             octave::interpreter& interp,
                             const graphics_object& go)
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/PushButtonControl.cc
--- a/libgui/graphics/PushButtonControl.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/PushButtonControl.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -39,7 +39,7 @@
 namespace octave
 {
 
-  PushButtonControl*
+  PushButtonControl *
   PushButtonControl::create (octave::base_qobject& oct_qobj,
                              octave::interpreter& interp,
                              const graphics_object& go)
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/PushTool.cc
--- a/libgui/graphics/PushTool.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/PushTool.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -36,7 +36,7 @@
 namespace octave
 {
 
-  PushTool*
+  PushTool *
   PushTool::create (octave::base_qobject& oct_qobj,
                     octave::interpreter& interp, const graphics_object& go)
   {
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/RadioButtonControl.cc
--- a/libgui/graphics/RadioButtonControl.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/RadioButtonControl.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -39,7 +39,7 @@
 namespace octave
 {
 
-  RadioButtonControl*
+  RadioButtonControl *
   RadioButtonControl::create (octave::base_qobject& oct_qobj,
                               octave::interpreter& interp,
                               const graphics_object& go)
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/SliderControl.cc
--- a/libgui/graphics/SliderControl.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/SliderControl.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -43,7 +43,7 @@
 namespace octave
 {
 
-  SliderControl*
+  SliderControl *
   SliderControl::create (octave::base_qobject& oct_qobj,
                          octave::interpreter& interp,
                          const graphics_object& go)
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/Table.cc
--- a/libgui/graphics/Table.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/Table.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -430,7 +430,7 @@
     return retval;
   }
 
-  Table*
+  Table *
   Table::create (octave::base_qobject& oct_qobj, octave::interpreter& interp,
                  const graphics_object& go)
   {
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/Table.h
--- a/libgui/graphics/Table.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/Table.h	Mon Nov 29 15:58:51 2021 -0800
@@ -49,12 +49,12 @@
 
   public:
     Table (octave::base_qobject& oct_qobj, octave::interpreter& interp,
-           const graphics_object& go, QTableWidget* tableWidget);
+           const graphics_object& go, QTableWidget *tableWidget);
     ~Table (void);
 
-    Container* innerContainer (void) { return m_container; }
+    Container * innerContainer (void) { return m_container; }
 
-    bool eventFilter (QObject* watched, QEvent* event);
+    bool eventFilter (QObject *watched, QEvent *event);
 
     static Table *
     create (octave::base_qobject& oct_qobj, octave::interpreter& interp,
@@ -73,14 +73,14 @@
     void updateRowname (void);
 
   private slots:
-    void itemChanged (QTableWidgetItem* item);
+    void itemChanged (QTableWidgetItem *item);
     void comboBoxCurrentIndexChanged (const QString& value);
     void cellClicked (int row, int col);
     void itemSelectionChanged (void);
 
   private:
-    Container* m_container;
-    QTableWidget* m_tableWidget;
+    Container *m_container;
+    QTableWidget *m_tableWidget;
     octave_value m_curData;
     bool m_blockUpdates;
     bool m_keyPressHandlerDefined;
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/TextControl.cc
--- a/libgui/graphics/TextControl.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/TextControl.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -38,7 +38,7 @@
 namespace octave
 {
 
-  TextControl*
+  TextControl *
   TextControl::create (octave::base_qobject& oct_qobj,
                        octave::interpreter& interp, const graphics_object& go)
   {
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/ToggleButtonControl.cc
--- a/libgui/graphics/ToggleButtonControl.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/ToggleButtonControl.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -39,7 +39,7 @@
 namespace octave
 {
 
-  ToggleButtonControl*
+  ToggleButtonControl *
   ToggleButtonControl::create (octave::base_qobject& oct_qobj,
                                octave::interpreter& interp,
                                const graphics_object& go)
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/ToggleTool.cc
--- a/libgui/graphics/ToggleTool.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/ToggleTool.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -36,7 +36,7 @@
 namespace octave
 {
 
-  ToggleTool*
+  ToggleTool *
   ToggleTool::create (octave::base_qobject& oct_qobj,
                       octave::interpreter& interp, const graphics_object& go)
   {
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/ToolBar.cc
--- a/libgui/graphics/ToolBar.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/ToolBar.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -55,7 +55,7 @@
     return QIcon (pix);
   }
 
-  static QAction*
+  static QAction *
   addEmptyAction (QToolBar *bar)
   {
     static const QIcon empty_icon = makeEmptyIcon ();
@@ -68,7 +68,7 @@
     return a;
   }
 
-  ToolBar*
+  ToolBar *
   ToolBar::create (octave::base_qobject& oct_qobj, octave::interpreter& interp,
                    const graphics_object& go)
   {
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/annotation-dialog.cc
--- a/libgui/graphics/annotation-dialog.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/annotation-dialog.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -132,7 +132,7 @@
   // set props to the values of the gui
   props = octave_value_list ();
 
-  Matrix position(1,4);
+  Matrix position(1, 4);
   position(0) = ui->sb_x->value ();
   position(1) = ui->sb_y->value ();
   position(2) = ui->sb_width->value ();
diff -r bbf1293bd255 -r d4d83344d653 libgui/graphics/qt-graphics-toolkit.cc
--- a/libgui/graphics/qt-graphics-toolkit.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/graphics/qt-graphics-toolkit.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -324,7 +324,7 @@
     return ext;
   }
 
-  Object*
+  Object *
   qt_graphics_toolkit::toolkitObject (const graphics_object& go)
   {
     ObjectProxy *proxy = toolkitObjectProxy (go);
@@ -335,7 +335,7 @@
     return nullptr;
   }
 
-  ObjectProxy*
+  ObjectProxy *
   qt_graphics_toolkit::toolkitObjectProxy (const graphics_object& go)
   {
     if (go)
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/documentation-bookmarks.cc
--- a/libgui/src/documentation-bookmarks.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/documentation-bookmarks.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -74,7 +74,7 @@
     m_tree->setColumnCount (1);
     m_tree->setHeaderHidden (true);
     m_tree->setEditTriggers (QAbstractItemView::EditKeyPressed
-                                      | QAbstractItemView::SelectedClicked);
+                             | QAbstractItemView::SelectedClicked);
 
     connect (m_tree, &QTreeWidget::customContextMenuRequested,
              this, &documentation_bookmarks::ctx_menu);
@@ -266,7 +266,7 @@
               }
           }
         else
-            (*it)->setHidden (true);
+          (*it)->setHidden (true);
 
         it++;
       }
@@ -370,7 +370,7 @@
       {
         if (*it)
           m_tree->takeTopLevelItem (
-                    m_tree->indexOfTopLevelItem (*it));
+            m_tree->indexOfTopLevelItem (*it));
       }
   }
 
@@ -431,22 +431,22 @@
   {
     switch (item->data (0, tag_role).toInt ())
       {
-        case folder_tag:
-          xml_writer->writeStartElement (dc_xbel_name_folder);
-          xml_writer->writeAttribute (dc_xbel_attr_folded,
-                    item->isExpanded () ? dc_xbel_value_no : dc_xbel_value_yes);
-          xml_writer->writeTextElement (dc_xbel_name_title, item->text(0));
-          for (int i = 0; i < item->childCount (); i++)
-            write_tree_item (xml_writer, item->child (i));
-          xml_writer->writeEndElement ();
-          break;
+      case folder_tag:
+        xml_writer->writeStartElement (dc_xbel_name_folder);
+        xml_writer->writeAttribute (dc_xbel_attr_folded,
+                                    item->isExpanded () ? dc_xbel_value_no : dc_xbel_value_yes);
+        xml_writer->writeTextElement (dc_xbel_name_title, item->text(0));
+        for (int i = 0; i < item->childCount (); i++)
+          write_tree_item (xml_writer, item->child (i));
+        xml_writer->writeEndElement ();
+        break;
 
-        case bookmark_tag:
-          xml_writer->writeStartElement (dc_xbel_name_bookmark);
-          xml_writer->writeAttribute (dc_xbel_attr_href, item->data (0, url_role).toString ());
-          xml_writer->writeTextElement (dc_xbel_name_title, item->text (0));
-          xml_writer->writeEndElement ();
-          break;
+      case bookmark_tag:
+        xml_writer->writeStartElement (dc_xbel_name_bookmark);
+        xml_writer->writeAttribute (dc_xbel_attr_href, item->data (0, url_role).toString ());
+        xml_writer->writeTextElement (dc_xbel_name_title, item->text (0));
+        xml_writer->writeEndElement ();
+        break;
       }
   }
 
@@ -494,9 +494,9 @@
           xml_reader.skipCurrentElement ();
       }
 
-     m_xbel_file.close ();
+    m_xbel_file.close ();
 
-     return error_message;
+    return error_message;
   }
 
   void documentation_bookmarks::read_next_item (QXmlStreamReader *xml_reader,
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/documentation-bookmarks.h
--- a/libgui/src/documentation-bookmarks.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/documentation-bookmarks.h	Mon Nov 29 15:58:51 2021 -0800
@@ -47,8 +47,8 @@
   public:
 
     documentation_bookmarks (
-                documentation *doc, documentation_browser *browser,
-                base_qobject& oct_qobj, QWidget *p = nullptr);
+      documentation *doc, documentation_browser *browser,
+      base_qobject& oct_qobj, QWidget *p = nullptr);
 
     ~documentation_bookmarks (void) = default;
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/documentation-dock-widget.h
--- a/libgui/src/documentation-dock-widget.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/documentation-dock-widget.h	Mon Nov 29 15:58:51 2021 -0800
@@ -52,9 +52,9 @@
     void pasteClipboard (void);
     void selectAll (void);
 
-    void showDoc (const QString & name);
-    void registerDoc (const QString & name);
-    void unregisterDoc (const QString & name);
+    void showDoc (const QString& name);
+    void registerDoc (const QString& name);
+    void unregisterDoc (const QString& name);
 
   private:
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/documentation.cc
--- a/libgui/src/documentation.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/documentation.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -688,7 +688,7 @@
       = m_help_engine->linksForIdentifier (ref_name);
 #endif
 
-    QTabWidget *navi = static_cast<QTabWidget*> (widget (0));
+    QTabWidget *navi = static_cast<QTabWidget *> (widget (0));
 
     if (found_links.count() > 0)
       {
@@ -704,7 +704,7 @@
         // Switch to function index tab
         m_help_engine->indexWidget()->filterIndices (ref_name);
         QWidget *index_tab
-          = navi->findChild<QWidget*> ("documentation_tab_index");
+          = navi->findChild<QWidget *> ("documentation_tab_index");
         navi->setCurrentWidget (index_tab);
       }
     else
@@ -731,7 +731,7 @@
         search_query->setQuery (query);
 #endif
         QWidget *search_tab
-          = navi->findChild<QWidget*> ("documentation_tab_search");
+          = navi->findChild<QWidget *> ("documentation_tab_search");
         navi->setCurrentWidget (search_tab);
       }
   }
@@ -965,14 +965,14 @@
         anchor.remove (QRegExp ("^SEC_"));
         anchor.remove (QRegExp ("^XREF"));
         anchor.remove ("Concept-Index_cp_letter-");
-        anchor.replace ("-"," ");
+        anchor.replace ("-", " ");
 
         // replace encoded special chars by their unencoded versions
         QRegExp rx = QRegExp ("_00([0-7][0-9a-f])");
         int pos = 0;
         while ((pos = rx.indexIn(anchor, pos)) != -1)
           {
-            anchor.replace ("_00"+rx.cap (1), QChar (rx.cap (1).toInt (nullptr,16)));
+            anchor.replace ("_00"+rx.cap (1), QChar (rx.cap (1).toInt (nullptr, 16)));
             pos += rx.matchedLength();
           }
 
@@ -1016,7 +1016,7 @@
       }
   }
 
-  QVariant documentation_browser::loadResource (int type, const QUrl &url)
+  QVariant documentation_browser::loadResource (int type, const QUrl& url)
   {
     if (m_help_engine && url.scheme () == "qthelp")
       return QVariant (m_help_engine->fileData(url));
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/documentation.h
--- a/libgui/src/documentation.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/documentation.h	Mon Nov 29 15:58:51 2021 -0800
@@ -56,7 +56,7 @@
     documentation_browser (QHelpEngine *help_engine, QWidget *parent = nullptr);
     ~documentation_browser (void) = default;
 
-    virtual QVariant loadResource (int type, const QUrl &url);
+    virtual QVariant loadResource (int type, const QUrl& url);
 
   public slots:
 
@@ -130,9 +130,9 @@
     void selectAll (void);
 
     void load_index (void);
-    void load_ref (const QString & name = QString ());
-    void registerDoc (const QString & name);
-    void unregisterDoc (const QString & name);
+    void load_ref (const QString& name = QString ());
+    void registerDoc (const QString& name);
+    void unregisterDoc (const QString& name);
 
   private slots:
 
@@ -155,9 +155,9 @@
   private:
 
     void construct_tool_bar (void);
-    QAction *add_action (const QIcon& icon, const QString& text,
-                         const char *member, QWidget *receiver = nullptr,
-                         QToolBar *tool_bar = nullptr);
+    QAction * add_action (const QIcon& icon, const QString& text,
+                          const char *member, QWidget *receiver = nullptr,
+                          QToolBar *tool_bar = nullptr);
     void update_history (int new_count, QAction **actions);
 
     //! Select all occurrences of a string in the doc browser
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/dw-main-window.h
--- a/libgui/src/dw-main-window.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/dw-main-window.h	Mon Nov 29 15:58:51 2021 -0800
@@ -56,7 +56,7 @@
 
   protected slots:
 
-    virtual QMenu* createPopupMenu ();
+    virtual QMenu * createPopupMenu ();
 
     virtual bool event (QEvent *ev);
 
@@ -73,8 +73,8 @@
 
     void request_switch (int direction);
 
-    QAction *add_action (QMenu *menu, const QIcon& icon, const QString& text,
-                         const char *member, QWidget *receiver);
+    QAction * add_action (QMenu *menu, const QIcon& icon, const QString& text,
+                          const char *member, QWidget *receiver);
 
     base_qobject& m_octave_qobj;
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/files-dock-widget.cc
--- a/libgui/src/files-dock-widget.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/files-dock-widget.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -205,7 +205,7 @@
     m_file_system_model = new QFileSystemModel (this);
     m_file_system_model->setResolveSymlinks (false);
     m_file_system_model->setFilter (
-        QDir::System | QDir::NoDotAndDotDot | QDir::AllEntries);
+      QDir::System | QDir::NoDotAndDotDot | QDir::AllEntries);
     QModelIndex rootPathIndex
       = m_file_system_model->setRootPath (startup_dir.absolutePath ());
 
@@ -286,8 +286,8 @@
     // but the function textActivated was not introduced until Qt 5.14
     // so we'll need a feature test.
 
-    connect (m_current_directory, SIGNAL (activated (const QString &)),
-             this, SLOT (set_current_directory (const QString &)));
+    connect (m_current_directory, SIGNAL (activated (const QString&)),
+             this, SLOT (set_current_directory (const QString&)));
 
     QCompleter *completer = new QCompleter (m_file_system_model, this);
     m_current_directory->setCompleter (completer);
@@ -367,14 +367,14 @@
 
   void files_dock_widget::do_sync_browser_directory (void)
   {
-    display_directory (m_octave_dir,false);  // false: no sync of octave dir
+    display_directory (m_octave_dir, false); // false: no sync of octave dir
   }
 
   void files_dock_widget::update_octave_directory (const QString& dir)
   {
     m_octave_dir = dir;
     if (m_sync_octave_dir)
-      display_directory (m_octave_dir,false);  // false: no sync of octave dir
+      display_directory (m_octave_dir, false); // false: no sync of octave dir
   }
 
   void files_dock_widget::display_directory (const QString& dir,
@@ -442,7 +442,7 @@
     gui_settings *settings = rmgr.get_settings ();
 
     QString key = m_columns_shown_keys.at (col);
-    bool shown = settings->value (key,false).toBool ();
+    bool shown = settings->value (key, false).toBool ();
     settings->setValue (key, ! shown);
     settings->sync ();
 
@@ -745,12 +745,12 @@
         if (multiple_files)
           if (it == rows.begin ())
             {
-               dlg_answer = QMessageBox::question (this,
-                              tr ("Delete file/directory"),
-                              tr ("Are you sure you want to delete all %1 selected files?\n").arg (file_cnt),
-                              QMessageBox::Yes | QMessageBox::No);
-               if (dlg_answer != QMessageBox::Yes)
-                 return;
+              dlg_answer = QMessageBox::question (this,
+                                                  tr ("Delete file/directory"),
+                                                  tr ("Are you sure you want to delete all %1 selected files?\n").arg (file_cnt),
+                                                  QMessageBox::Yes | QMessageBox::No);
+              if (dlg_answer != QMessageBox::Yes)
+                return;
             }
           else
             dlg_answer = QMessageBox::Yes;
@@ -919,7 +919,7 @@
 
     QStyle *st = style ();
     int icon_size = st->pixelMetric (global_icon_sizes[size_idx]);
-    m_navigation_tool_bar->setIconSize (QSize (icon_size,icon_size));
+    m_navigation_tool_bar->setIconSize (QSize (icon_size, icon_size));
 
     // filenames are always shown, other columns can be hidden by settings
     for (int i = 0; i < 3; i++)
@@ -927,7 +927,7 @@
                                          ! settings->value (m_columns_shown_keys.at (i),false).toBool ());
 
     QDir::Filters current_filter = m_file_system_model->filter ();
-    if (settings->value (m_columns_shown_keys.at (3),false).toBool ())
+    if (settings->value (m_columns_shown_keys.at (3), false).toBool ())
       m_file_system_model->setFilter (current_filter | QDir::Hidden);
     else
       m_file_system_model->setFilter (current_filter & (~QDir::Hidden));
@@ -999,7 +999,7 @@
     bool ok;
 
     QString name = QInputDialog::getText (this, tr ("Create File"),
-                                          tr ("Create file in\n","String ends with \\n!") + parent_dir,
+                                          tr ("Create file in\n", "String ends with \\n!") + parent_dir,
                                           QLineEdit::Normal,
                                           tr ("New File.txt"), &ok);
     if (ok && name.length () > 0)
@@ -1017,7 +1017,7 @@
     bool ok;
 
     QString name = QInputDialog::getText (this, tr ("Create Directory"),
-                                          tr ("Create folder in\n","String ends with \\n!") + parent_dir,
+                                          tr ("Create folder in\n", "String ends with \\n!") + parent_dir,
                                           QLineEdit::Normal,
                                           tr ("New Directory"), &ok);
     if (ok && name.length () > 0)
@@ -1028,12 +1028,12 @@
       }
   }
 
-  void files_dock_widget::process_set_current_dir (const QString & dir)
+  void files_dock_widget::process_set_current_dir (const QString& dir)
   {
     emit displayed_directory_changed (dir);
   }
 
-  void files_dock_widget::process_find_files (const QString & dir)
+  void files_dock_widget::process_find_files (const QString& dir)
   {
     emit find_files_signal (dir);
   }
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/files-dock-widget.h
--- a/libgui/src/files-dock-widget.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/files-dock-widget.h	Mon Nov 29 15:58:51 2021 -0800
@@ -103,7 +103,7 @@
 
     //! Slot for handling a change in directory via double click.
 
-    void item_double_clicked (const QModelIndex & index);
+    void item_double_clicked (const QModelIndex& index);
 
     //! Slot for handling the up-directory button in the toolbar.
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/find-files-dialog.cc
--- a/libgui/src/find-files-dialog.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/find-files-dialog.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -166,35 +166,35 @@
     QGridLayout *name_layout = new QGridLayout;
     name_group->setLayout (name_layout);
 
-    name_layout->addWidget (file_name_label,1,1, 1,1);
-    name_layout->addWidget (m_file_name_edit,1,2, 1,-1);
+    name_layout->addWidget (file_name_label, 1, 1, 1, 1);
+    name_layout->addWidget (m_file_name_edit, 1, 2, 1, -1);
 
-    name_layout->addWidget (start_dir_label,2,1);
-    name_layout->addWidget (m_start_dir_edit,2,2,1,3);
-    name_layout->addWidget (m_browse_button,2,5);
-    name_layout->setColumnStretch (2,1);
+    name_layout->addWidget (start_dir_label, 2, 1);
+    name_layout->addWidget (m_start_dir_edit, 2, 2, 1, 3);
+    name_layout->addWidget (m_browse_button, 2, 5);
+    name_layout->setColumnStretch (2, 1);
 
-    name_layout->addWidget (m_recurse_dirs_check,3,1);
-    name_layout->addWidget (m_include_dirs_check,3,2);
-    name_layout->addWidget (m_name_case_check,3,3);
+    name_layout->addWidget (m_recurse_dirs_check, 3, 1);
+    name_layout->addWidget (m_include_dirs_check, 3, 2);
+    name_layout->addWidget (m_name_case_check, 3, 3);
 
     // content options
     QGroupBox *content_group = new QGroupBox (tr ("File contents"));
     QGridLayout *content_layout = new QGridLayout;
     content_group->setLayout (content_layout);
-    content_layout->addWidget (m_contains_text_check,4,1);
-    content_layout->addWidget (m_contains_text_edit,4,2,1,3);
-    content_layout->setColumnStretch (2,1);
-    content_layout->addWidget (m_content_case_check,5,1);
+    content_layout->addWidget (m_contains_text_check, 4, 1);
+    content_layout->addWidget (m_contains_text_edit, 4, 2, 1, 3);
+    content_layout->setColumnStretch (2, 1);
+    content_layout->addWidget (m_content_case_check, 5, 1);
 
     QGridLayout *main_layout = new QGridLayout;
     main_layout->setSizeConstraint (QLayout::SetFixedSize);
     main_layout->addWidget (name_group, 0, 0);
     main_layout->addWidget (content_group, 1, 0);
-    main_layout->addWidget (button_box, 0, 1,3,1);
-    main_layout->addWidget (m_file_list,2,0);
-    main_layout->setRowStretch (2,1);
-    main_layout->addWidget (m_status_bar,3,0,1,-1);
+    main_layout->addWidget (button_box, 0, 1, 3, 1);
+    main_layout->addWidget (m_file_list, 2, 0);
+    main_layout->setRowStretch (2, 1);
+    main_layout->addWidget (m_status_bar, 3, 0, 1, -1);
 
     setLayout (main_layout);
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/find-files-model.cc
--- a/libgui/src/find-files-model.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/find-files-model.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -122,12 +122,12 @@
     endInsertRows ();
   }
 
-  int find_files_model::rowCount (const QModelIndex &) const
+  int find_files_model::rowCount (const QModelIndex&) const
   {
     return m_files.size ();
   }
 
-  int find_files_model::columnCount (const QModelIndex &) const
+  int find_files_model::columnCount (const QModelIndex&) const
   {
     return m_columnNames.size ();
   }
@@ -201,7 +201,7 @@
       }
   }
 
-  QFileInfo find_files_model::fileInfo (const QModelIndex & p) const
+  QFileInfo find_files_model::fileInfo (const QModelIndex& p) const
   {
     return p.isValid () ? m_files[p.row ()] : QFileInfo ();
   }
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/gui-preferences-dw.h
--- a/libgui/src/gui-preferences-dw.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/gui-preferences-dw.h	Mon Nov 29 15:58:51 2021 -0800
@@ -38,16 +38,16 @@
 const gui_pref dw_title_3d ("DockWidgets/widget_title_3d", QVariant (50));
 
 const gui_pref
-dw_title_fg_color ("DockWidgets/title_fg_color", QVariant (QColor (0,0,0)));
+dw_title_fg_color ("DockWidgets/title_fg_color", QVariant (QColor (0, 0, 0)));
 
 const gui_pref dw_title_fg_color_active ("DockWidgets/title_fg_color_active",
-                                         QVariant (QColor (0,0,0)));
+                                         QVariant (QColor (0, 0, 0)));
 
 const gui_pref dw_title_bg_color ("DockWidgets/title_bg_color",
-                                  QVariant (QColor (255,255,255)));
+                                  QVariant (QColor (255, 255, 255)));
 
 const gui_pref dw_title_bg_color_active ("DockWidgets/title_bg_color_active",
-                                         QVariant (QColor (192,192,192)));
+                                         QVariant (QColor (192, 192, 192)));
 
 const gui_pref dw_icon_set ("DockWidgets/widget_icon_set", QVariant ("NONE"));
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/gui-preferences-ed.h
--- a/libgui/src/gui-preferences-ed.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/gui-preferences-ed.h	Mon Nov 29 15:58:51 2021 -0800
@@ -262,20 +262,20 @@
 // The find dialog
 
 enum find_dialog_options
-  {
-    FIND_DLG_MORE  = 1,
-    FIND_DLG_CASE  = 2,
-    FIND_DLG_START = 4,
-    FIND_DLG_WRAP  = 8,
-    FIND_DLG_REGX  = 16,
-    FIND_DLG_WORDS = 32,
-    FIND_DLG_BACK  = 64,
-    FIND_DLG_SEL   = 128
-  };
+{
+  FIND_DLG_MORE  = 1,
+  FIND_DLG_CASE  = 2,
+  FIND_DLG_START = 4,
+  FIND_DLG_WRAP  = 8,
+  FIND_DLG_REGX  = 16,
+  FIND_DLG_WORDS = 32,
+  FIND_DLG_BACK  = 64,
+  FIND_DLG_SEL   = 128
+};
 
 // Dialog position, the default will be calculated from the editor's geometry
 const gui_pref
-ed_fdlg_pos ("editor/fdgl_pos", QVariant (QPoint (0,0)));
+ed_fdlg_pos ("editor/fdgl_pos", QVariant (QPoint (0, 0)));
 
 const gui_pref
 ed_fdlg_opts ("editor/fdgl_opts", QVariant (FIND_DLG_WRAP));
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/gui-preferences-global.h
--- a/libgui/src/gui-preferences-global.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/gui-preferences-global.h	Mon Nov 29 15:58:51 2021 -0800
@@ -144,10 +144,10 @@
 
 const QStringList
 global_proxy_all_types (QStringList ()
-             << "HttpProxy"
-             << "Socks5Proxy"
-             << QT_TRANSLATE_NOOP ("octave::settings_dialog", "Environment Variables")
-);
+                        << "HttpProxy"
+                        << "Socks5Proxy"
+                        << QT_TRANSLATE_NOOP ("octave::settings_dialog", "Environment Variables")
+                       );
 const QList<int>
 global_proxy_manual_types (QList<int> () << 0 << 1);
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/gui-settings.h
--- a/libgui/src/gui-settings.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/gui-settings.h	Mon Nov 29 15:58:51 2021 -0800
@@ -126,7 +126,7 @@
 // Some constants used several times in the settings
 
 // Special color indicating no change compared to default color
-const QColor settings_color_no_change (255,0,255);
+const QColor settings_color_no_change (255, 0, 255);
 
 // Other color schemes (currently one extra, but possibly more in the future)
 const QString settings_color_modes = QT_TRANSLATE_NOOP (
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/interpreter-qobject.cc
--- a/libgui/src/interpreter-qobject.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/interpreter-qobject.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -195,7 +195,7 @@
       }
   }
 
-  qt_interpreter_events * interpreter_qobject::qt_link (void)
+  qt_interpreter_events *interpreter_qobject::qt_link (void)
   {
     return m_octave_qobj.qt_link ();
   }
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/led-indicator.cc
--- a/libgui/src/led-indicator.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/led-indicator.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -38,7 +38,7 @@
   led_indicator::led_indicator (led_state initial_state, QWidget *p)
     : QLabel (p)
   {
-    setFixedSize(12,12);
+    setFixedSize(12, 12);
     set_state (initial_state);
   }
 
@@ -48,16 +48,16 @@
 
     switch (state)
       {
-        case LED_STATE_NO:
-          break;
+      case LED_STATE_NO:
+        break;
 
-        case LED_STATE_INACTIVE:
-          col = QColor (Qt::darkRed);
-          break;
+      case LED_STATE_INACTIVE:
+        col = QColor (Qt::darkRed);
+        break;
 
-        case LED_STATE_ACTIVE:
-          col = QColor (Qt::darkGreen);
-          break;
+      case LED_STATE_ACTIVE:
+        col = QColor (Qt::darkGreen);
+        break;
       }
 
     setStyleSheet (style_sheet (col));
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/m-editor/file-editor-interface.h
--- a/libgui/src/m-editor/file-editor-interface.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/m-editor/file-editor-interface.h	Mon Nov 29 15:58:51 2021 -0800
@@ -54,7 +54,7 @@
     virtual QToolBar * toolbar (void) = 0;
     virtual QMenuBar * menubar (void) = 0;
 
-    virtual void insert_global_actions (QList<QAction*>) = 0;
+    virtual void insert_global_actions (QList<QAction *>) = 0;
     virtual void handle_enter_debug_mode (void) = 0;
     virtual void handle_exit_debug_mode (void) = 0;
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/m-editor/file-editor-tab.cc
--- a/libgui/src/m-editor/file-editor-tab.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/m-editor/file-editor-tab.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -155,10 +155,10 @@
     // row- and col-indicator
     m_row_indicator = new QLabel ("", this);
     QFontMetrics fm = m_row_indicator->fontMetrics ();
-    m_row_indicator->setMinimumSize (4.5*fm.averageCharWidth (),0);
+    m_row_indicator->setMinimumSize (4.5*fm.averageCharWidth (), 0);
     QLabel *row_label = new QLabel (tr ("line:"), this);
     m_col_indicator = new QLabel ("", this);
-    m_col_indicator->setMinimumSize (4*fm.averageCharWidth (),0);
+    m_col_indicator->setMinimumSize (4*fm.averageCharWidth (), 0);
     QLabel *col_label = new QLabel (tr ("col:"), this);
     m_status_bar->addWidget (row_label, 0);
     m_status_bar->addWidget (m_row_indicator, 0);
@@ -167,14 +167,14 @@
 
     // status bar: encoding
     QLabel *enc_label = new QLabel (tr ("encoding:"), this);
-    m_enc_indicator = new QLabel ("",this);
+    m_enc_indicator = new QLabel ("", this);
     m_status_bar->addWidget (enc_label, 0);
     m_status_bar->addWidget (m_enc_indicator, 0);
     m_status_bar->addWidget (new QLabel (" ", this), 0);
 
     // status bar: eol mode
     QLabel *eol_label = new QLabel (tr ("eol:"), this);
-    m_eol_indicator = new QLabel ("",this);
+    m_eol_indicator = new QLabel ("", this);
     m_status_bar->addWidget (eol_label, 0);
     m_status_bar->addWidget (m_eol_indicator, 0);
     m_status_bar->addWidget (new QLabel (" ", this), 0);
@@ -183,18 +183,18 @@
     m_edit_area->setMarginType (1, QsciScintilla::SymbolMargin);
     m_edit_area->setMarginSensitivity (1, true);
     m_edit_area->markerDefine (QsciScintilla::RightTriangle, marker::bookmark);
-    m_edit_area->setMarkerBackgroundColor (QColor (0,0,232), marker::bookmark);
+    m_edit_area->setMarkerBackgroundColor (QColor (0, 0, 232), marker::bookmark);
     m_edit_area->markerDefine (QsciScintilla::Circle, marker::breakpoint);
-    m_edit_area->setMarkerBackgroundColor (QColor (192,0,0), marker::breakpoint);
+    m_edit_area->setMarkerBackgroundColor (QColor (192, 0, 0), marker::breakpoint);
     m_edit_area->markerDefine (QsciScintilla::Circle, marker::cond_break);
-    m_edit_area->setMarkerBackgroundColor (QColor (255,127,0), marker::cond_break);
+    m_edit_area->setMarkerBackgroundColor (QColor (255, 127, 0), marker::cond_break);
     m_edit_area->markerDefine (QsciScintilla::RightArrow,
                                marker::debugger_position);
-    m_edit_area->setMarkerBackgroundColor (QColor (255,255,0),
+    m_edit_area->setMarkerBackgroundColor (QColor (255, 255, 0),
                                            marker::debugger_position);
     m_edit_area->markerDefine (QsciScintilla::RightArrow,
                                marker::unsure_debugger_position);
-    m_edit_area->setMarkerBackgroundColor (QColor (192,192,192),
+    m_edit_area->setMarkerBackgroundColor (QColor (192, 192, 192),
                                            marker::unsure_debugger_position);
 
     connect (m_edit_area, SIGNAL (marginClicked (int, int,
@@ -496,10 +496,10 @@
     if (! trackedFiles.isEmpty ())
       m_file_system_watcher.removePath (m_file_name);
     if (! fileName.isEmpty () && QFile::exists (fileName))
-    {
-      m_file_system_watcher.addPath (fileName);
-      m_last_modified =  QFileInfo (fileName).lastModified ().toUTC ();
-    }
+      {
+        m_file_system_watcher.addPath (fileName);
+        m_last_modified =  QFileInfo (fileName).lastModified ().toUTC ();
+      }
 
     // update lexer and file name variable if file name changes
     if (m_file_name != fileName)
@@ -922,7 +922,7 @@
         m_edit_area->setMarginsFont (line_numbers_font);
       }
     else
-      m_edit_area->setMarginWidth (2,0);
+      m_edit_area->setMarginWidth (2, 0);
   }
 
   // function for adding entries to the octave lexer's APIs
@@ -1043,7 +1043,7 @@
         // the returned line number.  Store whether to remove this breakpoint
         // afterwards.
         int first_bp_line
-              = m_edit_area->markerFindNext (0, (1 << marker::breakpoint)) + 1;
+          = m_edit_area->markerFindNext (0, (1 << marker::breakpoint)) + 1;
 
         // Set flag for storing the line number of the breakpoint
         m_breakpoint_info.remove_next = true;
@@ -1790,8 +1790,8 @@
 
     if (settings->value (ed_force_newline).toBool ())
       {
-        const QByteArray eol_lf = QByteArray (1,0x0a);
-        const QByteArray eol_cr = QByteArray (1,0x0d);
+        const QByteArray eol_lf = QByteArray (1, 0x0a);
+        const QByteArray eol_cr = QByteArray (1, 0x0d);
 
         if (text_data.endsWith (eol_lf))
           text_data.chop (1);   // remove LF
@@ -1921,8 +1921,8 @@
   {
     QByteArray text = m_edit_area->text ().toLatin1 ();
 
-    QByteArray eol_lf = QByteArray (1,0x0a);
-    QByteArray eol_cr = QByteArray (1,0x0d);
+    QByteArray eol_lf = QByteArray (1, 0x0a);
+    QByteArray eol_cr = QByteArray (1, 0x0d);
     QByteArray eol_crlf = eol_cr;
     eol_crlf.append (eol_lf);
 
@@ -2373,7 +2373,7 @@
     QFileDialog *file_dialog = qobject_cast<QFileDialog *> (sender ());
 
     QRegExp rx ("\\*\\.([^ ^\\)]*)[ \\)]");   // regexp for suffix in filter
-    int index = rx.indexIn (filter,0);        // get first suffix in filter
+    int index = rx.indexIn (filter, 0);       // get first suffix in filter
 
     if (index > -1)
       file_dialog->setDefaultSuffix (rx.cap (1)); // found a suffix, set default
@@ -2488,7 +2488,7 @@
 
     // If overwrite confirmation was not done by the file dialog (in case
     // of native file dialogs, see above), do it here
-    if(file_dialog->testOption (QFileDialog::DontConfirmOverwrite) && file.exists ())
+    if (file_dialog->testOption (QFileDialog::DontConfirmOverwrite) && file.exists ())
       {
         int ans = QMessageBox::question (file_dialog,
                               tr ("Octave Editor"),
@@ -2797,9 +2797,9 @@
       cursor_blinking = settings->value (cs_cursor_blinking).toBool ();
 
     if (cursor_blinking)
-      m_edit_area->SendScintilla (QsciScintillaBase::SCI_SETCARETPERIOD,500);
+      m_edit_area->SendScintilla (QsciScintillaBase::SCI_SETCARETPERIOD, 500);
     else
-      m_edit_area->SendScintilla (QsciScintillaBase::SCI_SETCARETPERIOD,0);
+      m_edit_area->SendScintilla (QsciScintillaBase::SCI_SETCARETPERIOD, 0);
 
   }
 
@@ -3180,7 +3180,7 @@
                                             true,    // whole words only
                                             false,   // do not wrap
                                             true,    // forward
-                                            0,0,     // from the beginning
+                                            0, 0,    // from the beginning
                                             false
 #if defined (HAVE_QSCI_VERSION_2_6_0)
                                             , true
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/m-editor/file-editor-tab.h
--- a/libgui/src/m-editor/file-editor-tab.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/m-editor/file-editor-tab.h	Mon Nov 29 15:58:51 2021 -0800
@@ -268,7 +268,7 @@
                     bool restore_breakpoints = true);
     void save_file_as (bool remove_on_success = false);
     bool check_valid_identifier (QString file_name);
-    QTextCodec* check_valid_codec (void);
+    QTextCodec * check_valid_codec (void);
 
     bool unchanged_or_saved (void);
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/m-editor/file-editor.cc
--- a/libgui/src/m-editor/file-editor.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/m-editor/file-editor.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -82,7 +82,7 @@
     setMovable (true);
   }
 
-  tab_bar * file_editor_tab_widget::get_tab_bar (void) const
+  tab_bar *file_editor_tab_widget::get_tab_bar (void) const
   {
     return qobject_cast<tab_bar *> (tabBar ());
   }
@@ -144,7 +144,7 @@
 
   // insert global actions, that should also be displayed in the editor window,
   // into the editor's menu and/or toolbar
-  void file_editor::insert_global_actions (QList<QAction*> shared_actions)
+  void file_editor::insert_global_actions (QList<QAction *> shared_actions)
   {
     // actions/menus that have to be added to the toolbar or the menu
     QAction *open_action = shared_actions.at (OPEN_ACTION);
@@ -159,21 +159,21 @@
     // actions that are additionally enabled/disabled later by the editor
     // undo
     m_undo_action = shared_actions.at (UNDO_ACTION);
-    m_tool_bar->insertAction (m_redo_action,m_undo_action);
-    m_edit_menu->insertAction (m_redo_action,m_undo_action);
+    m_tool_bar->insertAction (m_redo_action, m_undo_action);
+    m_edit_menu->insertAction (m_redo_action, m_undo_action);
     // select all
     m_selectall_action = shared_actions.at (SELECTALL_ACTION);
-    m_edit_menu->insertAction (m_find_action,m_selectall_action);
+    m_edit_menu->insertAction (m_find_action, m_selectall_action);
     m_edit_menu->insertSeparator (m_find_action);
     // paste
     m_paste_action = shared_actions.at (PASTE_ACTION);
-    m_tool_bar->insertAction (m_find_action,m_paste_action);
-    m_edit_menu->insertAction (m_selectall_action,m_paste_action);
+    m_tool_bar->insertAction (m_find_action, m_paste_action);
+    m_edit_menu->insertAction (m_selectall_action, m_paste_action);
     m_edit_menu->insertSeparator (m_selectall_action);
     // copy
     m_copy_action = shared_actions.at (COPY_ACTION);
-    m_tool_bar->insertAction (m_paste_action,m_copy_action);
-    m_edit_menu->insertAction (m_paste_action,m_copy_action);
+    m_tool_bar->insertAction (m_paste_action, m_copy_action);
+    m_edit_menu->insertAction (m_paste_action, m_copy_action);
     // find files
     m_find_files_action = shared_actions.at (FIND_FILES_ACTION);
     m_edit_menu->insertAction (m_find_action, m_find_files_action);
@@ -401,7 +401,7 @@
       m_find_dialog->set_visible (enable);
 
     // Take care of the shortcuts
-    QHash<QMenu*, QStringList>::const_iterator i = m_hash_menu_text.constBegin ();
+    QHash<QMenu *, QStringList>::const_iterator i = m_hash_menu_text.constBegin ();
 
     while (i != m_hash_menu_text.constEnd ())
       {
@@ -894,7 +894,7 @@
     m_find_dialog->addAction (m_find_previous_action);
 
     // Update edit area
-    file_editor_tab* fet
+    file_editor_tab *fet
       = static_cast<file_editor_tab *> (m_tab_widget->currentWidget ());
     m_find_dialog->update_edit_area (fet->qsci_edit_area ());
 
@@ -1676,7 +1676,7 @@
                                                   tr ("Octave Editor"),
                                                   tr ("File\n%1\ndoes not exist. "
                                                       "Do you want to create it?").arg (openFileName),
-                                                  QMessageBox::NoButton,nullptr);
+                                                  QMessageBox::NoButton, nullptr);
                         QPushButton *create_button =
                           msgBox->addButton (tr ("Create"), QMessageBox::YesRole);
                         msgBox->addButton (tr ("Cancel"), QMessageBox::RejectRole);
@@ -1968,15 +1968,15 @@
     m_fileMenu->addSeparator ();
 
     m_close_action
-      = add_action (m_fileMenu, rmgr.icon ("window-close",false),
+      = add_action (m_fileMenu, rmgr.icon ("window-close", false),
                     tr ("&Close"), SLOT (request_close_file (bool)));
 
     m_close_all_action
-      = add_action (m_fileMenu, rmgr.icon ("window-close",false),
+      = add_action (m_fileMenu, rmgr.icon ("window-close", false),
                     tr ("Close All"), SLOT (request_close_all_files (bool)));
 
     m_close_others_action
-      = add_action (m_fileMenu, rmgr.icon ("window-close",false),
+      = add_action (m_fileMenu, rmgr.icon ("window-close", false),
                     tr ("Close Other Files"),
                     SLOT (request_close_other_files (bool)));
 
@@ -2410,13 +2410,13 @@
       qsci->undo ();
   }
 
-  file_editor_tab* file_editor::reset_focus (void)
+  file_editor_tab *file_editor::reset_focus (void)
   {
     // Reset the focus of the tab and the related edit area
     file_editor_tab *f
-       = static_cast<file_editor_tab *> (m_tab_widget->currentWidget ());
-     emit fetab_set_focus (f);
-     return f;
+      = static_cast<file_editor_tab *> (m_tab_widget->currentWidget ());
+    emit fetab_set_focus (f);
+    return f;
   }
 
   file_editor_tab *
@@ -2432,7 +2432,7 @@
              this, &file_editor::create_context_menu);
 
     connect (f->qsci_edit_area (),
-             SIGNAL (SCN_AUTOCCOMPLETED (const char*, int, int, int)),
+             SIGNAL (SCN_AUTOCCOMPLETED (const char *, int, int, int)),
              this, SLOT (reset_focus (void)));
 
     connect (f->qsci_edit_area (), SIGNAL (SCN_AUTOCCANCELLED (void)),
@@ -2480,8 +2480,8 @@
     connect (this, &file_editor::fetab_change_request,
              f, &file_editor_tab::change_editor_state);
 
-    connect (this, QOverload<const QWidget*, const QString&, bool>::of (&file_editor::fetab_save_file),
-             f, QOverload<const QWidget*, const QString&, bool>::of (&file_editor_tab::save_file));
+    connect (this, QOverload<const QWidget *, const QString&, bool>::of (&file_editor::fetab_save_file),
+             f, QOverload<const QWidget *, const QString&, bool>::of (&file_editor_tab::save_file));
 
     // Signals from the file_editor trivial operations
     connect (this, &file_editor::fetab_recover_from_exit,
@@ -2503,8 +2503,8 @@
     connect (this, &file_editor::fetab_context_edit,
              f, &file_editor_tab::context_edit);
 
-    connect (this, QOverload<const QWidget*>::of (&file_editor::fetab_save_file),
-             f, QOverload<const QWidget*>::of (&file_editor_tab::save_file));
+    connect (this, QOverload<const QWidget *>::of (&file_editor::fetab_save_file),
+             f, QOverload<const QWidget *>::of (&file_editor_tab::save_file));
 
     connect (this, &file_editor::fetab_save_file_as,
              f, QOverload<const QWidget *>::of (&file_editor_tab::save_file_as));
@@ -2790,7 +2790,7 @@
   }
 
   // Check whether this file is already open in the editor.
-  file_editor_tab * file_editor::find_tab_widget (const QString& file)
+  file_editor_tab *file_editor::find_tab_widget (const QString& file)
   {
     std::string std_file = file.toStdString ();
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/m-editor/file-editor.h
--- a/libgui/src/m-editor/file-editor.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/m-editor/file-editor.h	Mon Nov 29 15:58:51 2021 -0800
@@ -101,7 +101,7 @@
 
     QMenuBar * menubar (void) { return m_menu_bar; }
 
-    void insert_global_actions (QList<QAction*>);
+    void insert_global_actions (QList<QAction *>);
 
     enum shared_actions_idx
     {
@@ -151,7 +151,7 @@
     void fetab_convert_eol (const QWidget *ID, QsciScintilla::EolMode eol_mode);
     void fetab_goto_line (const QWidget *ID, int line = -1);
     void fetab_move_match_brace (const QWidget *ID, bool select);
-    void fetab_completion (const QWidget*);
+    void fetab_completion (const QWidget *);
     void fetab_insert_debugger_pointer (const QWidget *ID, int line = -1);
     void fetab_delete_debugger_pointer (const QWidget *ID, int line = -1);
     void fetab_do_breakpoint_marker (bool insert, const QWidget *ID,
@@ -292,7 +292,7 @@
 
     void handle_autoc_cancelled (void);
 
-    file_editor_tab* reset_focus (void);
+    file_editor_tab * reset_focus (void);
 
   protected slots:
 
@@ -361,7 +361,7 @@
     QMenu * add_menu (QMenuBar *p, QString text);
 
     int m_number_of_tabs;
-    QHash<QMenu*, QStringList> m_hash_menu_text;
+    QHash<QMenu *, QStringList> m_hash_menu_text;
 
     QString m_ced;
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/m-editor/find-dialog.cc
--- a/libgui/src/m-editor/find-dialog.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/m-editor/find-dialog.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -197,8 +197,8 @@
     m_rep_active = false;
 
     // Connect required external signals
-    connect (ed, SIGNAL (edit_area_changed (octave_qscintilla*)),
-             this, SLOT (update_edit_area (octave_qscintilla*)));
+    connect (ed, SIGNAL (edit_area_changed (octave_qscintilla *)),
+             this, SLOT (update_edit_area (octave_qscintilla *)));
 
     setWindowModality (Qt::NonModal);
 
@@ -207,7 +207,7 @@
   }
 
   // The edit_area has changed: update relevant data of the file dialog
-  void find_dialog::update_edit_area (octave_qscintilla* edit_area)
+  void find_dialog::update_edit_area (octave_qscintilla *edit_area)
   {
     m_edit_area = edit_area;
     m_search_selection_check_box->setEnabled (edit_area->hasSelectedText ());
@@ -297,19 +297,19 @@
     int xp = ed_bottom_right.x () - sizeHint ().width ();
     int yp = ed_bottom_right.y () - sizeHint ().height ();
 
-    m_last_position = s->value (ed_fdlg_pos.key, QPoint (xp,yp)).toPoint ();
+    m_last_position = s->value (ed_fdlg_pos.key, QPoint (xp, yp)).toPoint ();
     move (m_last_position);
 
     if (QApplication::desktop ()->screenNumber (this) == -1)
       {
         // Last used position is not on screen anymore, use default pos.
-        m_last_position = QPoint (xp,yp);
+        m_last_position = QPoint (xp, yp);
         move (m_last_position);
 
         if (QApplication::desktop ()->screenNumber (this) == -1)
           {
             // Default position is not on screen, last resort
-            m_last_position = QPoint (50,100);  // upper left
+            m_last_position = QPoint (50, 100); // upper left
             move (m_last_position);
           }
       }
@@ -396,7 +396,7 @@
     if (m_edit_area && m_edit_area->hasSelectedText ())
       {
         int lbeg, lend, cbeg, cend;
-        m_edit_area->getSelection (&lbeg,&cbeg,&lend,&cend);
+        m_edit_area->getSelection (&lbeg, &cbeg, &lend, &cend);
         if (lbeg == lend)
           m_search_line_edit->setCurrentText (m_edit_area->selectedText ());
       }
@@ -505,10 +505,10 @@
           {
             // Start from where the cursor is.  Fix QScintilla's cursor
             // positioning
-            m_edit_area->getCursorPosition (&line,&col);
+            m_edit_area->getCursorPosition (&line, &col);
             if (m_find_result_available && m_edit_area->hasSelectedText ())
               {
-                int currpos = m_edit_area->positionFromLineIndex (line,col);
+                int currpos = m_edit_area->positionFromLineIndex (line, col);
                 currpos -= (m_search_line_edit->currentText ().length ());
                 if (currpos < 0)
                   currpos = 0;
@@ -520,17 +520,17 @@
     // Do the search
     m_find_result_available
       = m_edit_area->findFirst (m_search_line_edit->currentText (),
-                               m_regex_check_box->isChecked (),
-                               m_case_check_box->isChecked (),
-                               m_whole_words_check_box->isChecked (),
-                               do_wrap,
-                               do_forward,
-                               line,col,
-                               true
+                                m_regex_check_box->isChecked (),
+                                m_case_check_box->isChecked (),
+                                m_whole_words_check_box->isChecked (),
+                                do_wrap,
+                                do_forward,
+                                line, col,
+                                true
 #if defined (HAVE_QSCI_VERSION_2_6_0)
-                               , true
+                                , true
 #endif
-                              );
+                               );
 
     if (m_find_result_available)
       {
@@ -540,7 +540,7 @@
 
         if (m_in_sel)
           {
-            m_edit_area->getCursorPosition (&line,&col);
+            m_edit_area->getCursorPosition (&line, &col);
             int pos = m_edit_area->positionFromLineIndex (line, col);
 
             int l1, c1, l2, c2;
@@ -614,7 +614,7 @@
       {
         handle_replace_text_changed ();
 
-        m_edit_area->getCursorPosition (&line,&col);
+        m_edit_area->getCursorPosition (&line, &col);
 
         m_rep_all = 1;
         find_next ();  // find first occurrence (forward)
@@ -637,7 +637,7 @@
         m_find_result_available = false;
 
         if (! m_search_selection_check_box->isChecked ())
-          m_edit_area->setCursorPosition (line,col);
+          m_edit_area->setCursorPosition (line, col);
       }
   }
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/m-editor/find-dialog.h
--- a/libgui/src/m-editor/find-dialog.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/m-editor/find-dialog.h	Mon Nov 29 15:58:51 2021 -0800
@@ -107,7 +107,7 @@
     void find_prev (void);
 
     //! Slot for updating the edit area when the active tab has changed
-    void update_edit_area (octave_qscintilla*);
+    void update_edit_area (octave_qscintilla *);
 
   private slots:
 
@@ -131,7 +131,7 @@
     void reject ();
 
     //! Reimplemented close event
-    void closeEvent (QCloseEvent* e);
+    void closeEvent (QCloseEvent *e);
 
     //! Update mru lists with new entry
     void mru_update (QComboBox *mru);
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/m-editor/marker.cc
--- a/libgui/src/m-editor/marker.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/m-editor/marker.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -88,7 +88,7 @@
   }
 
   void marker::handle_find_translation (int linenr, int& translation_linenr,
-                                        marker *& bp)
+                                        marker *&bp)
   {
     if (m_original_linenr == linenr)
       {
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/m-editor/octave-qscintilla.cc
--- a/libgui/src/m-editor/octave-qscintilla.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/m-editor/octave-qscintilla.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -359,9 +359,9 @@
                                                      QPoint *local_pos)
   {
     long position = SendScintilla (SCI_GETCURRENTPOS);
-    long point_x  = SendScintilla (SCI_POINTXFROMPOSITION,0,position);
-    long point_y  = SendScintilla (SCI_POINTYFROMPOSITION,0,position);
-    *local_pos = QPoint (point_x,point_y);  // local cursor position
+    long point_x  = SendScintilla (SCI_POINTXFROMPOSITION, 0, position);
+    long point_y  = SendScintilla (SCI_POINTYFROMPOSITION, 0, position);
+    *local_pos = QPoint (point_x, point_y); // local cursor position
     *global_pos = mapToGlobal (*local_pos); // global position of cursor
   }
 
@@ -836,7 +836,7 @@
 #else
                                                QString::SkipEmptyParts);
 #endif
-  for (int i = 0; i < lines.count (); i++)
+    for (int i = 0; i < lines.count (); i++)
       {
         QString line = lines.at (i);
         if (line.trimmed ().isEmpty ())
@@ -904,7 +904,7 @@
         });
 
     // Disable opening a file at a breakpoint in case keyboard () is used
-    gui_settings* settings = rmgr.get_settings ();
+    gui_settings *settings = rmgr.get_settings ();
     bool show_dbg_file = settings->value (ed_show_dbg_file).toBool ();
     settings->setValue (ed_show_dbg_file.key, false);
 
@@ -1145,18 +1145,18 @@
       }
     endUndoAction ();
 
-      // restore the visible area
-      setFirstVisibleLine (first_line);
+    // restore the visible area
+    setFirstVisibleLine (first_line);
 
-      // fix cursor column if outside of new line length
-      int eol_len = eol_string ().length ();
-      if (line == lines () - 1)
-        eol_len = 0;
-      const int col_max = text (line).length () - eol_len;
-      if (col_max < col)
-        col = col_max;
+    // fix cursor column if outside of new line length
+    int eol_len = eol_string ().length ();
+    if (line == lines () - 1)
+      eol_len = 0;
+    const int col_max = text (line).length () - eol_len;
+    if (col_max < col)
+      col = col_max;
 
-      setCursorPosition (line, col);
+    setCursorPosition (line, col);
   }
 
   bool octave_qscintilla::event (QEvent *e)
@@ -1166,12 +1166,12 @@
         QHelpEvent *help_e = static_cast<QHelpEvent *>(e);
         QString variable = wordAtPoint (help_e->pos());
         QStringList symbol_names
-            = m_octave_qobj.get_workspace_model ()->get_symbol_names ();
+          = m_octave_qobj.get_workspace_model ()->get_symbol_names ();
         int symbol_idx = symbol_names.indexOf (variable);
         if (symbol_idx > -1)
           {
             QStringList symbol_values
-                = m_octave_qobj.get_workspace_model ()->get_symbol_values ();
+              = m_octave_qobj.get_workspace_model ()->get_symbol_values ();
             QToolTip::showText (help_e->globalPos(), variable
                                 + " = " + symbol_values.at (symbol_idx));
           }
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/m-editor/octave-qscintilla.h
--- a/libgui/src/m-editor/octave-qscintilla.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/m-editor/octave-qscintilla.h	Mon Nov 29 15:58:51 2021 -0800
@@ -89,15 +89,15 @@
 
     void update_rowcol_indicator_signal (int line, int col);
     void execute_command_in_terminal_signal (const QString&);
-    void create_context_menu_signal (QMenu*);
+    void create_context_menu_signal (QMenu *);
     void context_menu_edit_signal (const QString&);
     void qsci_has_focus_signal (bool);
     void status_update (bool, bool);
     void show_doc_signal (const QString&);
     void context_menu_break_condition_signal (int);
     void context_menu_break_once (int);
-    void ctx_menu_run_finished_signal (bool, int, QTemporaryFile*,
-                                       QTemporaryFile*, bool, bool);
+    void ctx_menu_run_finished_signal (bool, int, QTemporaryFile *,
+                                       QTemporaryFile *, bool, bool);
     void focus_console_after_command_signal (void);
 
     void interpreter_event (const fcn_callback& fcn);
@@ -110,7 +110,7 @@
 
   private slots:
 
-    void ctx_menu_run_finished (bool, int, QTemporaryFile*, QTemporaryFile*,
+    void ctx_menu_run_finished (bool, int, QTemporaryFile *, QTemporaryFile *,
                                 bool, bool);
 
     void contextmenu_help (bool);
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/main-window.cc
--- a/libgui/src/main-window.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/main-window.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -524,8 +524,8 @@
     // (when pressing <alt>), we can return immediately and reset the
     // focus to the previous widget
     if (! new_widget
-          || (new_widget == menuBar ())
-          || (new_widget == m_editor_menubar))
+        || (new_widget == menuBar ())
+        || (new_widget == m_editor_menubar))
       {
         if (m_active_dock)
           m_active_dock->setFocus ();
@@ -949,7 +949,7 @@
 
     QStyle *st = style ();
     int icon_size = st->pixelMetric (global_icon_sizes[size_idx]);
-    m_main_tool_bar->setIconSize (QSize (icon_size,icon_size));
+    m_main_tool_bar->setIconSize (QSize (icon_size, icon_size));
 
     if (settings->value (global_status_bar).toBool ())
       m_status_bar->show ();
@@ -1853,7 +1853,7 @@
 
   void main_window::disable_menu_shortcuts (bool disable)
   {
-    QHash<QMenu*, QStringList>::const_iterator i = m_hash_menu_text.constBegin ();
+    QHash<QMenu *, QStringList>::const_iterator i = m_hash_menu_text.constBegin ();
 
     while (i != m_hash_menu_text.constEnd ())
       {
@@ -2132,7 +2132,7 @@
 #if defined (HAVE_QSCINTILLA)
     // call the editor to add actions which should also be available in the
     // editor's menu and tool bar
-    QList<QAction*> shared_actions;
+    QList<QAction *> shared_actions;
     shared_actions << m_new_script_action
                    << m_new_function_action
                    << m_open_action
@@ -2154,8 +2154,8 @@
     resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
 
     m_open_action = add_action (
-                    file_menu, rmgr.icon ("document-open"), tr ("Open..."),
-                    SLOT (request_open_file (void)), this);
+                      file_menu, rmgr.icon ("document-open"), tr ("Open..."),
+                      SLOT (request_open_file (void)), this);
     m_open_action->setToolTip (tr ("Open an existing file in editor"));
 
 #if defined (HAVE_QSCINTILLA)
@@ -2713,9 +2713,9 @@
 #if defined (HAVE_QMAINWINDOW_RESIZEDOCKS)
     // resizeDockWidget was added to Qt in Qt 5.6
     if (width >= 0)
-      resizeDocks ({dw},{width},Qt::Horizontal);
+      resizeDocks ({dw}, {width}, Qt::Horizontal);
     if (height >= 0)
-      resizeDocks ({dw},{height},Qt::Vertical);
+      resizeDocks ({dw}, {height}, Qt::Vertical);
 #else
     // This replacement of resizeDockWidget is not very reliable.
     // But even if Qt4 is not yet
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/main-window.h
--- a/libgui/src/main-window.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/main-window.h	Mon Nov 29 15:58:51 2021 -0800
@@ -283,7 +283,7 @@
                                          const char *member);
     void construct_debug_menu (QMenuBar *p);
     QAction * construct_window_menu_item (QMenu *p, const QString& item,
-                                          bool checkable, QWidget*);
+                                          bool checkable, QWidget *);
     void construct_tools_menu (QMenuBar *p);
     void construct_window_menu (QMenuBar *p);
     void construct_help_menu (QMenuBar *p);
@@ -305,7 +305,7 @@
 
     base_qobject& m_octave_qobj;
 
-    QHash<QMenu*, QStringList> m_hash_menu_text;
+    QHash<QMenu *, QStringList> m_hash_menu_text;
 
     QString m_default_encoding;
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/octave-dock-widget.cc
--- a/libgui/src/octave-dock-widget.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/octave-dock-widget.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -80,7 +80,7 @@
     m_dock_button = new QToolButton (m_title_widget);
     m_dock_button->setDefaultAction (m_dock_action);
     m_dock_button->setFocusPolicy (Qt::NoFocus);
-    m_dock_button->setIconSize (QSize (m_icon_size,m_icon_size));
+    m_dock_button->setIconSize (QSize (m_icon_size, m_icon_size));
 
     m_close_action = new QAction
       (QIcon (":/actions/icons/widget-close.png"), "", this);
@@ -88,7 +88,7 @@
     m_close_button = new QToolButton (m_title_widget);
     m_close_button->setDefaultAction (m_close_action);
     m_close_button->setFocusPolicy (Qt::NoFocus);
-    m_close_button->setIconSize (QSize (m_icon_size,m_icon_size));
+    m_close_button->setIconSize (QSize (m_icon_size, m_icon_size));
 
     QString css_button = QString ("QToolButton {background: transparent; border: 0px;}");
     m_dock_button->setStyleSheet (css_button);
@@ -99,7 +99,7 @@
     h_layout->addWidget (m_dock_button);
     h_layout->addWidget (m_close_button);
     h_layout->setSpacing (10);
-    h_layout->setContentsMargins (5,2,2,2);
+    h_layout->setContentsMargins (5, 2, 2, 2);
 
     m_title_widget->setLayout (h_layout);
 
@@ -108,11 +108,11 @@
         // Only connect the when a parent (main window) is given
         // copy & paste handling
         connect (p, SIGNAL (copyClipboard_signal ()),
-                this, SLOT (copyClipboard ()));
+                 this, SLOT (copyClipboard ()));
         connect (p, SIGNAL (pasteClipboard_signal ()),
-                this, SLOT (pasteClipboard ()));
+                 this, SLOT (pasteClipboard ()));
         connect (p, SIGNAL (selectAll_signal ()),
-                this, SLOT (selectAll ()));
+                 this, SLOT (selectAll ()));
 
         // undo handling
         connect (p, SIGNAL (undo_signal ()), this, SLOT (do_undo ()));
@@ -127,7 +127,7 @@
       = static_cast<QHBoxLayout *> (m_title_widget->layout ());
     QLabel *label = new QLabel (title, m_title_widget);
     label->setStyleSheet ("background-color: transparent;");
-    h_layout->insertWidget (0,label);
+    h_layout->insertWidget (0, label);
     setTitleBarWidget (m_title_widget);
     setWindowTitle (title);
   }
@@ -534,37 +534,37 @@
         default_dock_size = QRect (0, 0, w/10, h/10);
       }
 
-      m_recent_float_geom
-        = settings->value (dw_float_geometry.key.arg (objectName ()),
-                             default_floating_size).toRect ();
+    m_recent_float_geom
+      = settings->value (dw_float_geometry.key.arg (objectName ()),
+                         default_floating_size).toRect ();
 
-      QWidget dummy;
-      dummy.setGeometry (m_recent_float_geom);
+    QWidget dummy;
+    dummy.setGeometry (m_recent_float_geom);
 
-      if (QApplication::desktop ()->screenNumber (&dummy) == -1)
-        m_recent_float_geom = default_floating_size;
+    if (QApplication::desktop ()->screenNumber (&dummy) == -1)
+      m_recent_float_geom = default_floating_size;
 
-      // The following is required for ensure smooth transition from old
-      // saveGeomety to new QRect setting (see comment for restoring size
-      // of docked widgets)
-      QVariant dock_geom
-        = settings->value (dw_dock_geometry.key.arg (objectName ()),
-                           default_dock_size);
-      if (dock_geom.canConvert (QMetaType::QRect))
-        m_recent_dock_geom = dock_geom.toRect ();
-      else
-        m_recent_dock_geom = dw_dock_geometry.def.toRect ();
+    // The following is required for ensure smooth transition from old
+    // saveGeomety to new QRect setting (see comment for restoring size
+    // of docked widgets)
+    QVariant dock_geom
+      = settings->value (dw_dock_geometry.key.arg (objectName ()),
+                         default_dock_size);
+    if (dock_geom.canConvert (QMetaType::QRect))
+      m_recent_dock_geom = dock_geom.toRect ();
+    else
+      m_recent_dock_geom = dw_dock_geometry.def.toRect ();
 
     notice_settings (settings);  // call individual handler
 
     set_style (false);
 
     // Compacter design
-    QToolBar* toolbar = findChild <QToolBar *> ();
+    QToolBar *toolbar = findChild <QToolBar *> ();
     if (toolbar)
       toolbar->setStyleSheet (toolbar->styleSheet () + global_toolbar_style);
 
-    QMenuBar* menubar = findChild <QMenuBar *> ();
+    QMenuBar *menubar = findChild <QMenuBar *> ();
     if (menubar)
       menubar->setStyleSheet (menubar->styleSheet () + global_menubar_style);
 
@@ -628,7 +628,7 @@
     if (m_focus_follows_mouse && ! isFloating () && (e->type () == QEvent::Enter))
       activate ();
 
-    return QDockWidget::eventFilter (obj,e);
+    return QDockWidget::eventFilter (obj, e);
   }
 
   void
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/octave-dock-widget.h
--- a/libgui/src/octave-dock-widget.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/octave-dock-widget.h	Mon Nov 29 15:58:51 2021 -0800
@@ -132,7 +132,7 @@
 
     void handle_settings (const gui_settings *);
 
-    void handle_active_dock_changed (octave_dock_widget*, octave_dock_widget*);
+    void handle_active_dock_changed (octave_dock_widget *, octave_dock_widget *);
 
     void save_settings (void);
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/octave-qobject.cc
--- a/libgui/src/octave-qobject.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/octave-qobject.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -133,7 +133,7 @@
   // Disable all Qt messages by default.
 
   static void
-  message_handler (QtMsgType, const QMessageLogContext &, const QString &)
+  message_handler (QtMsgType, const QMessageLogContext&, const QString&)
   { }
 
   //! Reimplement QApplication::notify.  Octave's own exceptions are
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/octave-qobject.h
--- a/libgui/src/octave-qobject.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/octave-qobject.h	Mon Nov 29 15:58:51 2021 -0800
@@ -131,7 +131,7 @@
       return ! m_terminal_widget.isNull ();
     }
 
-    main_window* get_main_window (void)
+    main_window * get_main_window (void)
     {
       return m_main_window;
     }
@@ -194,7 +194,7 @@
 
     QPointer<release_notes> release_notes_widget (void);
 
-    QThread *main_thread (void) { return m_main_thread; }
+    QThread * main_thread (void) { return m_main_thread; }
 
     // Declared virtual so that a derived class may redefine this
     // method.
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/octave-qtutils.h
--- a/libgui/src/octave-qtutils.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/octave-qtutils.h	Mon Nov 29 15:58:51 2021 -0800
@@ -39,42 +39,42 @@
 template <typename... Args>
 struct QNonConstOverload
 {
-    template <typename R, typename T>
-    constexpr auto operator()(R (T::*ptr)(Args...)) const noexcept -> decltype(ptr)
-    { return ptr; }
+  template <typename R, typename T>
+  constexpr auto operator()(R (T::*ptr)(Args...)) const noexcept -> decltype(ptr)
+  { return ptr; }
 
-    template <typename R, typename T>
-    static constexpr auto of(R (T::*ptr)(Args...)) noexcept -> decltype(ptr)
-    { return ptr; }
+  template <typename R, typename T>
+  static constexpr auto of(R (T::*ptr)(Args...)) noexcept -> decltype(ptr)
+  { return ptr; }
 };
 
 template <typename... Args>
 struct QConstOverload
 {
-    template <typename R, typename T>
-    constexpr auto operator()(R (T::*ptr)(Args...) const) const noexcept -> decltype(ptr)
-    { return ptr; }
+  template <typename R, typename T>
+  constexpr auto operator()(R (T::*ptr)(Args...) const) const noexcept -> decltype(ptr)
+  { return ptr; }
 
-    template <typename R, typename T>
-    static constexpr auto of(R (T::*ptr)(Args...) const) noexcept -> decltype(ptr)
-    { return ptr; }
+  template <typename R, typename T>
+  static constexpr auto of(R (T::*ptr)(Args...) const) noexcept -> decltype(ptr)
+  { return ptr; }
 };
 
 template <typename... Args>
 struct QOverload : QConstOverload<Args...>, QNonConstOverload<Args...>
 {
-    using QConstOverload<Args...>::of;
-    using QConstOverload<Args...>::operator();
-    using QNonConstOverload<Args...>::of;
-    using QNonConstOverload<Args...>::operator();
+  using QConstOverload<Args...>::of;
+  using QConstOverload<Args...>::operator();
+  using QNonConstOverload<Args...>::of;
+  using QNonConstOverload<Args...>::operator();
 
-    template <typename R>
-    constexpr auto operator()(R (*ptr)(Args...)) const noexcept -> decltype(ptr)
-    { return ptr; }
+  template <typename R>
+  constexpr auto operator()(R (*ptr)(Args...)) const noexcept -> decltype(ptr)
+  { return ptr; }
 
-    template <typename R>
-    static constexpr auto of(R (*ptr)(Args...)) noexcept -> decltype(ptr)
-    { return ptr; }
+  template <typename R>
+  static constexpr auto of(R (*ptr)(Args...)) noexcept -> decltype(ptr)
+  { return ptr; }
 };
 
 #endif
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/qt-interpreter-events.cc
--- a/libgui/src/qt-interpreter-events.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/qt-interpreter-events.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -422,10 +422,10 @@
       {
         for (int j = 0; j < img.width (); j++)
           {
-            retval(i,j,2) = bits[0];
-            retval(i,j,1) = bits[1];
-            retval(i,j,0) = bits[2];
-            retval(i,j,3) = bits[3];
+            retval(i, j, 2) = bits[0];
+            retval(i, j, 1) = bits[1];
+            retval(i, j, 0) = bits[2];
+            retval(i, j, 3) = bits[3];
 
             bits += 4;
           }
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/release-notes.cc
--- a/libgui/src/release-notes.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/release-notes.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -53,7 +53,7 @@
     // handled here?
     if (dw_icon_set_names[icon_set_found].name != "NONE")
       m_release_notes_icon = dw_icon_set_names[icon_set_found].path
-        + "ReleaseWidget.png";
+                             + "ReleaseWidget.png";
     else
       m_release_notes_icon = ":/actions/icons/logo.png";
 #endif
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/resource-manager.cc
--- a/libgui/src/resource-manager.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/resource-manager.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -493,7 +493,7 @@
       {
         // Use a proxy, collect all required information
         QString proxy_type_string
-            = m_settings->value (global_proxy_type.key, global_proxy_type.def).toString ();
+          = m_settings->value (global_proxy_type.key, global_proxy_type.def).toString ();
 
         // The proxy type for the Qt proxy settings
         if (proxy_type_string == "Socks5Proxy")
@@ -532,9 +532,11 @@
         if (proxy_type_string == global_proxy_all_types.at (2))
           {
             const std::array<std::string, 6> env_vars =
-                { "ALL_PROXY", "all_proxy",
-                  "HTTP_PROXY", "http_proxy",
-                  "HTTPS_PROXY", "https_proxy" };
+            {
+              "ALL_PROXY", "all_proxy",
+              "HTTP_PROXY", "http_proxy",
+              "HTTPS_PROXY", "https_proxy"
+            };
 
             unsigned int count = 0;
             while (! proxy_url.isValid () && count < env_vars.size ())
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/set-path-dialog.cc
--- a/libgui/src/set-path-dialog.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/set-path-dialog.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -164,7 +164,7 @@
     QGridLayout *main_layout = new QGridLayout;
     main_layout->addWidget (m_info_label, 0, 0);
     main_layout->addLayout (main_hboxlayout, 1, 0);
-    main_layout->addWidget (button_box,2, 0);
+    main_layout->addWidget (button_box, 2, 0);
 
     setLayout (main_layout);
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/settings-dialog.cc
--- a/libgui/src/settings-dialog.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/settings-dialog.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -212,19 +212,19 @@
 
     // focus follows mouse
     cb_focus_follows_mouse->setChecked (
-        settings->value (dw_focus_follows_mouse).toBool ());
+      settings->value (dw_focus_follows_mouse).toBool ());
 
     // prompt on exit
     cb_prompt_to_exit->setChecked (
-        settings->value (global_prompt_to_exit.key, global_prompt_to_exit.def).toBool ());
+      settings->value (global_prompt_to_exit.key, global_prompt_to_exit.def).toBool ());
 
     // Main status bar
     cb_status_bar->setChecked (
-        settings->value (global_status_bar.key, global_status_bar.def).toBool ());
+      settings->value (global_status_bar.key, global_status_bar.def).toBool ());
 
     // Octave startup
     cb_restore_octave_dir->setChecked (
-        settings->value (global_restore_ov_dir.key, global_restore_ov_dir.def).toBool ());
+      settings->value (global_restore_ov_dir.key, global_restore_ov_dir.def).toBool ());
     le_octave_dir->setText (settings->value (global_ov_startup_dir.key,
                                              global_ov_startup_dir.def).toString ());
 
@@ -467,7 +467,7 @@
 
     editor_style_grid->addWidget (cb_color_mode, 0, 0);
     editor_style_grid->addWidget (pb_reload_default_colors, 0, 1);
-    editor_style_grid->addItem (new QSpacerItem (5,5,QSizePolicy::Expanding), 0, 2);
+    editor_style_grid->addItem (new QSpacerItem (5, 5, QSizePolicy::Expanding), 0, 2);
 
 
 
@@ -493,7 +493,7 @@
     if (settings->contains (sd_geometry.key))
       restoreGeometry (settings->value (sd_geometry).toByteArray ());
     else
-      setGeometry (QRect (10,50,1000,600));
+      setGeometry (QRect (10, 50, 1000, 600));
   }
 
   void settings_dialog::show_tab (const QString& tab)
@@ -507,7 +507,7 @@
       }
     else
       {
-        QHash <QString, QWidget*> tab_hash;
+        QHash <QString, QWidget *> tab_hash;
         tab_hash["editor"] = tab_editor;
         tab_hash["editor_styles"] = tab_editor;
         tabWidget->setCurrentIndex (tabWidget->indexOf (tab_hash.value (tab)));
@@ -785,7 +785,7 @@
   }
 
   void settings_dialog::get_lexer_settings (QsciLexer *lexer,
-                                             gui_settings *settings)
+                                            gui_settings *settings)
   {
     resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
 
@@ -793,12 +793,12 @@
     // (enum is not continuous)
     int max_style = rmgr.get_valid_lexer_styles (lexer, styles);
     QGridLayout *style_grid = new QGridLayout ();
-    QVector<QLabel*> description (max_style);
-    QVector<QFontComboBox*> select_font (max_style);
-    QVector<QSpinBox*> font_size (max_style);
-    QVector<QCheckBox*> attrib_font (3 * max_style);
-    QVector<color_picker*> color (max_style);
-    QVector<color_picker*> bg_color (max_style);
+    QVector<QLabel *> description (max_style);
+    QVector<QFontComboBox *> select_font (max_style);
+    QVector<QSpinBox *> font_size (max_style);
+    QVector<QCheckBox *> attrib_font (3 * max_style);
+    QVector<color_picker *> color (max_style);
+    QVector<color_picker *> bg_color (max_style);
     int default_size = 10;
     QFont default_font = QFont ();
     int label_width;
@@ -966,7 +966,7 @@
           }
       }
 
-    const std::string group = 
+    const std::string group =
       QString ("Scintilla" + settings_color_modes_ext[mode]).toStdString ();
 
     lexer->writeSettings (*settings, group.c_str ());
@@ -1216,8 +1216,8 @@
   {
     // Construct the grid with all color related settings
     QGridLayout *style_grid = new QGridLayout ();
-    QVector<QLabel*> description (ws_colors_count);
-    QVector<color_picker*> color (ws_colors_count);
+    QVector<QLabel *> description (ws_colors_count);
+    QVector<color_picker *> color (ws_colors_count);
 
     int column = 0;
     const int color_columns = 3;  // place colors in so many columns
@@ -1356,8 +1356,8 @@
   void settings_dialog::read_terminal_colors (gui_settings *settings)
   {
     QGridLayout *style_grid = new QGridLayout ();
-    QVector<QLabel*> description (cs_colors_count);
-    QVector<color_picker*> color (cs_colors_count);
+    QVector<QLabel *> description (cs_colors_count);
+    QVector<color_picker *> color (cs_colors_count);
 
     int mode = settings->value (cs_color_mode).toInt ();
 
@@ -1462,8 +1462,8 @@
   void settings_dialog::read_varedit_colors (gui_settings *settings)
   {
     QGridLayout *style_grid = new QGridLayout ();
-    QVector<QLabel*> description (ve_colors_count);
-    QVector<color_picker*> color (ve_colors_count);
+    QVector<QLabel *> description (ve_colors_count);
+    QVector<color_picker *> color (ve_colors_count);
 
     int mode = settings->value (ve_color_mode).toInt ();
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/settings-dialog.h
--- a/libgui/src/settings-dialog.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/settings-dialog.h	Mon Nov 29 15:58:51 2021 -0800
@@ -63,7 +63,7 @@
 
     void get_octave_dir (void);
     void get_file_browser_dir (void);
-    void get_dir (QLineEdit*, const QString&);
+    void get_dir (QLineEdit *, const QString&);
     void set_disabled_pref_file_browser_dir (bool disable);
     void proxy_items_update (void);
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/shortcut-manager.cc
--- a/libgui/src/shortcut-manager.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/shortcut-manager.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -463,7 +463,7 @@
       {
         shortcut_t sc = m_sc.at (i);
 
-        QTreeWidgetItem *section = m_level_hash[sc.m_settings_key.section (':',0,0)];
+        QTreeWidgetItem *section = m_level_hash[sc.m_settings_key.section (':', 0, 0)];
 
         // handle sections which have changed and do not correspond to the
         // previously defined keyname
@@ -761,7 +761,7 @@
         else
           sc.m_actual_sc = QKeySequence (sc.m_default_sc); // get default shortcut
 
-        m_sc.replace (i,sc);                   // replace the old with the new one
+        m_sc.replace (i, sc);                  // replace the old with the new one
 
         // update the tree view
         QTreeWidgetItem *tree_item = m_index_item_hash[i]; // get related tree item
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/shortcut-manager.h
--- a/libgui/src/shortcut-manager.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/shortcut-manager.h	Mon Nov 29 15:58:51 2021 -0800
@@ -100,7 +100,7 @@
 
   protected slots:
 
-    void handle_double_clicked (QTreeWidgetItem*, int);
+    void handle_double_clicked (QTreeWidgetItem *, int);
     void shortcut_dialog_finished (int);
     void shortcut_dialog_set_default ();
 
@@ -160,9 +160,9 @@
     QList<shortcut_t> m_sc;
     QHash<QString, int> m_shortcut_hash;
     QHash<QString, int> m_action_hash;
-    QHash <QString, QTreeWidgetItem*> m_level_hash;
-    QHash<int, QTreeWidgetItem*> m_index_item_hash;
-    QHash<QTreeWidgetItem*, int> m_item_index_hash;
+    QHash <QString, QTreeWidgetItem *> m_level_hash;
+    QHash<int, QTreeWidgetItem *> m_index_item_hash;
+    QHash<QTreeWidgetItem *, int> m_item_index_hash;
 
     QDialog *m_dialog;
     enter_shortcut *m_edit_actual;
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/tab-bar.cc
--- a/libgui/src/tab-bar.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/tab-bar.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -229,7 +229,7 @@
             for (int i = count () - 1; i >= 0; i--)
               {
                 // Prepend an action for each tab
-                QAction* a = new QAction (tabIcon (i), tabText (i), &ctx_menu);
+                QAction *a = new QAction (tabIcon (i), tabText (i), &ctx_menu);
                 m_ctx_actions.prepend (a);
               }
             // Add all actions to our menu
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/tab-bar.h
--- a/libgui/src/tab-bar.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/tab-bar.h	Mon Nov 29 15:58:51 2021 -0800
@@ -52,7 +52,7 @@
     ~tab_bar (void) = default;
 
     void set_rotated (int rotated);
-    QMenu *get_context_menu (void) { return m_context_menu; };
+    QMenu * get_context_menu (void) { return m_context_menu; };
     QSize tabSizeHint (int idx) const;
 
   signals:
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/variable-editor-model.cc
--- a/libgui/src/variable-editor-model.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/variable-editor-model.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -460,7 +460,7 @@
 
       Cell cval = m_value.cell_value ();
 
-      return edit_display_sub (cval(row,col), role);
+      return edit_display_sub (cval(row, col), role);
     }
 
     bool requires_sub_editor (const QModelIndex& idx) const
@@ -473,7 +473,7 @@
 
       Cell cval = m_value.cell_value ();
 
-      return do_requires_sub_editor_sub (cval(row,col));
+      return do_requires_sub_editor_sub (cval(row, col));
     }
 
     char quote_char (const QModelIndex& idx) const
@@ -506,7 +506,7 @@
 
       Cell cval = m_value.cell_value ();
 
-      return cval(row,col);
+      return cval(row, col);
     }
   };
 
@@ -880,7 +880,7 @@
 
       octave_map m = m_value.map_value ();
 
-      return do_requires_sub_editor_sub (m(row,col));
+      return do_requires_sub_editor_sub (m(row, col));
     }
 
     char quote_char (const QModelIndex& idx) const
@@ -916,7 +916,7 @@
 
       octave_map m = m_value.map_value ();
 
-      return m(row,col);
+      return m(row, col);
     }
   };
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/variable-editor-model.h
--- a/libgui/src/variable-editor-model.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/variable-editor-model.h	Mon Nov 29 15:58:51 2021 -0800
@@ -43,7 +43,7 @@
   {
   public:
 
-    base_ve_model (const QString &expr, const octave_value& val);
+    base_ve_model (const QString& expr, const octave_value& val);
 
     virtual ~base_ve_model (void) = default;
 
@@ -138,11 +138,11 @@
 
   private:
 
-    static base_ve_model * create (const QString &expr, const octave_value& val);
+    static base_ve_model * create (const QString& expr, const octave_value& val);
 
   public:
 
-    variable_editor_model (const QString &expr, const octave_value& val,
+    variable_editor_model (const QString& expr, const octave_value& val,
                            QObject *parent = nullptr);
 
     ~variable_editor_model (void)
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/variable-editor.cc
--- a/libgui/src/variable-editor.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/variable-editor.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -119,7 +119,7 @@
     QToolButton *fullscreen_button = new QToolButton (m_title_widget);
     fullscreen_button->setDefaultAction (m_fullscreen_action);
     fullscreen_button->setFocusPolicy (Qt::NoFocus);
-    fullscreen_button->setIconSize (QSize (m_icon_size,m_icon_size));
+    fullscreen_button->setIconSize (QSize (m_icon_size, m_icon_size));
     QString css_button = QString ("QToolButton {background: transparent; border: 0px;}");
     fullscreen_button->setStyleSheet (css_button);
 
@@ -926,7 +926,7 @@
 
     if (indices.isEmpty ())
       {
-        start = QPoint (0,0);
+        start = QPoint (0, 0);
         end = tabsize;
       }
     else if (indices.size () == 1)
@@ -936,7 +936,7 @@
       }
     else
       {
-        end = QPoint (0,0);
+        end = QPoint (0, 0);
         start = tabsize;
 
         for (int i = 0; i < indices.size (); i++)
@@ -1240,8 +1240,8 @@
 
     // The old-style signal/slot connection appears to be needed here to
     // prevent a crash when closing a variable_dock_widget object.
-    connect (qApp, SIGNAL (focusChanged (QWidget*, QWidget*)),
-             page, SLOT (handle_focus_change (QWidget*, QWidget*)));
+    connect (qApp, SIGNAL (focusChanged (QWidget *, QWidget *)),
+             page, SLOT (handle_focus_change (QWidget *, QWidget *)));
 
     connect (this, &variable_editor::visibilityChanged,
              page, &variable_dock_widget::setVisible);
@@ -1506,7 +1506,7 @@
   }
 
   void
-  variable_editor::variable_focused (const QString &name)
+  variable_editor::variable_focused (const QString& name)
   {
     m_current_focus_vname = name;
 
@@ -1636,8 +1636,8 @@
   }
 
   QAction *
-  variable_editor::add_tool_bar_button (const QIcon &icon,
-                                        const QString &text,
+  variable_editor::add_tool_bar_button (const QIcon& icon,
+                                        const QString& text,
                                         const QObject *receiver,
                                         const char *member)
   {
@@ -1665,7 +1665,7 @@
     resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
 
     m_save_action = add_tool_bar_button (rmgr.icon ("document-save"), tr ("Save"),
-                                  this, SLOT (save ()));
+                                         this, SLOT (save ()));
     addAction (m_save_action);
     m_save_action->setShortcutContext (Qt::WidgetWithChildrenShortcut);
     m_save_action->setStatusTip(tr("Save variable to a file"));
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/variable-editor.h
--- a/libgui/src/variable-editor.h	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/variable-editor.h	Mon Nov 29 15:58:51 2021 -0800
@@ -135,9 +135,9 @@
 
     ~variable_editor_stack (void) = default;
 
-    variable_editor_view *edit_view (void) {return m_edit_view;};
+    variable_editor_view * edit_view (void) {return m_edit_view;};
 
-    QTextEdit *disp_view (void) {return m_disp_view;};
+    QTextEdit * disp_view (void) {return m_disp_view;};
 
   signals:
 
@@ -160,7 +160,7 @@
 
   private:
 
-    QTextEdit *make_disp_view (QWidget *parent);
+    QTextEdit * make_disp_view (QWidget *parent);
 
     base_qobject& m_octave_qobj;
 
@@ -399,8 +399,8 @@
 
     void update_colors (void);
 
-    QAction *add_tool_bar_button (const QIcon &icon, const QString &text,
-                                  const QObject *receiver, const char *member);
+    QAction * add_tool_bar_button (const QIcon& icon, const QString& text,
+                                   const QObject *receiver, const char *member);
 
     void construct_tool_bar (void);
 
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/workspace-model.cc
--- a/libgui/src/workspace-model.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/workspace-model.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -207,7 +207,7 @@
         QColor setting_color = settings->color_value (ws_colors[i], mode);
 
         QPalette p (setting_color);
-        m_storage_class_colors.replace (i,setting_color);
+        m_storage_class_colors.replace (i, setting_color);
 
         QColor fg_color = p.color (QPalette::WindowText);
         m_storage_class_colors.replace (i + ws_colors_count, fg_color);
diff -r bbf1293bd255 -r d4d83344d653 libgui/src/workspace-view.cc
--- a/libgui/src/workspace-view.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/libgui/src/workspace-view.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -185,7 +185,7 @@
     m_model->notice_settings (settings); // update colors of model first
 
     for (int i = 0; i < ws_columns_shown.length (); i++)
-      m_view->setColumnHidden (i + 1, ! settings->value (ws_columns_shown_keys.at (i),true).toBool ());
+      m_view->setColumnHidden (i + 1, ! settings->value (ws_columns_shown_keys.at (i), true).toBool ());
 
     QString tool_tip;
 
@@ -303,7 +303,7 @@
                             &sig_mapper, SLOT (map ()));
         sig_mapper.setMapping (action, i);
         action->setCheckable (true);
-        action->setChecked (settings->value (ws_columns_shown_keys.at (i),true).toBool ());
+        action->setChecked (settings->value (ws_columns_shown_keys.at (i), true).toBool ());
       }
 
     // FIXME: We could use
@@ -333,7 +333,7 @@
     gui_settings *settings = rmgr.get_settings ();
 
     QString key = ws_columns_shown_keys.at (col);
-    bool shown = settings->value (key,true).toBool ();
+    bool shown = settings->value (key, true).toBool ();
 
     m_view->setColumnHidden (col + 1, shown);
 
diff -r bbf1293bd255 -r d4d83344d653 src/mkoctfile.in.cc
--- a/src/mkoctfile.in.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/src/mkoctfile.in.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -724,7 +724,7 @@
     argv.push_back (sys_argv[i_arg]);
 #endif
 
- if (argc == 1)
+  if (argc == 1)
     {
       std::cout << usage_msg << std::endl;
       return 1;
diff -r bbf1293bd255 -r d4d83344d653 src/octave-config.in.cc
--- a/src/octave-config.in.cc	Mon Nov 29 12:36:04 2021 -0500
+++ b/src/octave-config.in.cc	Mon Nov 29 15:58:51 2021 -0800
@@ -55,7 +55,7 @@
 
 #include "shared-fcns.h"
 
-static std::map<std::string,std::string> vars;
+static std::map<std::string, std::string> vars;
 
 static std::string usage_msg = "usage: octave-config [options]";