Modified header guards to match file names

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

diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp
index d5d42f5080497840eafc95db258f1ea19e4ca628..64c8a6c7e146aa1cba8564e30d2bf3a9fe0dbc3b 100644 (file)
--- a/pv/toolbars/mainbar.hpp
+++ b/pv/toolbars/mainbar.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_H
-#define PULSEVIEW_PV_TOOLBARS_MAINBAR_H
+#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
+#define PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
 
 #include <stdint.h>
 
@@ -28,10 +28,12 @@
 
 #include <QComboBox>
 #include <QDoubleSpinBox>
+#include <QMenu>
 #include <QToolBar>
 #include <QToolButton>
 
 #include <pv/session.hpp>
+#include <pv/widgets/devicetoolbutton.hpp>
 #include <pv/widgets/popuptoolbutton.hpp>
 #include <pv/widgets/sweeptimingwidget.hpp>
 
@@ -62,17 +64,10 @@ private:
 public:
        MainBar(Session &session, pv::MainWindow &main_window);
 
-       void set_device_list(
-               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 update_device_list();
 
        void set_capture_state(pv::Session::capture_state state);
 
-Q_SIGNALS:
-       void run_stop();
-
 private:
        void update_sample_rate_selector();
        void update_sample_rate_selector_value();
@@ -96,8 +91,7 @@ private:
        Session &session_;
        MainWindow &main_window_;
 
-       QComboBox device_selector_;
-       bool updating_device_selector_;
+       pv::widgets::DeviceToolButton device_selector_;
 
        pv::widgets::PopupToolButton configure_button_;
        QAction *configure_button_action_;
@@ -122,4 +116,4 @@ private:
 } // namespace toolbars
 } // namespace pv
 
-#endif // PULSEVIEW_PV_TOOLBARS_MAINBAR_H
+#endif // PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP