SigSession: Renamed get_device to device

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();
 
-       if (_session.get_device()) {
+       if (_session.device()) {
                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(
-                       _session.get_device());
+                       _session.device());
 
                for (string key : key_list) {
 
@@ -368,7 +368,7 @@ void MainWindow::update_device_list()
 {
        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)

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index 5a854453c3eebf1d78e27c5b7a205b45fe4e8656..f93734a1f10ed71d372bbc741503502a22191126 100644 (file)
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -60,7 +60,7 @@ Channels::Channels(SigSession &session, QWidget *parent) :
        // Create the layout
        setLayout(&_layout);
 
-       shared_ptr<sigrok::Device> device = _session.get_device();
+       shared_ptr<sigrok::Device> device = _session.device();
        assert(device);
 
        // Collect a set of signals

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 2d695af3837af60b95eb1b0cb59e280142f9ff28..ce74829401486f0c6597486398f1cf68e9c78dd3 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -98,7 +98,7 @@ SigSession::~SigSession()
        stop_capture();
 }
 
-shared_ptr<Device> SigSession::get_device() const
+shared_ptr<Device> SigSession::device() const
 {
        return _device;
 }

diff --git a/pv/sigsession.h b/pv/sigsession.h
index a624d1d216aaf6e0e280cfde4bf514a61ee118c4..55da3735cbdb574df7576aaaf9d7f1691eb0313c 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -79,7 +79,7 @@ public:
 
        ~SigSession();
 
-       std::shared_ptr<sigrok::Device> get_device() const;
+       std::shared_ptr<sigrok::Device> device() const;
 
        /**
         * Sets device instance that will be used in the next capture session.