Use 'auto' where it is possible

Change-Id: I3d915a6230a1f35317abc39d6266a9d46a5d9be6
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>

14 files changed, 21 insertions, 21 deletions

diff --git a/examples/serialbus/modbus/adueditor/mainwindow.cpp b/examples/serialbus/modbus/adueditor/mainwindow.cpp
index 51f1840..c4149e0 100644
--- a/examples/serialbus/modbus/adueditor/mainwindow.cpp
+++ b/examples/serialbus/modbus/adueditor/mainwindow.cpp
@@ -137,7 +137,7 @@ void MainWindow::on_sendButton_clicked()
 void MainWindow::on_connectButton_clicked()
 {
     if (tcpRadio->isChecked()) {
-        ModbusTcpClient *device = new ModbusTcpClient;
+        auto device = new ModbusTcpClient;
         using signature = void (QSpinBox::*)(int);
         connect(ti1Spin, static_cast<signature>(&QSpinBox::valueChanged), device,
             &ModbusTcpClient::valueChanged);
diff --git a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
index fa9fa6d..561cfda 100644
--- a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
+++ b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
@@ -80,8 +80,8 @@ public:
             return nullptr;
 
         Q_Q(ModbusTcpClient);
-        QModbusReply *const reply = new QModbusReply(type, m_uId, q);
-        const QueueElement element = QueueElement{ reply, request, unit, m_numberOfRetries,
+        auto reply = new QModbusReply(type, m_uId, q);
+        const auto element = QueueElement{ reply, request, unit, m_numberOfRetries,
             m_responseTimeoutDuration };
         m_transactionStore.insert(m_tId, element);
 
diff --git a/examples/serialbus/modbus/master/mainwindow.cpp b/examples/serialbus/modbus/master/mainwindow.cpp
index efa0e90..ae45e31 100644
--- a/examples/serialbus/modbus/master/mainwindow.cpp
+++ b/examples/serialbus/modbus/master/mainwindow.cpp
@@ -83,7 +83,7 @@ MainWindow::MainWindow(QWidget *parent)
     ui->connectType->setCurrentIndex(0);
     on_connectType_currentIndexChanged(0);
 
-    QStandardItemModel *model = new QStandardItemModel(10, 1, this);
+    auto model = new QStandardItemModel(10, 1, this);
     for (int i = 0; i < 10; ++i)
         model->setItem(i, new QStandardItem(QStringLiteral("%1").arg(i + 1)));
     ui->writeSize->setModel(model);
@@ -142,7 +142,7 @@ void MainWindow::on_connectType_currentIndexChanged(int index)
         modbusDevice = nullptr;
     }
 
-    ModbusConnection type = static_cast<ModbusConnection> (index);
+    auto type = static_cast<ModbusConnection> (index);
     if (type == Serial) {
         modbusDevice = new QModbusRtuSerialMaster(this);
     } else if (type == Tcp) {
@@ -236,7 +236,7 @@ void MainWindow::on_readButton_clicked()
 
 void MainWindow::readReady()
 {
-    QModbusReply *reply = qobject_cast<QModbusReply *>(sender());
+    auto reply = qobject_cast<QModbusReply *>(sender());
     if (!reply)
         return;
 
@@ -341,7 +341,7 @@ void MainWindow::on_writeTable_currentIndexChanged(int index)
 
 QModbusDataUnit MainWindow::readRequest() const
 {
-    const QModbusDataUnit::RegisterType table =
+    const auto table =
         static_cast<QModbusDataUnit::RegisterType> (ui->writeTable->currentData().toInt());
 
     int startAddress = ui->readAddress->value();
@@ -354,7 +354,7 @@ QModbusDataUnit MainWindow::readRequest() const
 
 QModbusDataUnit MainWindow::writeRequest() const
 {
-    const QModbusDataUnit::RegisterType table =
+    const auto table =
         static_cast<QModbusDataUnit::RegisterType> (ui->writeTable->currentData().toInt());
 
     int startAddress = ui->writeAddress->value();
diff --git a/examples/serialbus/modbus/master/writeregistermodel.cpp b/examples/serialbus/modbus/master/writeregistermodel.cpp
index f0ed26e..bb57d20 100644
--- a/examples/serialbus/modbus/master/writeregistermodel.cpp
+++ b/examples/serialbus/modbus/master/writeregistermodel.cpp
@@ -113,7 +113,7 @@ bool WriteRegisterModel::setData(const QModelIndex &index, const QVariant &value
     Q_ASSERT(m_holdingRegisters.count() == ROW_COUNT);
 
     if (index.column() == COLUMN_COILS && role == Qt::CheckStateRole) { // coils
-        Qt::CheckState s = static_cast<Qt::CheckState>(value.toUInt());
+        auto s = static_cast<Qt::CheckState>(value.toUInt());
         s == Qt::Checked ? m_coils.setBit(index.row()) : m_coils.clearBit(index.row());
         emit dataChanged(index, index);
         return true;
diff --git a/src/plugins/canbus/peakcan/main.cpp b/src/plugins/canbus/peakcan/main.cpp
index 0f2dd89..94213f1 100644
--- a/src/plugins/canbus/peakcan/main.cpp
+++ b/src/plugins/canbus/peakcan/main.cpp
@@ -59,7 +59,7 @@ public:
             return nullptr;
         }
 
-        QCanBusDevice *device = new PeakCanBackend(interfaceName);
+        auto device = new PeakCanBackend(interfaceName);
         return device;
     }
 };
diff --git a/src/plugins/canbus/socketcan/main.cpp b/src/plugins/canbus/socketcan/main.cpp
index 4f414fd..e83b569 100644
--- a/src/plugins/canbus/socketcan/main.cpp
+++ b/src/plugins/canbus/socketcan/main.cpp
@@ -55,7 +55,7 @@ class SocketCanBusPlugin : public QObject, public QCanBusFactory
 public:
     QCanBusDevice *createDevice(const QString &interfaceName) const
     {
-        QCanBusDevice *device = new SocketCanBackend(interfaceName);
+        auto device = new SocketCanBackend(interfaceName);
         return device;
     }
 };
diff --git a/src/plugins/canbus/tinycan/main.cpp b/src/plugins/canbus/tinycan/main.cpp
index 020ee00..d020425 100644
--- a/src/plugins/canbus/tinycan/main.cpp
+++ b/src/plugins/canbus/tinycan/main.cpp
@@ -59,7 +59,7 @@ public:
             return nullptr;
         }
 
-        QCanBusDevice *device = new TinyCanBackend(interfaceName);
+        auto device = new TinyCanBackend(interfaceName);
         return device;
     }
 };
diff --git a/src/serialbus/qmodbusrtuserialmaster_p.h b/src/serialbus/qmodbusrtuserialmaster_p.h
index 4da7b61..281ea58 100644
--- a/src/serialbus/qmodbusrtuserialmaster_p.h
+++ b/src/serialbus/qmodbusrtuserialmaster_p.h
@@ -262,7 +262,7 @@ public:
     {
         Q_Q(QModbusRtuSerialMaster);
 
-        QModbusReply *reply = new QModbusReply(type, serverAddress, q);
+        auto reply = new QModbusReply(type, serverAddress, q);
         QueueElement element(reply, request, unit, m_numberOfRetries + 1);
         element.adu = QModbusSerialAdu::create(QModbusSerialAdu::Rtu, serverAddress, request);
         m_queue.enqueue(element);
diff --git a/src/serialbus/qmodbustcpclient_p.h b/src/serialbus/qmodbustcpclient_p.h
index e118e4d..1c3a925 100644
--- a/src/serialbus/qmodbustcpclient_p.h
+++ b/src/serialbus/qmodbustcpclient_p.h
@@ -179,8 +179,8 @@ public:
             return nullptr;
 
         Q_Q(QModbusTcpClient);
-        QModbusReply *const reply = new QModbusReply(type, serverAddress, q);
-        const QueueElement element = QueueElement{ reply, request, unit, m_numberOfRetries,
+        auto reply = new QModbusReply(type, serverAddress, q);
+        const auto element = QueueElement{ reply, request, unit, m_numberOfRetries,
             m_responseTimeoutDuration };
         m_transactionStore.insert(tId, element);
 
diff --git a/src/serialbus/qmodbustcpserver_p.h b/src/serialbus/qmodbustcpserver_p.h
index c7f393c..d502be9 100644
--- a/src/serialbus/qmodbustcpserver_p.h
+++ b/src/serialbus/qmodbustcpserver_p.h
@@ -125,7 +125,7 @@ public:
 
             connections.append(socket);
 
-            QByteArray *buffer = new QByteArray();
+            auto buffer = new QByteArray();
 
             QObject::connect(socket, &QObject::destroyed, [buffer]() {
                 // cleanup buffer
diff --git a/src/tools/canbusutil/readtask.cpp b/src/tools/canbusutil/readtask.cpp
index 284c302..bb9b344 100644
--- a/src/tools/canbusutil/readtask.cpp
+++ b/src/tools/canbusutil/readtask.cpp
@@ -43,7 +43,7 @@ ReadTask::ReadTask(QTextStream &output, QObject *parent)
       output(output) { }
 
 void ReadTask::checkMessages() {
-    QCanBusDevice *canDevice = qobject_cast<QCanBusDevice *>(QObject::sender());
+    auto canDevice = qobject_cast<QCanBusDevice *>(QObject::sender());
     if (canDevice == nullptr) {
         qWarning() << "ReadTask::checkMessages: Unknown sender";
         return;
@@ -81,7 +81,7 @@ void ReadTask::checkMessages() {
 }
 
 void ReadTask::receiveError(QCanBusDevice::CanBusError /*error*/) {
-    QCanBusDevice *canDevice = qobject_cast<QCanBusDevice *>(QObject::sender());
+    auto canDevice = qobject_cast<QCanBusDevice *>(QObject::sender());
     if (canDevice == nullptr) {
         qWarning() << "ReadTask::receiveError: Unknown sender";
         return;
diff --git a/src/tools/canbusutil/sigtermhandler.cpp b/src/tools/canbusutil/sigtermhandler.cpp
index a6523a8..1c7fac1 100644
--- a/src/tools/canbusutil/sigtermhandler.cpp
+++ b/src/tools/canbusutil/sigtermhandler.cpp
@@ -40,7 +40,7 @@
 
 QPointer<SigTermHandler> SigTermHandler::instance()
 {
-    static SigTermHandler *inst = new SigTermHandler();
+    static auto inst = new SigTermHandler();
     return inst;
 }
 
diff --git a/tests/auto/plugins/genericcanbus/main.cpp b/tests/auto/plugins/genericcanbus/main.cpp
index 2963ee5..3fc6225 100644
--- a/tests/auto/plugins/genericcanbus/main.cpp
+++ b/tests/auto/plugins/genericcanbus/main.cpp
@@ -53,7 +53,7 @@ public:
     QCanBusDevice *createDevice(const QString &interfaceName) const
     {
         Q_UNUSED(interfaceName)
-        QCanBusDevice *device = new DummyBackend();
+        auto device = new DummyBackend();
         return device;
     }
 };
diff --git a/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp b/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp
index 3193119..b99ac64 100644
--- a/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp
+++ b/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp
@@ -247,7 +247,7 @@ void tst_QCanBusDevice::error()
     QSignalSpy spy(device, SIGNAL(errorOccurred(QCanBusDevice::CanBusError)));
     QString testString(QStringLiteral("testString"));
 
-    tst_Backend *backend = qobject_cast<tst_Backend *>(device);
+    auto backend = qobject_cast<tst_Backend *>(device);
     QVERIFY(backend);
 
     //NoError