1
0
Fork 0
forked from len0rd/rockbox

rbutil: Fix various warnings.

Replace use of deprecated APIs with their replacements, and fix some
other minor warnings.

Change-Id: I3f63e0bd91b96ce86ce39c087fe0040fc226d16d
This commit is contained in:
Dominik Riebeling 2020-08-08 18:20:28 +02:00
parent b1332d974a
commit 9cd37337de
7 changed files with 11 additions and 10 deletions

View file

@ -235,9 +235,9 @@ QList<uint32_t> System::listUsbIds(void)
/** @brief detect devices based on usb pid / vid.
* @return list with usb VID / PID values.
*/
QMap<uint32_t, QString> System::listUsbDevices(void)
QMultiMap<uint32_t, QString> System::listUsbDevices(void)
{
QMap<uint32_t, QString> usbids;
QMultiMap<uint32_t, QString> usbids;
// usb pid detection
LOG_INFO() << "Searching for USB devices";
#if defined(Q_OS_LINUX)
@ -272,7 +272,7 @@ QMap<uint32_t, QString> System::listUsbDevices(void)
if(name.isEmpty())
name = tr("(no description available)");
if(id) {
usbids.insertMulti(id, name);
usbids.insert(id, name);
LOG_INFO("USB: 0x%08x, %s", id, name.toLocal8Bit().data());
}
}