summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/serialport/blockingmaster/dialog.cpp2
-rw-r--r--examples/serialport/blockingslave/dialog.cpp2
-rw-r--r--examples/serialport/enumerator/main.cpp6
-rw-r--r--examples/serialport/master/dialog.cpp5
-rw-r--r--examples/serialport/slave/dialog.cpp5
-rw-r--r--src/serialport/qserialport_win.cpp6
-rw-r--r--src/serialport/qserialportinfo_unix.cpp6
-rw-r--r--src/serialport/qserialportinfo_win.cpp8
-rw-r--r--tests/auto/qserialport/tst_qserialport.cpp2
9 files changed, 20 insertions, 22 deletions
diff --git a/examples/serialport/blockingmaster/dialog.cpp b/examples/serialport/blockingmaster/dialog.cpp
index c1ca850..08403c3 100644
--- a/examples/serialport/blockingmaster/dialog.cpp
+++ b/examples/serialport/blockingmaster/dialog.cpp
@@ -81,7 +81,7 @@ Dialog::Dialog(QWidget *parent)
waitResponseSpinBox->setRange(0, 10000);
waitResponseSpinBox->setValue(1000);
- QGridLayout *mainLayout = new QGridLayout;
+ auto mainLayout = new QGridLayout;
mainLayout->addWidget(serialPortLabel, 0, 0);
mainLayout->addWidget(serialPortComboBox, 0, 1);
mainLayout->addWidget(waitResponseLabel, 1, 0);
diff --git a/examples/serialport/blockingslave/dialog.cpp b/examples/serialport/blockingslave/dialog.cpp
index 8550773..3bfd419 100644
--- a/examples/serialport/blockingslave/dialog.cpp
+++ b/examples/serialport/blockingslave/dialog.cpp
@@ -81,7 +81,7 @@ Dialog::Dialog(QWidget *parent)
for (const QSerialPortInfo &info : infos)
serialPortComboBox->addItem(info.portName());
- QGridLayout *mainLayout = new QGridLayout;
+ auto mainLayout = new QGridLayout;
mainLayout->addWidget(serialPortLabel, 0, 0);
mainLayout->addWidget(serialPortComboBox, 0, 1);
mainLayout->addWidget(waitRequestLabel, 1, 0);
diff --git a/examples/serialport/enumerator/main.cpp b/examples/serialport/enumerator/main.cpp
index fa925da..d7622a2 100644
--- a/examples/serialport/enumerator/main.cpp
+++ b/examples/serialport/enumerator/main.cpp
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
{
QApplication a(argc, argv);
- QVBoxLayout *layout = new QVBoxLayout;
+ auto layout = new QVBoxLayout;
const auto infos = QSerialPortInfo::availablePorts();
for (const QSerialPortInfo &info : infos) {
@@ -75,11 +75,11 @@ int main(int argc, char *argv[])
+ QObject::tr("Product Identifier: ") + (info.hasProductIdentifier() ? QString::number(info.productIdentifier(), 16) : QString()) + "\n"
+ QObject::tr("Busy: ") + (info.isBusy() ? QObject::tr("Yes") : QObject::tr("No")) + "\n";
- QLabel *label = new QLabel(s);
+ auto label = new QLabel(s);
layout->addWidget(label);
}
- QWidget *workPage = new QWidget;
+ auto workPage = new QWidget;
workPage->setLayout(layout);
QScrollArea area;
diff --git a/examples/serialport/master/dialog.cpp b/examples/serialport/master/dialog.cpp
index 2c92404..4bed08b 100644
--- a/examples/serialport/master/dialog.cpp
+++ b/examples/serialport/master/dialog.cpp
@@ -74,13 +74,14 @@ Dialog::Dialog(QWidget *parent)
, statusLabel(new QLabel(tr("Status: Not running.")))
, runButton(new QPushButton(tr("Start")))
{
- foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts())
+ const auto infos = QSerialPortInfo::availablePorts();
+ for (const QSerialPortInfo &info : infos)
serialPortComboBox->addItem(info.portName());
waitResponseSpinBox->setRange(0, 10000);
waitResponseSpinBox->setValue(100);
- QGridLayout *mainLayout = new QGridLayout;
+ auto mainLayout = new QGridLayout;
mainLayout->addWidget(serialPortLabel, 0, 0);
mainLayout->addWidget(serialPortComboBox, 0, 1);
mainLayout->addWidget(waitResponseLabel, 1, 0);
diff --git a/examples/serialport/slave/dialog.cpp b/examples/serialport/slave/dialog.cpp
index 5bc0561..d801052 100644
--- a/examples/serialport/slave/dialog.cpp
+++ b/examples/serialport/slave/dialog.cpp
@@ -77,10 +77,11 @@ Dialog::Dialog(QWidget *parent)
waitRequestSpinBox->setRange(0, 10000);
waitRequestSpinBox->setValue(20);
- foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts())
+ const auto infos = QSerialPortInfo::availablePorts();
+ for (const QSerialPortInfo &info : infos)
serialPortComboBox->addItem(info.portName());
- QGridLayout *mainLayout = new QGridLayout;
+ auto mainLayout = new QGridLayout;
mainLayout->addWidget(serialPortLabel, 0, 0);
mainLayout->addWidget(serialPortComboBox, 0, 1);
mainLayout->addWidget(waitRequestLabel, 1, 0);
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;
diff --git a/tests/auto/qserialport/tst_qserialport.cpp b/tests/auto/qserialport/tst_qserialport.cpp
index b9d41b8..24c0134 100644
--- a/tests/auto/qserialport/tst_qserialport.cpp
+++ b/tests/auto/qserialport/tst_qserialport.cpp
@@ -995,7 +995,7 @@ private:
void tst_QSerialPort::synchronousReadWriteAfterAsynchronousReadWrite()
{
MasterTransactor master(m_senderPortName);
- SlaveTransactor *slave = new SlaveTransactor(m_receiverPortName);
+ auto slave = new SlaveTransactor(m_receiverPortName);
QThread thread;
slave->moveToThread(&thread);
View Lorry Controller Status