--- a/libgui/src/variable-editor.cc	Tue Dec 06 15:17:16 2022 -0500
+++ b/libgui/src/variable-editor.cc	Tue Dec 06 15:37:43 2022 -0500
@@ -64,8 +64,8 @@
 #include "variable-editor-model.h"
 #include "variable-editor.h"
 
-namespace octave
-{
+OCTAVE_BEGIN_NAMESPACE(octave)
+
   // Code reuse functions
 
   static QSignalMapper *
@@ -478,7 +478,6 @@
         });
   }
 
-
   // Perform saving the variable after desired format is determined
   void
   variable_editor_stack::do_save (const QString& format, const QString& save_opts)
@@ -528,7 +527,6 @@
         });
   }
 
-
   // Custom editable variable table view
 
   variable_editor_view::variable_editor_view (QWidget *p,
@@ -1037,7 +1035,6 @@
       }
   }
 
-
   // Gadgets for focus restoration
 
   HoverToolButton::HoverToolButton (QWidget *parent)
@@ -1787,4 +1784,4 @@
     m_tool_bar->setEnabled (false);
   }
 
-}
+OCTAVE_END_NAMESPACE(octave)