diff options
Diffstat (limited to 'src/serialport')
| -rw-r--r-- | src/serialport/qserialport_win.cpp | 6 | ||||
| -rw-r--r-- | src/serialport/qserialportinfo_unix.cpp | 6 | ||||
| -rw-r--r-- | src/serialport/qserialportinfo_win.cpp | 8 |
3 files changed, 8 insertions, 12 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; } diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index 08e75c1..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) @@ -391,7 +388,6 @@ QList<QSerialPortInfo> availablePortsByUdev(bool &ok) if (!symbolsResolved) return QList<QSerialPortInfo>(); #endif - static const QString rfcommDeviceName(QStringLiteral("rfcomm")); QScopedPointer<struct ::udev, ScopedPointerUdevDeleter> udev(::udev_new()); 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<wchar_t> outputBuffer(MAX_PATH + 1, 0); DWORD bytesRequired = MAX_PATH; @@ -299,11 +299,11 @@ QList<QSerialPortInfo> 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<QSerialPortInfo> 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; |