Mercurial > octave
comparison libgui/src/settings-dialog.cc @ 31646:c6d54dd31a7e stable
maint: Use macros to begin/end C++ namespaces.
* BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h,
ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h,
CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h,
ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h,
Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc,
GLCanvas.h, GenericEventNotify.h, KeyMap.cc, KeyMap.h,
ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc,
Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc,
ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc,
PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h,
PushTool.cc, PushTool.h, QtHandlesUtils.cc, QtHandlesUtils.h,
RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc,
SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h,
TextEdit.cc, TextEdit.h, ToggleButtonControl.cc,
ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc,
ToolBar.h, ToolBarButton.cc, ToolBarButton.h, annotation-dialog.cc,
annotation-dialog.h, gl-select.cc, gl-select.h, qopengl-functions.h,
qt-graphics-toolkit.cc, qt-graphics-toolkit.h, QTerminal.h,
color-picker.cc, color-picker.h, command-widget.cc, command-widget.h,
community-news.cc, community-news.h, dialog.cc, dialog.h,
documentation-bookmarks.cc, documentation-bookmarks.h,
documentation-dock-widget.cc, documentation-dock-widget.h,
documentation.cc, documentation.h, dw-main-window.cc,
dw-main-window.h, external-editor-interface.cc,
external-editor-interface.h, files-dock-widget.cc,
files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h,
find-files-model.cc, find-files-model.h, graphics-init.cc,
graphics-init.h, gui-settings.cc, gui-settings.h, gui-utils.cc,
gui-utils.h, history-dock-widget.cc, history-dock-widget.h,
interpreter-qobject.cc, interpreter-qobject.h, led-indicator.cc,
led-indicator.h, 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, marker.h, octave-qscintilla.cc,
octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h,
main-window.cc, main-window.h, news-reader.cc, news-reader.h,
octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc,
octave-qobject.h, qt-application.cc, qt-application.h,
qt-interpreter-events.cc, qt-interpreter-events.h, qt-utils.h,
release-notes.cc, release-notes.h, resource-manager.cc,
resource-manager.h, set-path-dialog.cc, set-path-dialog.h,
set-path-model.cc, set-path-model.h, settings-dialog.cc,
settings-dialog.h, shortcut-manager.cc, shortcut-manager.h,
tab-bar.cc, tab-bar.h, terminal-dock-widget.cc,
terminal-dock-widget.h, variable-editor-model.cc,
variable-editor-model.h, variable-editor.cc, variable-editor.h,
welcome-wizard.cc, welcome-wizard.h, workspace-model.cc,
workspace-model.h, workspace-view.cc, workspace-view.h:
Use new macros to begin/end C++ namespaces.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 06 Dec 2022 14:37:51 -0500 |
parents | 9e85148b9206 |
children | 431f80aba37a 29d734430e5f |
comparison
equal
deleted
inserted
replaced
31644:9089bd969b37 | 31646:c6d54dd31a7e |
---|---|
68 #include "octave-qtutils.h" | 68 #include "octave-qtutils.h" |
69 #include "settings-dialog.h" | 69 #include "settings-dialog.h" |
70 #include "variable-editor.h" | 70 #include "variable-editor.h" |
71 #include "workspace-model.h" | 71 #include "workspace-model.h" |
72 | 72 |
73 namespace octave | 73 OCTAVE_BEGIN_NAMESPACE(octave) |
74 { | |
75 | 74 |
76 settings_dialog::settings_dialog (QWidget *p, base_qobject& oct_qobj, | 75 settings_dialog::settings_dialog (QWidget *p, base_qobject& oct_qobj, |
77 const QString& desired_tab) | 76 const QString& desired_tab) |
78 : QDialog (p), Ui::settings_dialog (), m_octave_qobj (oct_qobj) | 77 : QDialog (p), Ui::settings_dialog (), m_octave_qobj (oct_qobj) |
79 { | 78 { |
316 m_rb_uncomment_strings[i]->setText (ed_comment_strings.at(i)); | 315 m_rb_uncomment_strings[i]->setText (ed_comment_strings.at(i)); |
317 m_rb_uncomment_strings[i]->setAutoExclusive (false); | 316 m_rb_uncomment_strings[i]->setAutoExclusive (false); |
318 m_rb_uncomment_strings[i]->setChecked ( 1 << i & selected_uncomment_string); | 317 m_rb_uncomment_strings[i]->setChecked ( 1 << i & selected_uncomment_string); |
319 layout_uncomment_strings->addWidget (m_rb_uncomment_strings[i]); | 318 layout_uncomment_strings->addWidget (m_rb_uncomment_strings[i]); |
320 } | 319 } |
321 | |
322 | 320 |
323 combo_eol_mode->setCurrentIndex (settings->value (ed_default_eol_mode).toInt ()); | 321 combo_eol_mode->setCurrentIndex (settings->value (ed_default_eol_mode).toInt ()); |
324 editor_auto_ind_checkbox->setChecked (settings->value (ed_auto_indent).toBool ()); | 322 editor_auto_ind_checkbox->setChecked (settings->value (ed_auto_indent).toBool ()); |
325 editor_tab_ind_checkbox->setChecked (settings->value (ed_tab_indents_line).toBool ()); | 323 editor_tab_ind_checkbox->setChecked (settings->value (ed_tab_indents_line).toBool ()); |
326 editor_bs_unind_checkbox->setChecked (settings->value (ed_backspace_unindents_line).toBool ()); | 324 editor_bs_unind_checkbox->setChecked (settings->value (ed_backspace_unindents_line).toBool ()); |
1614 | 1612 |
1615 settings->setValue (ve_color_mode.key, mode); | 1613 settings->setValue (ve_color_mode.key, mode); |
1616 | 1614 |
1617 settings->sync (); | 1615 settings->sync (); |
1618 } | 1616 } |
1619 } | 1617 |
1618 OCTAVE_END_NAMESPACE(octave) |