X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevicemanager.hpp;h=43d93a7a88f5778d0bed24bcead6ec1f2e9dc85e;hp=d6548ae12c99fe1b6f4e1310b742bd2ecdd87c45;hb=1978e0c26e20c0ffbea35add4c7bae0075aec4c7;hpb=c732664f019d4934da970f4656c4857a4aa35398

diff --git a/pv/devicemanager.hpp b/pv/devicemanager.hpp
index d6548ae1..43d93a7a 100644
--- a/pv/devicemanager.hpp
+++ b/pv/devicemanager.hpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PULSEVIEW_PV_DEVICEMANAGER_HPP
@@ -26,6 +25,11 @@
 #include <memory>
 #include <string>
 
+using std::list;
+using std::map;
+using std::shared_ptr;
+using std::string;
+
 namespace Glib {
 class VariantBase;
 }
@@ -34,56 +38,47 @@ namespace sigrok {
 class ConfigKey;
 class Context;
 class Driver;
-class Device;
-class HardwareDevice;
 }
 
 namespace pv {
 
+namespace devices {
+class Device;
+class HardwareDevice;
+}
+
 class Session;
 
 class DeviceManager
 {
 public:
-	DeviceManager(std::shared_ptr<sigrok::Context> context);
-
-	~DeviceManager();
-
-	const std::shared_ptr<sigrok::Context>& context() const;
+	DeviceManager(shared_ptr<sigrok::Context> context);
 
-	std::shared_ptr<sigrok::Context> context();
+	~DeviceManager() = default;
 
-	const std::list< std::shared_ptr<sigrok::HardwareDevice> >&
-		devices() const;
+	const shared_ptr<sigrok::Context>& context() const;
 
-	std::list< std::shared_ptr<sigrok::HardwareDevice> > driver_scan(
-		std::shared_ptr<sigrok::Driver> driver,
-		std::map<const sigrok::ConfigKey *, Glib::VariantBase> drvopts);
+	shared_ptr<sigrok::Context> context();
 
-	const std::map<std::string, std::string> get_device_info(
-		const std::shared_ptr<sigrok::Device> device);
+	const list< shared_ptr<devices::HardwareDevice> >& devices() const;
 
-	const std::shared_ptr<sigrok::HardwareDevice> find_device_from_info(
-		const std::map<std::string, std::string> search_info);
+	list< shared_ptr<devices::HardwareDevice> > driver_scan(
+		shared_ptr<sigrok::Driver> driver,
+		map<const sigrok::ConfigKey *, Glib::VariantBase> drvopts);
 
-	void build_display_name(std::shared_ptr<sigrok::Device> device);
+	const map<string, string> get_device_info(
+		const shared_ptr<devices::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);
+	const shared_ptr<devices::HardwareDevice> find_device_from_info(
+		const map<string, string> search_info);
 
 private:
-	bool compare_devices(std::shared_ptr<sigrok::Device> a,
-		std::shared_ptr<sigrok::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<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_;
+	shared_ptr<sigrok::Context> context_;
+	list< shared_ptr<devices::HardwareDevice> > devices_;
 };
 
 } // namespace pv