summaryrefslogtreecommitdiffstats
path: root/src/plugins/canbus/tinycan
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2016-04-21 14:10:59 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2016-04-21 12:33:54 +0000
commitf342b8243e292525ba72c9b34cc6f416d2f11e96 (patch)
tree6a47b6b3b073e1ef0ec4c8d5bb2bbc4896579645 /src/plugins/canbus/tinycan
parent7a05d8ed0f123372b29662c84c16f04140de5b28 (diff)
Use 'nullptr' where it is possible
Change-Id: I729e6b53cbc0b9a16c72c2351cc95d6bd7a2a0aa Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/plugins/canbus/tinycan')
-rw-r--r--src/plugins/canbus/tinycan/main.cpp2
-rw-r--r--src/plugins/canbus/tinycan/tinycanbackend.cpp4
-rw-r--r--src/plugins/canbus/tinycan/tinycanbackend.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/canbus/tinycan/main.cpp b/src/plugins/canbus/tinycan/main.cpp
index 6e1f959..020ee00 100644
--- a/src/plugins/canbus/tinycan/main.cpp
+++ b/src/plugins/canbus/tinycan/main.cpp
@@ -56,7 +56,7 @@ public:
QString errorReason;
if (!TinyCanBackend::canCreate(&errorReason)) {
qWarning("%s", qPrintable(errorReason));
- return Q_NULLPTR;
+ return nullptr;
}
QCanBusDevice *device = new TinyCanBackend(interfaceName);
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp
index 669c153..2f5b62b 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend.cpp
+++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp
@@ -175,7 +175,7 @@ bool TinyCanBackendPrivate::open()
return false;
}
- if (int ret = ::CanDeviceOpen(channelIndex, Q_NULLPTR) < 0) {
+ if (int ret = ::CanDeviceOpen(channelIndex, nullptr) < 0) {
q->setError(systemErrorString(ret), QCanBusDevice::CanBusError::ConnectionError);
return false;
}
@@ -427,7 +427,7 @@ void TinyCanBackendPrivate::startupDriver()
Q_Q(TinyCanBackend);
if (driverRefCount == 0) {
- if (int ret = ::CanInitDriver(Q_NULLPTR) < 0) {
+ if (int ret = ::CanInitDriver(nullptr) < 0) {
q->setError(systemErrorString(ret), QCanBusDevice::CanBusError::ConnectionError);
return;
}
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.h b/src/plugins/canbus/tinycan/tinycanbackend.h
index c5f23c6..693dd83 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend.h
+++ b/src/plugins/canbus/tinycan/tinycanbackend.h
@@ -56,7 +56,7 @@ class TinyCanBackend : public QCanBusDevice
Q_DECLARE_PRIVATE(TinyCanBackend)
Q_DISABLE_COPY(TinyCanBackend)
public:
- explicit TinyCanBackend(const QString &name, QObject *parent = 0);
+ explicit TinyCanBackend(const QString &name, QObject *parent = nullptr);
~TinyCanBackend();
bool open() Q_DECL_OVERRIDE;