summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2016-04-21 15:24:16 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2016-04-22 11:36:32 +0000
commitedf55f657a46fe16bf80d63f523848bb9b71d9f3 (patch)
tree0c32d61ffd423c9c1b045ac343b6cc3eada0194a /src
parent33d19928d7c5beeacdc3d3c57bc5ed95d26934a5 (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/canbus/peakcan/main.cpp2
-rw-r--r--src/plugins/canbus/socketcan/main.cpp2
-rw-r--r--src/plugins/canbus/tinycan/main.cpp2
-rw-r--r--src/serialbus/qmodbusrtuserialmaster_p.h2
-rw-r--r--src/serialbus/qmodbustcpclient_p.h4
-rw-r--r--src/serialbus/qmodbustcpserver_p.h2
-rw-r--r--src/tools/canbusutil/readtask.cpp4
-rw-r--r--src/tools/canbusutil/sigtermhandler.cpp2
8 files changed, 10 insertions, 10 deletions
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;
}