X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fwidgets%2Fdevicetoolbutton.hpp;h=ed69a4b64a4ef1b0209daf004f2192117a9af8c6;hb=f32905530347e1020d5ce7959123cf797c9a4829;hp=684d87b0b2bb72f05cf2c063178c92621411c73a;hpb=1982c6500d69f2ee005b35460944e6c2d323b465;p=pulseview.git

diff --git a/pv/widgets/devicetoolbutton.hpp b/pv/widgets/devicetoolbutton.hpp
index 684d87b..ed69a4b 100644
--- a/pv/widgets/devicetoolbutton.hpp
+++ b/pv/widgets/devicetoolbutton.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_WIDGETS_DEVICETOOLBUTTON_H
-#define PULSEVIEW_PV_WIDGETS_DEVICETOOLBUTTON_H
+#ifndef PULSEVIEW_PV_WIDGETS_DEVICETOOLBUTTON_HPP
+#define PULSEVIEW_PV_WIDGETS_DEVICETOOLBUTTON_HPP
 
 #include <list>
 #include <memory>
@@ -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<sigrok::Device> selected_device();
+	std::shared_ptr<devices::Device> 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<sigrok::Device> > &devices,
-		std::shared_ptr<sigrok::Device> selected);
+		const std::list< std::shared_ptr<devices::Device> > &devices,
+		std::shared_ptr<devices::Device> selected);
 
 private:
 	/**
@@ -93,8 +93,8 @@ private:
 	QMenu menu_;
 	QSignalMapper mapper_;
 
-	std::shared_ptr<sigrok::Device> selected_device_;
-	std::vector< std::weak_ptr<sigrok::Device> > devices_;
+	std::shared_ptr<devices::Device> selected_device_;
+	std::vector< std::weak_ptr<devices::Device> > devices_;
 
 	QString device_tooltip_;
 };
@@ -102,4 +102,4 @@ private:
 } // widgets
 } // pv
 
-#endif // PULSEVIEW_PV_WIDGETS_DEVICETOOLBUTTON_H
+#endif // PULSEVIEW_PV_WIDGETS_DEVICETOOLBUTTON_HPP