icons: Added menu icon

[pulseview.git] / pv / toolbars / samplingbar.hpp

diff --git a/pv/toolbars/samplingbar.hpp b/pv/toolbars/samplingbar.hpp
index af2743118ad7441d1140869b5989632bb46e8762..10e70cb9bed9b94f944c015976a03b57d7284167 100644 (file)
--- a/pv/toolbars/samplingbar.hpp
+++ b/pv/toolbars/samplingbar.hpp
@@ -31,7 +31,7 @@
 #include <QToolBar>
 #include <QToolButton>
 
-#include <pv/sigsession.hpp>
+#include <pv/session.hpp>
 #include <pv/widgets/popuptoolbutton.hpp>
 #include <pv/widgets/sweeptimingwidget.hpp>
 
@@ -46,7 +46,7 @@ class QAction;
 namespace pv {
 
 class MainWindow;
-class SigSession;
+class Session;
 
 namespace toolbars {
 
@@ -60,15 +60,15 @@ private:
        static const uint64_t DefaultSampleCount;
 
 public:
-       SamplingBar(SigSession &session, pv::MainWindow &main_window);
+       SamplingBar(Session &session, pv::MainWindow &main_window);
 
        void set_device_list(
-               const std::list< std::pair<std::shared_ptr<sigrok::Device>, std::string> > &devices,
+               const std::list< std::shared_ptr<sigrok::Device> > &devices,
                std::shared_ptr<sigrok::Device> selected);
 
        std::shared_ptr<sigrok::Device> get_selected_device() const;
 
-       void set_capture_state(pv::SigSession::capture_state state);
+       void set_capture_state(pv::Session::capture_state state);
 
 Q_SIGNALS:
        void run_stop();
@@ -93,7 +93,7 @@ protected:
        bool eventFilter(QObject *watched, QEvent *event);
 
 private:
-       SigSession &session_;
+       Session &session_;
        MainWindow &main_window_;
 
        QComboBox device_selector_;