diff options
| -rw-r--r-- | examples/terminal/settingsdialog.cpp | 10 | ||||
| -rw-r--r-- | examples/terminal/settingsdialog.ui | 2 | ||||
| -rw-r--r-- | src/serialport/qserialport.cpp | 14 | ||||
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 16 | ||||
| -rw-r--r-- | src/serialport/qserialportinfo.cpp | 12 | ||||
| -rw-r--r-- | src/serialport/qserialportinfo_mac.cpp | 22 | ||||
| -rw-r--r-- | src/serialport/qserialportinfo_symbian.cpp | 94 | ||||
| -rw-r--r-- | src/serialport/qserialportinfo_unix.cpp | 40 | ||||
| -rw-r--r-- | src/serialport/qserialportinfo_win.cpp | 22 | ||||
| -rw-r--r-- | src/serialport/qserialportinfo_wince.cpp | 14 | ||||
| -rw-r--r-- | tests/manual/qserialport/tst_qserialport.cpp | 42 | ||||
| -rw-r--r-- | tests/manual/qserialportinfo/tst_qserialportinfo.cpp | 4 |
12 files changed, 144 insertions, 148 deletions
diff --git a/examples/terminal/settingsdialog.cpp b/examples/terminal/settingsdialog.cpp index 81f2f2a..a125db4 100644 --- a/examples/terminal/settingsdialog.cpp +++ b/examples/terminal/settingsdialog.cpp @@ -59,7 +59,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : connect(ui->applyButton, SIGNAL(clicked()), this, SLOT(apply())); - connect(ui->portsBox, SIGNAL(currentIndexChanged(int)), + connect(ui->serialPortInfoListBox, SIGNAL(currentIndexChanged(int)), this, SLOT(showPortInfo(int))); connect(ui->baudRateBox, SIGNAL(currentIndexChanged(int)), this, SLOT(checkCustomBaudRatePolicy(int))); @@ -83,7 +83,7 @@ SettingsDialog::Settings SettingsDialog::settings() const void SettingsDialog::showPortInfo(int idx) { if (idx != -1) { - QStringList list = ui->portsBox->itemData(idx).toStringList(); + QStringList list = ui->serialPortInfoListBox->itemData(idx).toStringList(); ui->descriptionLabel->setText(tr("Description: %1").arg(list.at(1))); ui->manufacturerLabel->setText(tr("Manufacturer: %1").arg(list.at(2))); ui->locationLabel->setText(tr("Location: %1").arg(list.at(3))); @@ -148,20 +148,20 @@ void SettingsDialog::fillPortsParameters() void SettingsDialog::fillPortsInfo() { - ui->portsBox->clear(); + ui->serialPortInfoListBox->clear(); foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts()) { QStringList list; list << info.portName() << info.description() << info.manufacturer() << info.systemLocation() << info.vendorIdentifier() << info.productIdentifier(); - ui->portsBox->addItem(list.first(), list); + ui->serialPortInfoListBox->addItem(list.first(), list); } } void SettingsDialog::updateSettings() { - currentSettings.name = ui->portsBox->currentText(); + currentSettings.name = ui->serialPortInfoListBox->currentText(); // Baud Rate if (ui->baudRateBox->currentIndex() == 4) { diff --git a/examples/terminal/settingsdialog.ui b/examples/terminal/settingsdialog.ui index 8dd2341..7c0f33a 100644 --- a/examples/terminal/settingsdialog.ui +++ b/examples/terminal/settingsdialog.ui @@ -21,7 +21,7 @@ </property> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> - <widget class="QComboBox" name="portsBox"/> + <widget class="QComboBox" name="serialPortInfoListBox"/> </item> <item row="1" column="0"> <widget class="QLabel" name="descriptionLabel"> diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index 4a1d0a0..eda78dd 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -400,14 +400,14 @@ QSerialPort::QSerialPort(const QString &name, QObject *parent) /*! Constructs a new serial port object with the given \a parent - to represent the serial port with the specified a helper - class \a info. + to represent the serial port with the specified helper class + \a serialPortInfo. */ -QSerialPort::QSerialPort(const QSerialPortInfo &info, QObject *parent) +QSerialPort::QSerialPort(const QSerialPortInfo &serialPortInfo, QObject *parent) : QIODevice(parent) , d_ptr(new QSerialPortPrivate(this)) { - setPort(info); + setPort(serialPortInfo); } /*! @@ -435,14 +435,14 @@ void QSerialPort::setPort(const QString &name) } /*! - Sets the port stored in the serial port info instance \a info. + Sets the port stored in the serial port info instance \a serialPortInfo. \sa portName(), QSerialPortInfo */ -void QSerialPort::setPort(const QSerialPortInfo &info) +void QSerialPort::setPort(const QSerialPortInfo &serialPortInfo) { Q_D(QSerialPort); - d->systemLocation = QSerialPortPrivate::portNameToSystemLocation(info.systemLocation()); + d->systemLocation = QSerialPortPrivate::portNameToSystemLocation(serialPortInfo.systemLocation()); } /*! diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp index 6d41f5f..74ebd3f 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -1169,10 +1169,10 @@ qint64 QSerialPortPrivate::readPerChar(char *data, qint64 maxSize) } #ifdef Q_OS_MAC -static const QLatin1String defaultPathPrefix("/dev/cu."); -static const QLatin1String notUsedPathPrefix("/dev/tty."); +static const QLatin1String defaultFilePathPrefix("/dev/cu."); +static const QLatin1String unusedFilePathPrefix("/dev/tty."); #else -static const QLatin1String defaultPathPrefix("/dev/"); +static const QLatin1String defaultFilePathPrefix("/dev/"); #endif QString QSerialPortPrivate::portNameToSystemLocation(const QString &port) @@ -1180,11 +1180,11 @@ QString QSerialPortPrivate::portNameToSystemLocation(const QString &port) QString ret = port; #ifdef Q_OS_MAC - ret.remove(notUsedPathPrefix); + ret.remove(unusedFilePathPrefix); #endif - if (!ret.contains(defaultPathPrefix)) - ret.prepend(defaultPathPrefix); + if (!ret.contains(defaultFilePathPrefix)) + ret.prepend(defaultFilePathPrefix); return ret; } @@ -1193,10 +1193,10 @@ QString QSerialPortPrivate::portNameFromSystemLocation(const QString &location) QString ret = location; #ifdef Q_OS_MAC - ret.remove(notUsedPathPrefix); + ret.remove(unusedFilePathPrefix); #endif - ret.remove(defaultPathPrefix); + ret.remove(defaultFilePathPrefix); return ret; } diff --git a/src/serialport/qserialportinfo.cpp b/src/serialport/qserialportinfo.cpp index f8afe0a..fe2b43d 100644 --- a/src/serialport/qserialportinfo.cpp +++ b/src/serialport/qserialportinfo.cpp @@ -92,9 +92,9 @@ QSerialPortInfo::QSerialPortInfo(const QSerialPortInfo &other) QSerialPortInfo::QSerialPortInfo(const QSerialPort &port) : d_ptr(new QSerialPortInfoPrivate) { - foreach (const QSerialPortInfo &info, availablePorts()) { - if (port.portName() == info.portName()) { - *this = info; + foreach (const QSerialPortInfo &serialPortInfo, availablePorts()) { + if (port.portName() == serialPortInfo.portName()) { + *this = serialPortInfo; break; } } @@ -110,9 +110,9 @@ QSerialPortInfo::QSerialPortInfo(const QSerialPort &port) QSerialPortInfo::QSerialPortInfo(const QString &name) : d_ptr(new QSerialPortInfoPrivate) { - foreach (const QSerialPortInfo &info, availablePorts()) { - if (name == info.portName()) { - *this = info; + foreach (const QSerialPortInfo &serialPortInfo, availablePorts()) { + if (name == serialPortInfo.portName()) { + *this = serialPortInfo; break; } } diff --git a/src/serialport/qserialportinfo_mac.cpp b/src/serialport/qserialportinfo_mac.cpp index 3a82bdf..e4eaa2f 100644 --- a/src/serialport/qserialportinfo_mac.cpp +++ b/src/serialport/qserialportinfo_mac.cpp @@ -63,7 +63,7 @@ enum { MATCHING_PROPERTIES_COUNT = 6 }; QList<QSerialPortInfo> QSerialPortInfo::availablePorts() { - QList<QSerialPortInfo> ports; + QList<QSerialPortInfo> serialPortInfoList; int matchingPropertiesCounter = 0; @@ -80,7 +80,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() &iter); if (kr != kIOReturnSuccess) - return ports; + return serialPortInfoList; io_registry_entry_t service; @@ -187,7 +187,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() // Convert from MacOSX-specific properties to Qt4-specific. if (matchingPropertiesCounter > 0) { - QSerialPortInfo info; + QSerialPortInfo serialPortInfo; QByteArray buffer(MAXPATHLEN, 0); if (device) { @@ -195,7 +195,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() buffer.data(), buffer.size(), kCFStringEncodingUTF8)) { - info.d_ptr->device = QString::fromUtf8(buffer); + serialPortInfo.d_ptr->device = QString(buffer); } ::CFRelease(device); } @@ -205,7 +205,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() buffer.data(), buffer.size(), kCFStringEncodingUTF8)) { - info.d_ptr->portName = QString::fromUtf8(buffer); + serialPortInfo.d_ptr->portName = QString(buffer); } ::CFRelease(portName); } @@ -216,7 +216,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() buffer.size(), kCFStringEncodingUTF8); - info.d_ptr->description = QString::fromUtf8(buffer); + serialPortInfo.d_ptr->description = QString(buffer); ::CFRelease(description); } @@ -226,7 +226,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() buffer.size(), kCFStringEncodingUTF8); - info.d_ptr->manufacturer = QString::fromUtf8(buffer); + serialPortInfo.d_ptr->manufacturer = QString(buffer); ::CFRelease(manufacturer); } @@ -237,7 +237,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() kCFNumberIntType, &value); - info.d_ptr->vendorIdentifier = QString::number(value, 16); + serialPortInfo.d_ptr->vendorIdentifier = QString::number(value, 16); ::CFRelease(vendorIdentifier); } @@ -246,11 +246,11 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() kCFNumberIntType, &value); - info.d_ptr->productIdentifier = QString::number(value, 16); + serialPortInfo.d_ptr->productIdentifier = QString::number(value, 16); ::CFRelease(productIdentifier); } - ports.append(info); + serialPortInfoList.append(serialPortInfo); } (void) ::IOObjectRelease(service); @@ -258,7 +258,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() (void) ::IOObjectRelease(iter); - return ports; + return serialPortInfoList; } QT_END_NAMESPACE_SERIALPORT diff --git a/src/serialport/qserialportinfo_symbian.cpp b/src/serialport/qserialportinfo_symbian.cpp index ab84279..47b270f 100644 --- a/src/serialport/qserialportinfo_symbian.cpp +++ b/src/serialport/qserialportinfo_symbian.cpp @@ -101,38 +101,37 @@ static bool loadDevices() QList<QSerialPortInfo> QSerialPortInfo::availablePorts() { - QList<QSerialPortInfo> ports; + QList<QSerialPortInfo> serialPortInfoList; if (!loadDevices()) - return ports; + return serialPortInfoList; RCommServ server; TInt r = server.Connect(); if (r != KErrNone) - return ports; //User::LeaveIfError(r); + return serialPortInfoList; //User::LeaveIfError(r); - TSerialInfo nativeInfo; // Native Symbian OS port info class. + TSerialInfo nativeSerialInfo; // Native Symbian OS port info class. QString s("%1::%2"); // FIXME: Get info about RS232 ports. r = server.LoadCommModule(KRS232ModuleName); //User::LeaveIfError(r); if (r == KErrNone) { - r = server.GetPortInfo(KRS232ModuleName, nativeInfo); + r = server.GetPortInfo(KRS232ModuleName, nativeSerialInfo); if (r == KErrNone) { - // - for (quint32 i = nativeInfo.iLowUnit; i < nativeInfo.iHighUnit + 1; ++i) { + for (quint32 i = nativeSerialInfo.iLowUnit; i < nativeSerialInfo.iHighUnit + 1; ++i) { - QSerialPortInfo info; // My (desired) info class. + QSerialPortInfo serialPortInfo; - info.d_ptr->device = s - .arg(QString::fromUtf16(nativeInfo.iName.Ptr(), nativeInfo.iName.Length())) + serialPortInfo.d_ptr->device = s + .arg(QString::fromUtf16(nativeSerialInfo.iName.Ptr(), nativeSerialInfo.iName.Length())) .arg(i); - info.d_ptr->portName = info.d_ptr->device; - info.d_ptr->description = - QString::fromUtf16(nativeInfo.iDescription.Ptr(), nativeInfo.iDescription.Length()); - info.d_ptr->manufacturer = QString(QObject::tr("Unknown.")); - ports.append(info); + serialPortInfo.d_ptr->portName = serialPortInfo.d_ptr->device; + serialPortInfo.d_ptr->description = + QString::fromUtf16(nativeSerialInfo.iDescription.Ptr(), nativeSerialInfo.iDescription.Length()); + serialPortInfo.d_ptr->manufacturer = QString(QObject::tr("Unknown.")); + serialPortInfoList.append(serialPortInfo); } } } @@ -141,21 +140,20 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() r = server.LoadCommModule(KBluetoothModuleName); //User::LeaveIfError(r); if (r == KErrNone) { - r = server.GetPortInfo(KBluetoothModuleName, nativeInfo); + r = server.GetPortInfo(KBluetoothModuleName, nativeSerialInfo); if (r == KErrNone) { - // - for (quint32 i = nativeInfo.iLowUnit; i < nativeInfo.iHighUnit + 1; ++i) { + for (quint32 i = nativeSerialInfo.iLowUnit; i < nativeSerialInfo.iHighUnit + 1; ++i) { - QSerialPortInfo info; // My (desired) info class. + QSerialPortInfo serialPortInfo; - info.d_ptr->device = s - .arg(QString::fromUtf16(nativeInfo.iName.Ptr(), nativeInfo.iName.Length())) + serialPortInfo.d_ptr->device = s + .arg(QString::fromUtf16(nativeSerialInfo.iName.Ptr(), nativeSerialInfo.iName.Length())) .arg(i); - info.d_ptr->portName = info.d_ptr->device; - info.d_ptr->description = - QString::fromUtf16(nativeInfo.iDescription.Ptr(), nativeInfo.iDescription.Length()); - info.d_ptr->manufacturer = QString(QObject::tr("Unknown.")); - ports.append(info); + serialPortInfo.d_ptr->portName = serialPortInfo.d_ptr->device; + serialPortInfo.d_ptr->description = + QString::fromUtf16(nativeSerialInfo.iDescription.Ptr(), nativeSerialInfo.iDescription.Length()); + serialPortInfo.d_ptr->manufacturer = QString(QObject::tr("Unknown.")); + serialPortInfoList.append(serialPortInfo); } } } @@ -164,21 +162,20 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() r = server.LoadCommModule(KInfraRedModuleName); //User::LeaveIfError(r); if (r == KErrNone) { - r = server.GetPortInfo(KInfraRedModuleName, nativeInfo); + r = server.GetPortInfo(KInfraRedModuleName, nativeSerialInfo); if (r == KErrNone) { - // - for (quint32 i = nativeInfo.iLowUnit; i < nativeInfo.iHighUnit + 1; ++i) { + for (quint32 i = nativeSerialInfo.iLowUnit; i < nativeSerialInfo.iHighUnit + 1; ++i) { - QSerialPortInfo info; // My (desired) info class. + QSerialPortInfo serialPortInfo; - info.d_ptr->device = s - .arg(QString::fromUtf16(nativeInfo.iName.Ptr(), nativeInfo.iName.Length())) + serialPortInfo.d_ptr->device = s + .arg(QString::fromUtf16(nativeSerialInfo.iName.Ptr(), nativeSerialInfo.iName.Length())) .arg(i); - info.d_ptr->portName = info.d_ptr->device; - info.d_ptr->description = - QString::fromUtf16(nativeInfo.iDescription.Ptr(), nativeInfo.iDescription.Length()); - info.d_ptr->manufacturer = QString(QObject::tr("Unknown.")); - ports.append(info); + serialPortInfo.d_ptr->portName = serialPortInfo.d_ptr->device; + serialPortInfo.d_ptr->description = + QString::fromUtf16(nativeSerialInfo.iDescription.Ptr(), nativeSerialInfo.iDescription.Length()); + serialPortInfo.d_ptr->manufacturer = QString(QObject::tr("Unknown.")); + serialPortInfoList.append(serialPortInfo); } } } @@ -187,26 +184,25 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() r = server.LoadCommModule(KACMModuleName); //User::LeaveIfError(r); if (r == KErrNone) { - r = server.GetPortInfo(KACMModuleName, nativeInfo); + r = server.GetPortInfo(KACMModuleName, nativeSerialInfo); if (r == KErrNone) { - // - for (quint32 i = nativeInfo.iLowUnit; i < nativeInfo.iHighUnit + 1; ++i) { + for (quint32 i = nativeSerialInfo.iLowUnit; i < nativeSerialInfo.iHighUnit + 1; ++i) { - QSerialPortInfo info; // My (desired) info class. + QSerialPortInfo serialPortInfo; - info.d_ptr->device = s - .arg(QString::fromUtf16(nativeInfo.iName.Ptr(), nativeInfo.iName.Length())) + serialPortInfo.d_ptr->device = s + .arg(QString::fromUtf16(nativeSerialInfo.iName.Ptr(), nativeSerialInfo.iName.Length())) .arg(i); - info.d_ptr->portName = QSerialPortPrivate::portNameFromSystemLocation(info.d_ptr->device); - info.d_ptr->description = - QString::fromUtf16(nativeInfo.iDescription.Ptr(), nativeInfo.iDescription.Length()); - info.d_ptr->manufacturer = QString(QObject::tr("Unknown.")); - ports.append(info); + serialPortInfo.d_ptr->portName = QSerialPortPrivate::portNameFromSystemLocation(serialPortInfo.d_ptr->device); + serialPortInfo.d_ptr->description = + QString::fromUtf16(nativeSerialInfo.iDescription.Ptr(), nativeSerialInfo.iDescription.Length()); + serialPortInfo.d_ptr->manufacturer = QString(QObject::tr("Unknown.")); + serialPortInfoList.append(serialPortInfo); } } } - return ports; + return serialPortInfoList; } QList<qint32> QSerialPortInfo::standardRates() diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index 58d26c1..cda6529 100644 --- a/src/serialport/qserialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -91,7 +91,7 @@ static inline const QStringList& filtersOfDevices() QList<QSerialPortInfo> QSerialPortInfo::availablePorts() { - QList<QSerialPortInfo> ports; + QList<QSerialPortInfo> serialPortInfoList; #if defined (Q_OS_LINUX) && defined (HAVE_LIBUDEV) @@ -121,11 +121,11 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() if (dev) { - QSerialPortInfo info; + QSerialPortInfo serialPortInfo; - info.d_ptr->device = + serialPortInfo.d_ptr->device = QLatin1String(::udev_device_get_devnode(dev)); - info.d_ptr->portName = + serialPortInfo.d_ptr->portName = QLatin1String(::udev_device_get_sysname(dev)); struct ::udev_device *parentdev = ::udev_device_get_parent(dev); @@ -139,16 +139,16 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() if (subsys == QLatin1String("usb-serial") || subsys == QLatin1String("usb")) { // USB bus type // Append this devices and try get additional information about them. - info.d_ptr->description = QString( + serialPortInfo.d_ptr->description = QString( QLatin1String(::udev_device_get_property_value(dev, "ID_MODEL"))).replace('_', ' '); - info.d_ptr->manufacturer = QString( + serialPortInfo.d_ptr->manufacturer = QString( QLatin1String(::udev_device_get_property_value(dev, "ID_VENDOR"))).replace('_', ' '); - info.d_ptr->vendorIdentifier = + serialPortInfo.d_ptr->vendorIdentifier = QLatin1String(::udev_device_get_property_value(dev, "ID_VENDOR_ID")); - info.d_ptr->productIdentifier = + serialPortInfo.d_ptr->productIdentifier = QLatin1String(::udev_device_get_property_value(dev, "ID_MODEL_ID")); } else if (subsys == QLatin1String("pnp")) { // PNP bus type @@ -168,11 +168,11 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() // with this subsystems? } } else { // Devices without a parent - if (info.d_ptr->portName.startsWith(rfcommDeviceName)) { // Bluetooth device + if (serialPortInfo.d_ptr->portName.startsWith(rfcommDeviceName)) { // Bluetooth device bool ok; // Check for an unsigned decimal integer at the end of the device name: "rfcomm0", "rfcomm15" // devices with negative and invalid numbers in the name are rejected - int portNumber = info.d_ptr->portName.mid(rfcommDeviceName.length()).toInt(&ok); + int portNumber = serialPortInfo.d_ptr->portName.mid(rfcommDeviceName.length()).toInt(&ok); if (!ok || (portNumber < 0) || (portNumber > 255)) { canAppendToList = false; @@ -183,7 +183,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() } if (canAppendToList) - ports.append(info); + serialPortInfoList.append(serialPortInfo); ::udev_device_unref(dev); } @@ -208,20 +208,20 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() QStringList foundDevices; // Found devices list. - foreach (const QFileInfo &fi, devDir.entryInfoList()) { - QString s = fi.absoluteFilePath(); - if (!foundDevices.contains(s)) { - foundDevices.append(s); + foreach (const QFileInfo &deviceFileInfo, devDir.entryInfoList()) { + QString deviceFilePath = deviceFileInfo.absoluteFilePath(); + if (!foundDevices.contains(deviceFilePath)) { + foundDevices.append(deviceFilePath); - QSerialPortInfo info; + QSerialPortInfo serialPortInfo; - info.d_ptr->device = s; - info.d_ptr->portName = QSerialPortPrivate::portNameFromSystemLocation(s); + serialPortInfo.d_ptr->device = deviceFilePath; + serialPortInfo.d_ptr->portName = QSerialPortPrivate::portNameFromSystemLocation(deviceFilePath); // Get description, manufacturer, vendor identifier, product // identifier are not supported. - ports.append(info); + serialPortInfoList.append(serialPortInfo); } } @@ -229,7 +229,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() #endif - return ports; + return serialPortInfoList; } #endif // Q_OS_MAC diff --git a/src/serialport/qserialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp index 290eac7..e464c60 100644 --- a/src/serialport/qserialportinfo_win.cpp +++ b/src/serialport/qserialportinfo_win.cpp @@ -147,13 +147,13 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() static const QString productIdentifierPrefix(QLatin1String("PID_")); static const int productIdentifierSize = 4; - QList<QSerialPortInfo> ports; + QList<QSerialPortInfo> serialPortInfoList; static const int guidCount = sizeof(guidsArray)/sizeof(guidsArray[0]); for (int i = 0; i < guidCount; ++i) { const HDEVINFO deviceInfoSet = ::SetupDiGetClassDevs(&guidsArray[i], NULL, 0, DIGCF_PRESENT); if (deviceInfoSet == INVALID_HANDLE_VALUE) - return ports; + return serialPortInfoList; SP_DEVINFO_DATA deviceInfoData; ::memset(&deviceInfoData, 0, sizeof(deviceInfoData)); @@ -161,34 +161,34 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() DWORD index = 0; while (::SetupDiEnumDeviceInfo(deviceInfoSet, index++, &deviceInfoData)) { - QSerialPortInfo info; + QSerialPortInfo serialPortInfo; QString s = devicePortName(deviceInfoSet, &deviceInfoData); if (s.isEmpty() || s.contains(QLatin1String("LPT"))) continue; - info.d_ptr->portName = s; - info.d_ptr->device = QSerialPortPrivate::portNameToSystemLocation(s); - info.d_ptr->description = + serialPortInfo.d_ptr->portName = s; + serialPortInfo.d_ptr->device = QSerialPortPrivate::portNameToSystemLocation(s); + serialPortInfo.d_ptr->description = deviceRegistryProperty(deviceInfoSet, &deviceInfoData, SPDRP_DEVICEDESC).toString(); - info.d_ptr->manufacturer = + serialPortInfo.d_ptr->manufacturer = deviceRegistryProperty(deviceInfoSet, &deviceInfoData, SPDRP_MFG).toString(); s = deviceRegistryProperty(deviceInfoSet, &deviceInfoData, SPDRP_HARDWAREID).toStringList().first().toUpper(); int index = s.indexOf(vendorIdentifierPrefix); if (index != -1) - info.d_ptr->vendorIdentifier = s.mid(index + vendorIdentifierPrefix.size(), vendorIdentifierSize); + serialPortInfo.d_ptr->vendorIdentifier = s.mid(index + vendorIdentifierPrefix.size(), vendorIdentifierSize); index = s.indexOf(productIdentifierPrefix); if (index != -1) - info.d_ptr->productIdentifier = s.mid(index + productIdentifierPrefix.size(), productIdentifierSize); + serialPortInfo.d_ptr->productIdentifier = s.mid(index + productIdentifierPrefix.size(), productIdentifierSize); - ports.append(info); + serialPortInfoList.append(serialPortInfo); } ::SetupDiDestroyDeviceInfoList(deviceInfoSet); } - return ports; + return serialPortInfoList; } #endif diff --git a/src/serialport/qserialportinfo_wince.cpp b/src/serialport/qserialportinfo_wince.cpp index 35a1e44..d6623bf 100644 --- a/src/serialport/qserialportinfo_wince.cpp +++ b/src/serialport/qserialportinfo_wince.cpp @@ -104,7 +104,7 @@ static QString findDescription(HKEY parentKeyHandle, const QString &subKey) QList<QSerialPortInfo> QSerialPortInfo::availablePorts() { - QList<QSerialPortInfo> ports; + QList<QSerialPortInfo> serialPortInfoList; DEVMGR_DEVICE_INFORMATION di; di.dwSize = sizeof(di); @@ -113,22 +113,22 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() &di); if (hSearch != INVALID_HANDLE_VALUE) { do { - QSerialPortInfo info; - info.d_ptr->device = QString::fromWCharArray(di.szLegacyName); - info.d_ptr->portName = QSerialPortPrivate::portNameFromSystemLocation(info.d_ptr->device); - info.d_ptr->description = findDescription(HKEY_LOCAL_MACHINE, + QSerialPortInfo serialPortInfo; + serialPortInfo.d_ptr->device = QString::fromWCharArray(di.szLegacyName); + serialPortInfo.d_ptr->portName = QSerialPortPrivate::portNameFromSystemLocation(serialPortInfo.d_ptr->device); + serialPortInfo.d_ptr->description = findDescription(HKEY_LOCAL_MACHINE, QString::fromWCharArray(di.szDeviceKey)); // Get manufacturer, vendor identifier, product identifier are not // possible. - ports.append(info); + serialPortInfoList.append(serialPortInfo); } while (::FindNextDevice(hSearch, &di)); ::FindClose(hSearch); } - return ports; + return serialPortInfoList; } QT_END_NAMESPACE_SERIALPORT diff --git a/tests/manual/qserialport/tst_qserialport.cpp b/tests/manual/qserialport/tst_qserialport.cpp index c74218e..7dcbc04 100644 --- a/tests/manual/qserialport/tst_qserialport.cpp +++ b/tests/manual/qserialport/tst_qserialport.cpp @@ -61,14 +61,14 @@ private slots: void flowControl(); private: - QList<QSerialPortInfo> ports; + QList<QSerialPortInfo> serialPortInfoList; }; void tst_QSerialPort::initTestCase() { - ports = QSerialPortInfo::availablePorts(); + serialPortInfoList = QSerialPortInfo::availablePorts(); - if (ports.isEmpty()) { + if (serialPortInfoList.isEmpty()) { #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) QSKIP("Test doesn't work because the serial ports are not detected."); #else @@ -79,32 +79,32 @@ void tst_QSerialPort::initTestCase() void tst_QSerialPort::open() { - foreach (const QSerialPortInfo &info, ports) { + foreach (const QSerialPortInfo &serialPortInfo, serialPortInfoList) { - if (info.isBusy()) + if (serialPortInfo.isBusy()) continue; QSerialPort object1; // Try open and check access to port by Info - object1.setPort(info); - QCOMPARE(object1.portName(), info.portName()); + object1.setPort(serialPortInfo); + QCOMPARE(object1.portName(), serialPortInfo.portName()); QCOMPARE(object1.open(QIODevice::ReadWrite), true); QCOMPARE(object1.isOpen(), true); object1.close(); QCOMPARE(object1.isOpen(), false); // Try open and check access to port by Name - object1.setPort(info.portName()); - QCOMPARE(object1.portName(), info.portName()); + object1.setPort(serialPortInfo.portName()); + QCOMPARE(object1.portName(), serialPortInfo.portName()); QCOMPARE(object1.open(QIODevice::ReadWrite), true); QCOMPARE(object1.isOpen(), true); object1.close(); QCOMPARE(object1.isOpen(), false); // Try open and check access to port by Location - object1.setPort(info.systemLocation()); - QCOMPARE(object1.portName(), info.portName()); + object1.setPort(serialPortInfo.systemLocation()); + QCOMPARE(object1.portName(), serialPortInfo.portName()); QCOMPARE(object1.open(QIODevice::ReadWrite), true); QCOMPARE(object1.isOpen(), true); object1.close(); @@ -114,10 +114,10 @@ void tst_QSerialPort::open() void tst_QSerialPort::baudRate() { - foreach (const QSerialPortInfo &info, ports) { + foreach (const QSerialPortInfo &serialPortInfo, serialPortInfoList) { QSerialPort object1; - object1.setPort(info.portName()); + object1.setPort(serialPortInfo.portName()); QCOMPARE(object1.open(QIODevice::ReadWrite), true); QCOMPARE(object1.setBaudRate(QSerialPort::Baud1200), true); @@ -143,10 +143,10 @@ void tst_QSerialPort::baudRate() void tst_QSerialPort::dataBits() { - foreach (const QSerialPortInfo &info, ports) { + foreach (const QSerialPortInfo &serialPortInfo, serialPortInfoList) { QSerialPort object1; - object1.setPort(info.portName()); + object1.setPort(serialPortInfo.portName()); QCOMPARE(object1.open(QIODevice::ReadWrite), true); QCOMPARE(object1.setDataBits(QSerialPort::Data8), true); @@ -158,10 +158,10 @@ void tst_QSerialPort::dataBits() void tst_QSerialPort::parity() { - foreach (const QSerialPortInfo &info, ports) { + foreach (const QSerialPortInfo &serialPortInfo, serialPortInfoList) { QSerialPort object1; - object1.setPort(info.portName()); + object1.setPort(serialPortInfo.portName()); QCOMPARE(object1.open(QIODevice::ReadWrite), true); QCOMPARE(object1.setParity(QSerialPort::NoParity), true); @@ -181,10 +181,10 @@ void tst_QSerialPort::parity() void tst_QSerialPort::stopBits() { - foreach (const QSerialPortInfo &info, ports) { + foreach (const QSerialPortInfo &serialPortInfo, serialPortInfoList) { QSerialPort object1; - object1.setPort(info.portName()); + object1.setPort(serialPortInfo.portName()); QCOMPARE(object1.open(QIODevice::ReadWrite), true); QCOMPARE(object1.setStopBits(QSerialPort::OneStop), true); @@ -199,10 +199,10 @@ void tst_QSerialPort::stopBits() void tst_QSerialPort::flowControl() { - foreach (const QSerialPortInfo &info, ports) { + foreach (const QSerialPortInfo &serialPortInfo, serialPortInfoList) { QSerialPort object1; - object1.setPort(info.portName()); + object1.setPort(serialPortInfo.portName()); QCOMPARE(object1.open(QIODevice::ReadWrite), true); QCOMPARE(object1.setFlowControl(QSerialPort::NoFlowControl), true); diff --git a/tests/manual/qserialportinfo/tst_qserialportinfo.cpp b/tests/manual/qserialportinfo/tst_qserialportinfo.cpp index ffe2a5f..a2787d8 100644 --- a/tests/manual/qserialportinfo/tst_qserialportinfo.cpp +++ b/tests/manual/qserialportinfo/tst_qserialportinfo.cpp @@ -52,12 +52,12 @@ class tst_QSerialPortInfo : public QObject Q_OBJECT private slots: - void ports(); + void serialPortInfoList(); void constructors(); void assignment(); }; -void tst_QSerialPortInfo::ports() +void tst_QSerialPortInfo::serialPortInfoList() { QList<QSerialPortInfo> list(QSerialPortInfo::availablePorts()); QCOMPARE(list.isEmpty(), false); |