Mercurial > octave

diff libgui/src/workspace-view.h @ 24014:bffd7d826887

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fixes for some GUI source files * files-dock-widget.cc, files-dock-widget.h, octave-cmd.cc, octave-cmd.h, octave-dock-widget.cc, octave-dock-widget.h, resource-manager.cc, resource-manager.h, shortcut-manager.cc, shortcut-manager.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 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 12:53:28 -0400
parents e3a36f84d01d
children 1d6c940a1b37
line wrap: on
line diff
--- a/libgui/src/workspace-view.h	Wed Sep 06 09:10:27 2017 -0700
+++ b/libgui/src/workspace-view.h	Wed Sep 06 12:53:28 2017 -0400
@@ -47,9 +47,9 @@
 
 public slots:
 
-  void notice_settings (const QSettings *);
+  void setModel (workspace_model *model);
 
-  void setModel (workspace_model *model);
+  void notice_settings (const QSettings *);
 
   void save_settings (void);
 
@@ -67,9 +67,16 @@
 
 protected slots:
 
+  void filter_update (const QString& expression);
+  void filter_activate (bool enable);
+  void update_filter_history (void);
+
+  void header_contextmenu_requested (const QPoint& mpos);
+
+  void toggle_header (int column);
+
   void contextmenu_requested (const QPoint& pos);
 
-  // context menu slots
   void handle_contextmenu_copy (void);
   void handle_contextmenu_copy_value (void);
   void handle_contextmenu_rename (void);
@@ -79,38 +86,32 @@
   void handle_contextmenu_stem (void);
   void handle_contextmenu_filter (void);
 
-  void header_contextmenu_requested (const QPoint& mpos);
-  void toggle_header (int column);
-
   void handle_model_changed (void);
 
-  void copyClipboard ();
-  void selectAll ();
-
-  void filter_update (const QString& expression);
-  void filter_activate (bool enable);
-  void update_filter_history ();
+  void copyClipboard (void);
+  void selectAll (void);
 
 private:
 
   void relay_contextmenu_command (const QString& cmdname);
 
   QString get_var_name (QModelIndex index);
-  QTableView *view;
-  int view_previous_row_count;
-  workspace_model *_model;
+
+  QTableView *m_view;
+  int m_view_previous_row_count;
+  workspace_model *m_model;
 
-  QSortFilterProxyModel _filter_model;
-  QCheckBox *_filter_checkbox;
-  QComboBox *_filter;
-  QWidget *_filter_widget;
-  bool _filter_shown;
+  QSortFilterProxyModel m_filter_model;
+  QCheckBox *m_filter_checkbox;
+  QComboBox *m_filter;
+  QWidget *m_filter_widget;
+  bool m_filter_shown;
 
   enum { MaxFilterHistory = 10 };
 
-  QStringList _columns_shown;
-  QStringList _columns_shown_keys;
-  QSignalMapper *_sig_mapper;
+  QStringList m_columns_shown;
+  QStringList m_columns_shown_keys;
+  QSignalMapper *m_sig_mapper;
 };
 
 #endif