diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2016-05-20 08:45:58 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2016-05-20 09:02:35 +0000 |
commit | add8cb835b7e519955f1260244f7033b049d4930 (patch) | |
tree | 1068cf6fdf1428d452fd3734d5ebee20855f5455 | |
parent | a11fa1dfd529948da961d3d292926a15f9b7005b (diff) | |
download | qtserialport-add8cb835b7e519955f1260244f7033b049d4930.tar.gz |
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 <marc.mutz@kdab.com>
-rw-r--r-- | src/serialport/qserialport.cpp | 2 | ||||
-rw-r--r-- | src/serialport/qserialport_unix.cpp | 2 | ||||
-rw-r--r-- | src/serialport/qserialport_win.cpp | 2 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_freebsd.cpp | 2 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_osx.cpp | 4 | ||||
-rw-r--r-- | 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<NodeInfo> enumerateDesiredNodes(const QVector<int> &mib) QVector<int> oid = mib; - forever { + for (;;) { const QVector<int> 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> QSerialPortInfo::availablePorts() QList<QSerialPortInfo> serialPortInfoList; - forever { + for (;;) { io_registry_entry_t serialPortService = ::IOIteratorNext(serialPortIterator); if (!serialPortService) break; @@ -176,7 +176,7 @@ QList<QSerialPortInfo> 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<wchar_t> outputValueName(MaximumValueNameInChars, 0); std::vector<wchar_t> 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<PBYTE>(&outputBuffer[0]), &bytesRequired); @@ -103,7 +103,7 @@ static QString deviceRegistryProperty(HDEVINFO deviceInfoSet, DWORD dataType = 0; std::vector<wchar_t> outputBuffer(MAX_PATH + 1, 0); DWORD bytesRequired = MAX_PATH; - forever { + for (;;) { if (::SetupDiGetDeviceRegistryProperty(deviceInfoSet, deviceInfoData, property, &dataType, reinterpret_cast<PBYTE>(&outputBuffer[0]), bytesRequired, &bytesRequired)) { @@ -165,7 +165,7 @@ static QString devicePortName(HDEVINFO deviceInfoSet, PSP_DEVINFO_DATA deviceInf DWORD dataType = 0; std::vector<wchar_t> outputBuffer(MAX_PATH + 1, 0); DWORD bytesRequired = MAX_PATH; - forever { + for (;;) { const LONG ret = ::RegQueryValueEx(key, keyTokens[i], Q_NULLPTR, &dataType, reinterpret_cast<PBYTE>(&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; |