From: Joel Holdsworth <redacted>
Date: Thu, 13 Nov 2014 12:36:06 +0000 (+0000)
Subject: SigSession: Renamed get_device to device
X-Git-Tag: pulseview-0.3.0~512
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=d260d425863efa6d80a5a5f3d920373a6d159aef;p=pulseview.git

SigSession: Renamed get_device to device
---

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 6142709c..170d14e7 100644
--- 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 5a854453..f93734a1 100644
--- 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 2d695af3..ce748294 100644
--- 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 a624d1d2..55da3735 100644
--- 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.