Mercurial > octave
diff libgui/src/settings-dialog.h @ 24011:9107bae20480
style fixes for some GUI source files
* color-picker.cc, color-picker.h, documentation-dock-widget.cc,
documentation-dock-widget.h, external-editor-interface.cc,
external-editor-interface.h, find-files-dialog.cc,
find-files-dialog.h, find-files-model.cc, find-files-model.h,
history-dock-widget.cc, history-dock-widget.h, settings-dialog.cc,
settings-dialog.h, terminal-dock-widget.cc, thread-manager.cc,
thread-manager.h: Use m_ prefix for member variables, order
functions consistently in header and source files, and follow more
Octave coding conventions.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 06 Sep 2017 09:25:46 -0400 |
parents | e3a36f84d01d |
children | 8cb985e362f3 |
line wrap: on
line diff
--- a/libgui/src/settings-dialog.h Tue Sep 05 17:24:13 2017 -0700 +++ b/libgui/src/settings-dialog.h Wed Sep 06 09:25:46 2017 -0400 @@ -37,17 +37,21 @@ class settings_dialog:public QDialog { Q_OBJECT public: + explicit settings_dialog (QWidget *parent, const QString& desired_tab = QString ()); - ~settings_dialog (); + ~settings_dialog (void); + void show_tab (const QString&); signals: - void apply_new_settings (); + + void apply_new_settings (void); private slots: - void get_octave_dir (); - void get_file_browser_dir (); + + 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); @@ -55,11 +59,12 @@ void button_clicked (QAbstractButton *button); // slots for import/export-buttons of shortcut sets - void import_shortcut_set (); - void export_shortcut_set (); - void default_shortcut_set (); + void import_shortcut_set (void); + void export_shortcut_set (void); + void default_shortcut_set (void); private: + Ui::settings_dialog *ui; void write_changed_settings (bool closing); @@ -73,11 +78,11 @@ void read_varedit_colors (QSettings *settings); void write_varedit_colors (QSettings *settings); - color_picker *_widget_title_bg_color; - color_picker *_widget_title_bg_color_active; - color_picker *_widget_title_fg_color; - color_picker *_widget_title_fg_color_active; - color_picker *_editor_current_line_color; + 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_editor_current_line_color; }; #endif