X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fdevicetoolbutton.hpp;h=ee7b12ae81aaeed1decbb3f90c502ad7c675e28b;hp=cedf49e78386d58482e42b6ac98c439ab89c5b98;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hpb=efdec55aec1a137460fa362a381ed1904182bfed diff --git a/pv/widgets/devicetoolbutton.hpp b/pv/widgets/devicetoolbutton.hpp index cedf49e..ee7b12a 100644 --- a/pv/widgets/devicetoolbutton.hpp +++ b/pv/widgets/devicetoolbutton.hpp @@ -29,6 +29,11 @@ #include #include +using std::list; +using std::shared_ptr; +using std::vector; +using std::weak_ptr; + struct srd_decoder; namespace pv { @@ -58,7 +63,7 @@ public: /** * Returns a reference to the selected device. */ - std::shared_ptr selected_device(); + shared_ptr selected_device(); /** * Sets the current list of devices. @@ -66,8 +71,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 list< shared_ptr > &devices, + shared_ptr selected); /** * Sets the current device to "no device". Useful for when a selected @@ -98,13 +103,13 @@ private: QMenu menu_; QSignalMapper mapper_; - std::shared_ptr selected_device_; - std::vector< std::weak_ptr > devices_; + shared_ptr selected_device_; + vector< weak_ptr > devices_; QString device_tooltip_; }; -} // widgets -} // pv +} // namespace widgets +} // namespace pv #endif // PULSEVIEW_PV_WIDGETS_DEVICETOOLBUTTON_HPP