projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SigSession: Renamed get_device to device
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index 6142709cd69efd9025805338b6a913aeb3053612..170d14e79ccffa4fa9f7d24fdf91fbc57062c050 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-284,7
+284,7
@@
void MainWindow::save_ui_settings()
settings.setValue("geometry", saveGeometry());
settings.endGroup();
settings.setValue("geometry", saveGeometry());
settings.endGroup();
- if (_session.
get_
device()) {
+ if (_session.device()) {
settings.beginGroup("Device");
key_list.push_back("vendor");
key_list.push_back("model");
settings.beginGroup("Device");
key_list.push_back("vendor");
key_list.push_back("model");
@@
-293,7
+293,7
@@
void MainWindow::save_ui_settings()
key_list.push_back("connection_id");
dev_info = _device_manager.get_device_info(
key_list.push_back("connection_id");
dev_info = _device_manager.get_device_info(
- _session.
get_
device());
+ _session.device());
for (string key : key_list) {
for (string key : key_list) {
@@
-368,7
+368,7
@@
void MainWindow::update_device_list()
{
assert(_sampling_bar);
{
assert(_sampling_bar);
- shared_ptr<Device> selected_device = _session.
get_
device();
+ shared_ptr<Device> selected_device = _session.device();
list< shared_ptr<Device> > devices;
if (_device_manager.devices().size() == 0)
list< shared_ptr<Device> > devices;
if (_device_manager.devices().size() == 0)