diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-08-08 18:20:28 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-08-16 12:13:28 +0200 |
commit | 9cd37337dec6c970a1fd148e92ffc43fbf409cc3 (patch) | |
tree | 97635a16a175bb4b4a1d51cedea603bc24b77d7d /rbutil/rbutilqt/base/system.cpp | |
parent | b1332d974aa065e3c2a01408625d7c2c5b7fc77c (diff) | |
download | rockbox-9cd37337dec6c970a1fd148e92ffc43fbf409cc3.tar.gz rockbox-9cd37337dec6c970a1fd148e92ffc43fbf409cc3.zip |
rbutil: Fix various warnings.
Replace use of deprecated APIs with their replacements, and fix some
other minor warnings.
Change-Id: I3f63e0bd91b96ce86ce39c087fe0040fc226d16d
Diffstat (limited to 'rbutil/rbutilqt/base/system.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/system.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/base/system.cpp b/rbutil/rbutilqt/base/system.cpp index c33a172eeb..73f5024fa2 100644 --- a/rbutil/rbutilqt/base/system.cpp +++ b/rbutil/rbutilqt/base/system.cpp | |||
@@ -235,9 +235,9 @@ QList<uint32_t> System::listUsbIds(void) | |||
235 | /** @brief detect devices based on usb pid / vid. | 235 | /** @brief detect devices based on usb pid / vid. |
236 | * @return list with usb VID / PID values. | 236 | * @return list with usb VID / PID values. |
237 | */ | 237 | */ |
238 | QMap<uint32_t, QString> System::listUsbDevices(void) | 238 | QMultiMap<uint32_t, QString> System::listUsbDevices(void) |
239 | { | 239 | { |
240 | QMap<uint32_t, QString> usbids; | 240 | QMultiMap<uint32_t, QString> usbids; |
241 | // usb pid detection | 241 | // usb pid detection |
242 | LOG_INFO() << "Searching for USB devices"; | 242 | LOG_INFO() << "Searching for USB devices"; |
243 | #if defined(Q_OS_LINUX) | 243 | #if defined(Q_OS_LINUX) |
@@ -272,7 +272,7 @@ QMap<uint32_t, QString> System::listUsbDevices(void) | |||
272 | if(name.isEmpty()) | 272 | if(name.isEmpty()) |
273 | name = tr("(no description available)"); | 273 | name = tr("(no description available)"); |
274 | if(id) { | 274 | if(id) { |
275 | usbids.insertMulti(id, name); | 275 | usbids.insert(id, name); |
276 | LOG_INFO("USB: 0x%08x, %s", id, name.toLocal8Bit().data()); | 276 | LOG_INFO("USB: 0x%08x, %s", id, name.toLocal8Bit().data()); |
277 | } | 277 | } |
278 | } | 278 | } |