From 71d4ecc04c23342f207e7f1133ea8824a1dcdd16 Mon Sep 17 00:00:00 2001
From: Robin Krahl <me@robin-krahl.de>
Date: Sun, 13 Jan 2019 12:03:43 +0100
Subject: Change Nitrokey::list_devices return type to use DeviceInfo

In the previous commit, we changed the return value of Device::enumerate
to std::vector<DeviceInfo>.  Now we change Nitrokey::list_devices to
also return DeviceInfo instances.
---
 NitrokeyManager.cc | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'NitrokeyManager.cc')

diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc
index 8825fce..8ca4698 100644
--- a/NitrokeyManager.cc
+++ b/NitrokeyManager.cc
@@ -105,16 +105,11 @@ using nitrokey::misc::strcpyT;
       return true;
     }
 
-    std::vector<std::string> NitrokeyManager::list_devices(){
+    std::vector<DeviceInfo> NitrokeyManager::list_devices(){
         std::lock_guard<std::mutex> lock(mex_dev_com_manager);
 
         auto p = make_shared<Stick20>();
-        auto device_infos = p->enumerate();
-        std::vector<std::string> strings;
-        strings.resize(device_infos.size());
-        std::transform(device_infos.begin(), device_infos.end(), strings.begin(),
-            [](auto device_info) { return device_info.m_path; });
-        return strings;
+        return p->enumerate();
     }
 
     std::vector<std::string> NitrokeyManager::list_devices_by_cpuID(){
-- 
cgit v1.2.1