summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2016-06-09 21:39:49 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2016-06-15 14:35:47 +0000
commitbfc1ed24bd2ebc94b3e0c5bd17d860fe251e2b30 (patch)
treeb88a5197acc53faba367ab2219bb438da87c7d07
parent2430d5a36656ff4bc01b42f76d82e053608ad2eb (diff)
downloadqtserialport-bfc1ed24bd2ebc94b3e0c5bd17d860fe251e2b30.tar.gz
Use auto in more cases
Change-Id: Id4fd74d4d45b28ddc60de6308386728a0eda8bb7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
-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.cpp2
-rw-r--r--examples/serialport/slave/dialog.cpp2
-rw-r--r--tests/auto/qserialport/tst_qserialport.cpp2
6 files changed, 8 insertions, 8 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 cd9615f..4bed08b 100644
--- a/examples/serialport/master/dialog.cpp
+++ b/examples/serialport/master/dialog.cpp
@@ -81,7 +81,7 @@ Dialog::Dialog(QWidget *parent)
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 a4ce48a..d801052 100644
--- a/examples/serialport/slave/dialog.cpp
+++ b/examples/serialport/slave/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/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);