X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevicemanager.hpp;h=d0d11cbd4d7095bcf7f1b3fede305bd83a8a711e;hp=b99a047c6327100f9f0d15fb9b92f0ece53d418a;hb=e7aff437662e4a7dc891952bcb632d67c457d689;hpb=72d85f366c78efac46c3332cfbfe11e73c5765a2

diff --git a/pv/devicemanager.hpp b/pv/devicemanager.hpp
index b99a047c..d0d11cbd 100644
--- a/pv/devicemanager.hpp
+++ b/pv/devicemanager.hpp
@@ -27,19 +27,22 @@
 #include <string>
 
 namespace Glib {
-	class VariantBase;
+class VariantBase;
 }
 
 namespace sigrok {
-	class ConfigKey;
-	class Context;
-	class Driver;
-	class Device;
-	class HardwareDevice;
+class ConfigKey;
+class Context;
+class Driver;
 }
 
 namespace pv {
 
+namespace devices {
+class Device;
+class HardwareDevice;
+}
+
 class Session;
 
 class DeviceManager
@@ -47,43 +50,32 @@ class DeviceManager
 public:
 	DeviceManager(std::shared_ptr<sigrok::Context> context);
 
-	~DeviceManager();
+	~DeviceManager() = default;
 
 	const std::shared_ptr<sigrok::Context>& context() const;
 
 	std::shared_ptr<sigrok::Context> context();
 
-	const std::list< std::shared_ptr<sigrok::HardwareDevice> >&
+	const std::list< std::shared_ptr<devices::HardwareDevice> >&
 		devices() const;
 
-	std::list< std::shared_ptr<sigrok::HardwareDevice> > driver_scan(
+	std::list< std::shared_ptr<devices::HardwareDevice> > driver_scan(
 		std::shared_ptr<sigrok::Driver> driver,
 		std::map<const sigrok::ConfigKey *, Glib::VariantBase> drvopts);
 
 	const std::map<std::string, std::string> get_device_info(
-		const std::shared_ptr<sigrok::Device> device);
+		const std::shared_ptr<devices::Device> device);
 
-	const std::shared_ptr<sigrok::HardwareDevice> find_device_from_info(
+	const std::shared_ptr<devices::HardwareDevice> find_device_from_info(
 		const std::map<std::string, std::string> search_info);
 
-	void build_display_name(std::shared_ptr<sigrok::Device> device);
-
-	const std::string get_display_name(std::shared_ptr<sigrok::Device> dev);
-
-	const std::string get_full_name(std::shared_ptr<sigrok::Device> dev);
-
-	void update_display_name(std::shared_ptr<sigrok::Device> dev);
-
 private:
-	bool compare_devices(std::shared_ptr<sigrok::Device> a,
-		std::shared_ptr<sigrok::Device> b);
+	bool compare_devices(std::shared_ptr<devices::Device> a,
+		std::shared_ptr<devices::Device> b);
 
 protected:
 	std::shared_ptr<sigrok::Context> context_;
-	std::list< std::shared_ptr<sigrok::HardwareDevice> > devices_;
-
-	std::map< std::shared_ptr<sigrok::Device>, std::string > display_names_;
-	std::map< std::shared_ptr<sigrok::Device>, std::string > full_names_;
+	std::list< std::shared_ptr<devices::HardwareDevice> > devices_;
 };
 
 } // namespace pv