diff libgui/src/settings-dialog.cc @ 31647:431f80aba37a

maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Tue, 06 Dec 2022 15:37:43 -0500
parents ad014fc78bd6 c6d54dd31a7e
children deb553ac2c54
line wrap: on
line diff
--- a/libgui/src/settings-dialog.cc	Tue Dec 06 15:17:16 2022 -0500
+++ b/libgui/src/settings-dialog.cc	Tue Dec 06 15:37:43 2022 -0500
@@ -70,8 +70,7 @@
 #include "variable-editor.h"
 #include "workspace-model.h"
 
-namespace octave
-{
+OCTAVE_BEGIN_NAMESPACE(octave)
 
   settings_dialog::settings_dialog (QWidget *p, base_qobject& oct_qobj,
                                     const QString& desired_tab)
@@ -309,7 +308,6 @@
         layout_uncomment_strings->addWidget (m_rb_uncomment_strings[i]);
       }
 
-
     combo_eol_mode->setCurrentIndex (settings.value (ed_default_eol_mode).toInt ());
     editor_auto_ind_checkbox->setChecked (settings.value (ed_auto_indent).toBool ());
     editor_tab_ind_checkbox->setChecked (settings.value (ed_tab_indents_line).toBool ());
@@ -1616,4 +1614,5 @@
 
     settings.sync ();
   }
-}
+
+OCTAVE_END_NAMESPACE(octave)