projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 f026e8f3f38e0326304283c62164d76638c32803..94a6c42eab08bf0e0b0994448c02a4eb7c1864a7 100644
(file)
--- a/
pv/mainwindow.h
+++ b/
pv/mainwindow.h
@@
-36,10
+36,6
@@
namespace pv {
class DeviceManager;
class DeviceManager;
-namespace device {
-class DevInst;
-}
-
namespace toolbars {
class ContextBar;
class SamplingBar;
namespace toolbars {
class ContextBar;
class SamplingBar;
@@
-65,6
+61,10
@@
public:
private:
void setup_ui();
private:
void setup_ui();
+ void save_ui_settings();
+
+ void restore_ui_settings();
+
void session_error(const QString text, const QString info_text);
/**
void session_error(const QString text, const QString info_text);
/**
@@
-72,9
+72,10
@@
private:
*/
void update_device_list();
*/
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);
void show_session_error(
const QString text, const QString info_text);
@@
-116,16
+117,16
@@
private:
*/
static const char *SettingSaveDirectory;
*/
static const char *SettingSaveDirectory;
- DeviceManager &
_device_manager
;
+ 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
};
} // namespace pv