MainWindow: Fixed sampling bar comment

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 21b66b534f59119b492b6be69bb049c094389768..0dd9a09f194ea3cb7da233d90008798be845043f 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -58,7 +58,7 @@
 #include <stdint.h>
 #include <stdarg.h>
 #include <glib.h>
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::list;
 using std::map;
@@ -196,8 +196,7 @@ void MainWindow::setup_ui()
 
        // Set the window icon
        QIcon icon;
-       icon.addFile(QString::fromUtf8(":/icons/sigrok-logo-notext.png"),
-               QSize(), QIcon::Normal, QIcon::Off);
+       icon.addFile(QString(":/icons/sigrok-logo-notext.svg"));
        setWindowIcon(icon);
 
        // Setup the central widget
@@ -327,7 +326,7 @@ void MainWindow::setup_ui()
        setMenuBar(menu_bar);
        QMetaObject::connectSlotsByName(this);
 
-       // Setup the sampling bar
+       // Setup the toolbar
        main_bar_ = new toolbars::MainBar(session_, *this);
 
        // Populate the device list and select the initially selected device
@@ -464,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();