Mercurial > octave
diff libgui/src/settings-dialog.h @ 31648:29d734430e5f stable
maint: Re-indent code after switch to using namespace macros.
* 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, module.mk, 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:
Re-indent code after switch to using namespace macros.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 06 Dec 2022 14:53:00 -0500 |
| parents | c6d54dd31a7e |
| children | deb553ac2c54 597f3ee61a48 |
line wrap: on
line diff
--- a/libgui/src/settings-dialog.h Tue Dec 06 14:37:51 2022 -0500 +++ b/libgui/src/settings-dialog.h Tue Dec 06 14:53:00 2022 -0500 @@ -40,79 +40,79 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class base_qobject; +class base_qobject; - // Ui::settings_dialog is a generated class. +// Ui::settings_dialog is a generated class. - class settings_dialog : public QDialog, private Ui::settings_dialog - { +class settings_dialog : public QDialog, private Ui::settings_dialog +{ Q_OBJECT public: - explicit settings_dialog (QWidget *parent, base_qobject& octave_qobj, - const QString& desired_tab = QString ()); + explicit settings_dialog (QWidget *parent, base_qobject& octave_qobj, + const QString& desired_tab = QString ()); - ~settings_dialog (void) = default; + ~settings_dialog (void) = default; - void show_tab (const QString&); + void show_tab (const QString&); - signals: +signals: - void apply_new_settings (void); + void apply_new_settings (void); - private slots: +private slots: - void get_octave_dir (void); - void get_file_browser_dir (void); - void get_dir (QLineEdit *, const QString&); - void set_disabled_pref_file_browser_dir (bool disable); - void proxy_items_update (void); + void get_octave_dir (void); + void get_file_browser_dir (void); + void get_dir (QLineEdit *, const QString&); + void set_disabled_pref_file_browser_dir (bool disable); + void proxy_items_update (void); - // slots updating colors depending on theme - void update_terminal_colors (int def = 0); - void update_workspace_colors (int def = 0); - void update_varedit_colors (int def = 0); - void update_editor_lexers (int def = 0); + // slots updating colors depending on theme + void update_terminal_colors (int def = 0); + void update_workspace_colors (int def = 0); + void update_varedit_colors (int def = 0); + void update_editor_lexers (int def = 0); - // slots for dialog's buttons - void button_clicked (QAbstractButton *button); + // slots for dialog's buttons + void button_clicked (QAbstractButton *button); - // slots for import/export-buttons of shortcut sets - void import_shortcut_set (void); - void export_shortcut_set (void); - void default_shortcut_set (void); + // slots for import/export-buttons of shortcut sets + void import_shortcut_set (void); + void export_shortcut_set (void); + void default_shortcut_set (void); - private: +private: #if defined (HAVE_QSCINTILLA) - void update_lexer (QsciLexer *lexer, gui_settings *settings, int mode, int def = 0); - void get_lexer_settings (QsciLexer *lexer, gui_settings *settings); - void write_lexer_settings (QsciLexer *lexer, gui_settings *settings); + void update_lexer (QsciLexer *lexer, gui_settings *settings, int mode, int def = 0); + void get_lexer_settings (QsciLexer *lexer, gui_settings *settings); + void write_lexer_settings (QsciLexer *lexer, gui_settings *settings); #endif - void write_changed_settings (bool closing); + void write_changed_settings (bool closing); - void read_workspace_colors (gui_settings *settings); - void write_workspace_colors (gui_settings *settings); + void read_workspace_colors (gui_settings *settings); + void write_workspace_colors (gui_settings *settings); - void read_terminal_colors (gui_settings *settings); - void write_terminal_colors (gui_settings *settings); + void read_terminal_colors (gui_settings *settings); + void write_terminal_colors (gui_settings *settings); - void read_varedit_colors (gui_settings *settings); - void write_varedit_colors (gui_settings *settings); + void read_varedit_colors (gui_settings *settings); + void write_varedit_colors (gui_settings *settings); - base_qobject& m_octave_qobj; + base_qobject& m_octave_qobj; - color_picker *m_widget_title_bg_color; - color_picker *m_widget_title_bg_color_active; - color_picker *m_widget_title_fg_color; - color_picker *m_widget_title_fg_color_active; + color_picker *m_widget_title_bg_color; + color_picker *m_widget_title_bg_color_active; + color_picker *m_widget_title_fg_color; + color_picker *m_widget_title_fg_color_active; - QRadioButton *m_rb_comment_strings[ed_comment_strings_count]; - QCheckBox *m_rb_uncomment_strings[ed_comment_strings_count]; + QRadioButton *m_rb_comment_strings[ed_comment_strings_count]; + QCheckBox *m_rb_uncomment_strings[ed_comment_strings_count]; - QCheckBox *m_ws_enable_colors; - QCheckBox *m_ws_hide_tool_tips; - }; + QCheckBox *m_ws_enable_colors; + QCheckBox *m_ws_hide_tool_tips; +}; OCTAVE_END_NAMESPACE(octave)