X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevicemanager.hpp;h=43d93a7a88f5778d0bed24bcead6ec1f2e9dc85e;hp=145f9e80a44e68fbfa96bafe027a4a2781c89e75;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=00f6bae935837b38b0d03a5928ba8175d460413f

diff --git a/pv/devicemanager.hpp b/pv/devicemanager.hpp
index 145f9e8..43d93a7 100644
--- a/pv/devicemanager.hpp
+++ b/pv/devicemanager.hpp
@@ -25,6 +25,11 @@
 #include <memory>
 #include <string>
 
+using std::list;
+using std::map;
+using std::shared_ptr;
+using std::string;
+
 namespace Glib {
 class VariantBase;
 }
@@ -47,34 +52,33 @@ class Session;
 class DeviceManager
 {
 public:
-	DeviceManager(std::shared_ptr<sigrok::Context> context);
+	DeviceManager(shared_ptr<sigrok::Context> context);
 
 	~DeviceManager() = default;
 
-	const std::shared_ptr<sigrok::Context>& context() const;
+	const shared_ptr<sigrok::Context>& context() const;
 
-	std::shared_ptr<sigrok::Context> context();
+	shared_ptr<sigrok::Context> context();
 
-	const std::list< std::shared_ptr<devices::HardwareDevice> >&
-		devices() const;
+	const list< shared_ptr<devices::HardwareDevice> >& devices() const;
 
-	std::list< std::shared_ptr<devices::HardwareDevice> > driver_scan(
-		std::shared_ptr<sigrok::Driver> driver,
-		std::map<const sigrok::ConfigKey *, Glib::VariantBase> drvopts);
+	list< shared_ptr<devices::HardwareDevice> > driver_scan(
+		shared_ptr<sigrok::Driver> driver,
+		map<const sigrok::ConfigKey *, Glib::VariantBase> drvopts);
 
-	const std::map<std::string, std::string> get_device_info(
-		const std::shared_ptr<devices::Device> device);
+	const map<string, string> get_device_info(
+		const shared_ptr<devices::Device> device);
 
-	const std::shared_ptr<devices::HardwareDevice> find_device_from_info(
-		const std::map<std::string, std::string> search_info);
+	const shared_ptr<devices::HardwareDevice> find_device_from_info(
+		const map<string, string> search_info);
 
 private:
-	bool compare_devices(std::shared_ptr<devices::Device> a,
-		std::shared_ptr<devices::Device> b);
+	bool compare_devices(shared_ptr<devices::Device> a,
+		shared_ptr<devices::Device> b);
 
 protected:
-	std::shared_ptr<sigrok::Context> context_;
-	std::list< std::shared_ptr<devices::HardwareDevice> > devices_;
+	shared_ptr<sigrok::Context> context_;
+	list< shared_ptr<devices::HardwareDevice> > devices_;
 };
 
 } // namespace pv