Session: Renamed set_file to set_session_file

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 81b49057adfa25f72a44db14eaa7ce3c7f54700b..0fef1bdabf1ec525c897f0a72f4e0f6860504d24 100644 (file)
--- 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 76bdf683f9dc9b0a2872c4f9f5da8a637837293a..1f61c7db4bde41a690398e19347e65ca6c031b46 100644 (file)
--- 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 ba07fdcf648ddacd86ec660086eb457482c394a7..3bb10e25731f5168a826c06497c0af84842d146e 100644 (file)
--- 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();