Make member variable underscores a suffix instead of a prefix

[pulseview.git] / pv / mainwindow.h

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index 1f9dd528af7a22d152adace7342cb827882197da..94a6c42eab08bf0e0b0994448c02a4eb7c1864a7 100644 (file)
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -22,8 +22,7 @@
 #define PULSEVIEW_PV_MAINWINDOW_H
 
 #include <list>
-
-#include <boost/weak_ptr.hpp>
+#include <memory>
 
 #include <QMainWindow>
 
@@ -37,10 +36,6 @@ namespace pv {
 
 class DeviceManager;
 
-namespace device {
-class DevInst;
-}
-
 namespace toolbars {
 class ContextBar;
 class SamplingBar;
@@ -66,6 +61,10 @@ public:
 private:
        void setup_ui();
 
+       void save_ui_settings();
+
+       void restore_ui_settings();
+
        void session_error(const QString text, const QString info_text);
 
        /**
@@ -73,9 +72,10 @@ private:
         */
        void update_device_list();
 
-private slots:
-       void load_file(QString file_name);
+       void closeEvent(QCloseEvent *event);
 
+private Q_SLOTS:
+       void load_file(QString file_name);
 
        void show_session_error(
                const QString text, const QString info_text);
@@ -105,16 +105,28 @@ private slots:
        void capture_state_changed(int state);
 
 private:
-       DeviceManager &_device_manager;
+       /**
+        * Name of the setting used to remember the directory
+        * containing the last file that was opened.
+        */
+       static const char *SettingOpenDirectory;
+
+       /**
+        * Name of the setting used to remember the directory
+        * containing the last file that was saved.
+        */
+       static const char *SettingSaveDirectory;
+
+       DeviceManager &device_manager_;
 
-       SigSession _session;
+       SigSession session_;
 
-       pv::view::View *_view;
+       pv::view::View *view_;
 
-       QWidget *_central_widget;
-       QVBoxLayout *_vertical_layout;
+       QWidget *central_widget_;
+       QVBoxLayout *vertical_layout_;
 
-       toolbars::SamplingBar *_sampling_bar;
+       toolbars::SamplingBar *sampling_bar_;
 };
 
 } // namespace pv