From d9a29ff7cc479e8a9e6d418de6408866f0dce4b6 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Tue, 30 Sep 2014 23:00:03 +0400 Subject: Allow for deviceInstanceIdentifier() to return an upper case string Change-Id: I91977b1aa4a8e5bd8321efc5cfda375c9d7deff7 Reviewed-by: Sergey Belyashov Reviewed-by: Denis Shienkov --- src/serialport/qserialportinfo_win.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/serialport/qserialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp index 8250d2a..d41c196 100644 --- a/src/serialport/qserialportinfo_win.cpp +++ b/src/serialport/qserialportinfo_win.cpp @@ -146,7 +146,7 @@ static QString deviceInstanceIdentifier(DEVINST deviceInstanceNumber) outputBuffer.size(), 0) != CR_SUCCESS) { return QString(); } - return toStringAndTrimNullCharacter(outputBuffer); + return toStringAndTrimNullCharacter(outputBuffer).toUpper(); } static DEVINST parentDeviceInstanceNumber(DEVINST childDeviceInstanceNumber) @@ -290,7 +290,7 @@ static QString deviceSerialNumber(const QString &instanceIdentifier, QString result = parseDeviceSerialNumber(instanceIdentifier); if (result.isEmpty()) { const DEVINST parentNumber = parentDeviceInstanceNumber(deviceInstanceNumber); - const QString parentInstanceIdentifier = deviceInstanceIdentifier(parentNumber).toUpper(); + const QString parentInstanceIdentifier = deviceInstanceIdentifier(parentNumber); result = parseDeviceSerialNumber(parentInstanceIdentifier); } return result; @@ -327,7 +327,7 @@ QList QSerialPortInfo::availablePorts() serialPortInfo.d_ptr->description = deviceDescription(deviceInfoSet, &deviceInfoData); serialPortInfo.d_ptr->manufacturer = deviceManufacturer(deviceInfoSet, &deviceInfoData); - const QString instanceIdentifier = deviceInstanceIdentifier(deviceInfoData.DevInst).toUpper(); + const QString instanceIdentifier = deviceInstanceIdentifier(deviceInfoData.DevInst); serialPortInfo.d_ptr->serialNumber = deviceSerialNumber(instanceIdentifier, deviceInfoData.DevInst); -- cgit v1.2.1