From: Joel Holdsworth <redacted>
Date: Sat, 17 Jan 2015 15:19:13 +0000 (+0000)
Subject: Session: Renamed set_file to set_session_file
X-Git-Tag: pulseview-0.3.0~254
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=4b5537c576c37884c2a0254985893e20ea5338e6;p=pulseview.git

Session: Renamed set_file to set_session_file
---

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 81b49057..0fef1bda 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -463,7 +463,7 @@ void MainWindow::load_file(QString file_name)
 	const QString infoMessage;
 
 	try {
-		session_.set_file(file_name.toStdString());
+		session_.set_session_file(file_name.toStdString());
 	} catch(Error e) {
 		show_session_error(tr("Failed to load ") + file_name, e.what());
 		session_.set_default_device();
diff --git a/pv/session.cpp b/pv/session.cpp
index 76bdf683..1f61c7db 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -166,7 +166,7 @@ void Session::set_device(shared_ptr<Device> device)
 	device_selected();
 }
 
-void Session::set_file(const string &name)
+void Session::set_session_file(const string &name)
 {
 	session_ = device_manager_.context()->load_session(name);
 	device_ = session_->devices()[0];
diff --git a/pv/session.hpp b/pv/session.hpp
index ba07fdcf..3bb10e25 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -94,7 +94,11 @@ public:
 	 */
 	void set_device(std::shared_ptr<sigrok::Device> device);
 
-	void set_file(const std::string &name);
+	/**
+	 * Sets a sigrok session file as the capture device.
+	 * @param name the path to the file.
+	 */
+	void set_session_file(const std::string &name);
 
 	void set_default_device();