From add8cb835b7e519955f1260244f7033b049d4930 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Fri, 20 May 2016 08:45:58 +0300 Subject: Replace 'forever' with 'for(;;)' ... due to 'forever' is planned to be deprecated in Qt, and as 'for' is standard keyword. Change-Id: I05bec96d637389a22a2633e4b2bd8384ba17de10 Reviewed-by: Marc Mutz --- src/serialport/qserialport.cpp | 2 +- src/serialport/qserialport_unix.cpp | 2 +- src/serialport/qserialport_win.cpp | 2 +- src/serialport/qserialportinfo_freebsd.cpp | 2 +- src/serialport/qserialportinfo_osx.cpp | 4 ++-- src/serialport/qserialportinfo_win.cpp | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index ba2f5fc..45f56c8 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -184,7 +184,7 @@ void QSerialPortPrivate::setError(const QSerialPortErrorInfo &errorInfo) int numRead = 0, numReadTotal = 0; char buffer[50]; - forever { + for (;;) { numRead = serial.read(buffer, 50); // Do whatever with the array diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp index 4d17b7d..d830085 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -414,7 +414,7 @@ bool QSerialPortPrivate::waitForBytesWritten(int msecs) QElapsedTimer stopWatch; stopWatch.start(); - forever { + for (;;) { bool readyToRead = false; bool readyToWrite = false; if (!waitForReadOrWrite(&readyToRead, &readyToWrite, true, !writeBuffer.isEmpty(), diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index 36e7164..762deba 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -294,7 +294,7 @@ bool QSerialPortPrivate::waitForBytesWritten(int msecs) QElapsedTimer stopWatch; stopWatch.start(); - forever { + for (;;) { OVERLAPPED *overlapped = waitForNotified( qt_subtract_from_timeout(msecs, stopWatch.elapsed())); if (!overlapped) diff --git a/src/serialport/qserialportinfo_freebsd.cpp b/src/serialport/qserialportinfo_freebsd.cpp index 552db89..f3bf92e 100644 --- a/src/serialport/qserialportinfo_freebsd.cpp +++ b/src/serialport/qserialportinfo_freebsd.cpp @@ -195,7 +195,7 @@ static QList enumerateDesiredNodes(const QVector &mib) QVector oid = mib; - forever { + for (;;) { const QVector nextoid = nextOid(oid); if (nextoid.isEmpty()) break; diff --git a/src/serialport/qserialportinfo_osx.cpp b/src/serialport/qserialportinfo_osx.cpp index ca77e5a..03cb59b 100644 --- a/src/serialport/qserialportinfo_osx.cpp +++ b/src/serialport/qserialportinfo_osx.cpp @@ -166,7 +166,7 @@ QList QSerialPortInfo::availablePorts() QList serialPortInfoList; - forever { + for (;;) { io_registry_entry_t serialPortService = ::IOIteratorNext(serialPortIterator); if (!serialPortService) break; @@ -176,7 +176,7 @@ QList QSerialPortInfo::availablePorts() QString calloutDevice; QString dialinDevice; - forever { + for (;;) { if (calloutDevice.isEmpty()) calloutDevice = calloutDeviceSystemLocation(serialPortService); diff --git a/src/serialport/qserialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp index 262ff47..bb9b18f 100644 --- a/src/serialport/qserialportinfo_win.cpp +++ b/src/serialport/qserialportinfo_win.cpp @@ -79,7 +79,7 @@ static QStringList portNamesFromHardwareDeviceMap() std::vector outputValueName(MaximumValueNameInChars, 0); std::vector outputBuffer(MAX_PATH + 1, 0); DWORD bytesRequired = MAX_PATH; - forever { + for (;;) { DWORD requiredValueNameChars = MaximumValueNameInChars; const LONG ret = ::RegEnumValue(hKey, index, &outputValueName[0], &requiredValueNameChars, Q_NULLPTR, Q_NULLPTR, reinterpret_cast(&outputBuffer[0]), &bytesRequired); @@ -103,7 +103,7 @@ static QString deviceRegistryProperty(HDEVINFO deviceInfoSet, DWORD dataType = 0; std::vector outputBuffer(MAX_PATH + 1, 0); DWORD bytesRequired = MAX_PATH; - forever { + for (;;) { if (::SetupDiGetDeviceRegistryProperty(deviceInfoSet, deviceInfoData, property, &dataType, reinterpret_cast(&outputBuffer[0]), bytesRequired, &bytesRequired)) { @@ -165,7 +165,7 @@ static QString devicePortName(HDEVINFO deviceInfoSet, PSP_DEVINFO_DATA deviceInf DWORD dataType = 0; std::vector outputBuffer(MAX_PATH + 1, 0); DWORD bytesRequired = MAX_PATH; - forever { + for (;;) { const LONG ret = ::RegQueryValueEx(key, keyTokens[i], Q_NULLPTR, &dataType, reinterpret_cast(&outputBuffer[0]), &bytesRequired); if (ret == ERROR_MORE_DATA) { @@ -273,7 +273,7 @@ static QString parseDeviceSerialNumber(const QString &instanceIdentifier) static QString deviceSerialNumber(QString instanceIdentifier, DEVINST deviceInstanceNumber) { - forever { + for (;;) { const QString result = parseDeviceSerialNumber(instanceIdentifier); if (!result.isEmpty()) return result; -- cgit v1.2.1 From 0a6313018cbd4c78b1e959236bd96c62d5d59c1c Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Mon, 23 May 2016 12:53:23 +0300 Subject: Add changelog for Qt 5.7.0 Change-Id: I74babd844ac5658255e25d6d139c21acfa98a1bb Reviewed-by: Antti Kokko --- dist/changes-5.7.0 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 dist/changes-5.7.0 diff --git a/dist/changes-5.7.0 b/dist/changes-5.7.0 new file mode 100644 index 0000000..27e9ddb --- /dev/null +++ b/dist/changes-5.7.0 @@ -0,0 +1,23 @@ +QtSerialPort 5.7 introduces a few new features and improvements as well as +bugfixes over the 5.6.x series. For more details, refer to the online +documentation included in this distribution. The documentation is also available +online: + + http://doc.qt.io/qt-5/index.html + +The QtSerialPort version 5.7 series is binary compatible with the 5.6.x series. +Applications compiled for 5.6 will continue to run with 5.7. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + +- Started transition to use C++11 features. -- cgit v1.2.1 From b345036a0e633a3c211ba396f03b93a6ed90f0ff Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Sat, 21 May 2016 14:02:02 +0300 Subject: Add some missed 'const' and 'Q_NULLPTR' keywords Change-Id: Iaf06a0b3a8304ad44519f8d2187665c9f0d02aba Reviewed-by: Oswald Buddenhagen --- src/serialport/qserialport_win.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index 412e20c..b41af02 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -257,7 +257,7 @@ bool QSerialPortPrivate::waitForReadyRead(int msecs) stopWatch.start(); do { - OVERLAPPED *overlapped = waitForNotified( + const OVERLAPPED *overlapped = waitForNotified( qt_subtract_from_timeout(msecs, stopWatch.elapsed())); if (!overlapped) return false; @@ -291,7 +291,7 @@ bool QSerialPortPrivate::waitForBytesWritten(int msecs) stopWatch.start(); for (;;) { - OVERLAPPED *overlapped = waitForNotified( + const OVERLAPPED *overlapped = waitForNotified( qt_subtract_from_timeout(msecs, stopWatch.elapsed())); if (!overlapped) return false; @@ -598,7 +598,7 @@ OVERLAPPED *QSerialPortPrivate::waitForNotified(int msecs) OVERLAPPED *overlapped = notifier->waitForAnyNotified(msecs); if (!overlapped) { setError(getSystemError(WAIT_TIMEOUT)); - return 0; + return Q_NULLPTR; } return overlapped; } -- cgit v1.2.1 From f7c86b07a274bea32210ed08a2da89015884a444 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Sat, 4 Jun 2016 18:31:15 +0300 Subject: Remove unused static variable Change-Id: If86072aa6f5df1485856f4e07bb057106977ab8e Reviewed-by: Anton Kudryavtsev Reviewed-by: Sergey Belyashov --- src/serialport/qserialportinfo_unix.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index 08e75c1..f8b9389 100644 --- a/src/serialport/qserialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -391,7 +391,6 @@ QList availablePortsByUdev(bool &ok) if (!symbolsResolved) return QList(); #endif - static const QString rfcommDeviceName(QStringLiteral("rfcomm")); QScopedPointer udev(::udev_new()); -- cgit v1.2.1 From 1bd41bb092fb4c510c91515a4c2dedd7ffe61f94 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Sat, 4 Jun 2016 18:46:17 +0300 Subject: Simplify the isVirtualNullModemDevice() function Change-Id: I24a9ee262255f9d42e54b7e701ceca7850383913 Reviewed-by: Anton Kudryavtsev Reviewed-by: Sergey Belyashov --- src/serialport/qserialportinfo_unix.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index f8b9389..0f62a9d 100644 --- a/src/serialport/qserialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -166,10 +166,7 @@ static bool isRfcommDevice(const QString &portName) // provided by the tty0tty driver static bool isVirtualNullModemDevice(const QString &portName) { - if (!portName.startsWith(QLatin1String("tnt"))) - return false; - - return true; + return portName.startsWith(QLatin1String("tnt")); } static QString ueventProperty(const QDir &targetDir, const QByteArray &pattern) -- cgit v1.2.1 From 63ac6874eeea037b4b8b1a450a938999fb4f31b8 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Thu, 9 Jun 2016 21:32:02 +0300 Subject: Replace local 'static const' integers with 'enum' Not sure whether this improves anything, but it can't make it worse. Enumerators are always rvalues and never end up in the .rodata part of binaries; static variables (const or not) are lvalues and therefore can get their address taken. Change-Id: I24155e5a3224fd6a33885a7ca3194ac53879d2c5 Reviewed-by: Thiago Macieira --- src/serialport/qserialportinfo_win.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/serialport/qserialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp index 995f1d7..4a80325 100644 --- a/src/serialport/qserialportinfo_win.cpp +++ b/src/serialport/qserialportinfo_win.cpp @@ -158,10 +158,10 @@ static QString devicePortName(HDEVINFO deviceInfoSet, PSP_DEVINFO_DATA deviceInf L"PortNumber\0" }; - static const int keyTokensCount = sizeof(keyTokens) / sizeof(keyTokens[0]); + enum { KeyTokensCount = sizeof(keyTokens) / sizeof(keyTokens[0]) }; QString portName; - for (int i = 0; i < keyTokensCount; ++i) { + for (int i = 0; i < KeyTokensCount; ++i) { DWORD dataType = 0; std::vector outputBuffer(MAX_PATH + 1, 0); DWORD bytesRequired = MAX_PATH; @@ -299,11 +299,11 @@ QList QSerialPortInfo::availablePorts() { GUID_DEVINTERFACE_MODEM, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE } }; - static const int setupTokensCount = sizeof(setupTokens) / sizeof(setupTokens[0]); + enum { SetupTokensCount = sizeof(setupTokens) / sizeof(setupTokens[0]) }; QList serialPortInfoList; - for (int i = 0; i < setupTokensCount; ++i) { + for (int i = 0; i < SetupTokensCount; ++i) { const HDEVINFO deviceInfoSet = ::SetupDiGetClassDevs(&setupTokens[i].guid, Q_NULLPTR, Q_NULLPTR, setupTokens[i].flags); if (deviceInfoSet == INVALID_HANDLE_VALUE) return serialPortInfoList; -- cgit v1.2.1