--- a/libgui/src/command-widget.cc	Tue Dec 06 15:17:16 2022 -0500
+++ b/libgui/src/command-widget.cc	Tue Dec 06 15:37:43 2022 -0500
@@ -49,8 +49,8 @@
 #include "input.h"
 #include "interpreter.h"
 
-namespace octave
-{
+OCTAVE_BEGIN_NAMESPACE(octave)
+
   command_widget::command_widget (base_qobject& oct_qobj, QWidget *p)
     : QWidget (p), m_incomplete_parse (false),
       m_prompt (QString ()),
@@ -169,7 +169,6 @@
                                      .arg (fgc.name ()).arg (bgc.name ()));
   }
 
-
   // The console itself using QScintilla.
   // This implementation is partly based on the basic concept of
   // "qpconsole" as proposed by user "DerManu" in the Qt-forum thread
@@ -304,6 +303,6 @@
       }
   }
 
-}
+OCTAVE_END_NAMESPACE(octave)
 
 #endif