X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fwidgets%2Fdevicetoolbutton.hpp;h=ed69a4b64a4ef1b0209daf004f2192117a9af8c6;hb=f32905530347e1020d5ce7959123cf797c9a4829;hp=af9e6e686da2a0dfe5662adf3a48d6d4b52b976e;hpb=7a01bd3654ed046216308fa64edfd79be7cd525f;p=pulseview.git diff --git a/pv/widgets/devicetoolbutton.hpp b/pv/widgets/devicetoolbutton.hpp index af9e6e6..ed69a4b 100644 --- a/pv/widgets/devicetoolbutton.hpp +++ b/pv/widgets/devicetoolbutton.hpp @@ -32,14 +32,14 @@ struct srd_decoder; -namespace sigrok { -class Device; -} - namespace pv { class DeviceManager; +namespace devices { +class Device; +} + namespace widgets { class DeviceToolButton : public QToolButton @@ -59,7 +59,7 @@ public: /** * Returns a reference to the selected device. */ - std::shared_ptr selected_device(); + std::shared_ptr selected_device(); /** * Sets the current list of devices. @@ -67,8 +67,8 @@ public: * @param selected_device the currently active device. */ void set_device_list( - const std::list< std::shared_ptr > &devices, - std::shared_ptr selected); + const std::list< std::shared_ptr > &devices, + std::shared_ptr selected); private: /** @@ -93,8 +93,8 @@ private: QMenu menu_; QSignalMapper mapper_; - std::shared_ptr selected_device_; - std::vector< std::weak_ptr > devices_; + std::shared_ptr selected_device_; + std::vector< std::weak_ptr > devices_; QString device_tooltip_; };