diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2016-06-04 16:52:35 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2016-06-17 15:54:22 +0000 |
commit | 6dc22556f55dffc4c018e82f952a7cf6c8da66dd (patch) | |
tree | 15e18025ff59e31e7c1eb5952a51db89b0424134 /src/serialport/qserialportinfo_freebsd.cpp | |
parent | 696ec9bbd6e15b381cb1b1451987e18b3f0a48a0 (diff) | |
download | qtserialport-6dc22556f55dffc4c018e82f952a7cf6c8da66dd.tar.gz |
Replace 'Q_NULLPTR' and 'NULL' with 'nullptr'
We can use nullptr since Qt 5.7.
Change-Id: Id5354280d6a94b2c1f4c5967c65a22db878eca3e
Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src/serialport/qserialportinfo_freebsd.cpp')
-rw-r--r-- | src/serialport/qserialportinfo_freebsd.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/serialport/qserialportinfo_freebsd.cpp b/src/serialport/qserialportinfo_freebsd.cpp index 291cfac..066290d 100644 --- a/src/serialport/qserialportinfo_freebsd.cpp +++ b/src/serialport/qserialportinfo_freebsd.cpp @@ -106,7 +106,7 @@ struct NodeInfo static QVector<int> mibFromName(const QString &name) { size_t mibsize = 0; - if (::sysctlnametomib(name.toLocal8Bit().constData(), Q_NULLPTR, &mibsize) < 0 + if (::sysctlnametomib(name.toLocal8Bit().constData(), nullptr, &mibsize) < 0 || mibsize == 0) { return QVector<int>(); } @@ -126,11 +126,11 @@ static QVector<int> nextOid(const QVector<int> &previousOid) mib.append(code); size_t requiredLength = 0; - if (::sysctl(&mib[0], mib.count(), Q_NULLPTR, &requiredLength, Q_NULLPTR, 0) < 0) + if (::sysctl(&mib[0], mib.count(), nullptr, &requiredLength, nullptr, 0) < 0) return QVector<int>(); const size_t oidLength = requiredLength / sizeof(int); QVector<int> oid(oidLength, 0); - if (::sysctl(&mib[0], mib.count(), &oid[0], &requiredLength, Q_NULLPTR, 0) < 0) + if (::sysctl(&mib[0], mib.count(), &oid[0], &requiredLength, nullptr, 0) < 0) return QVector<int>(); if (previousOid.first() != oid.first()) @@ -149,27 +149,27 @@ static NodeInfo nodeForOid(const QVector<int> &oid) // query node name size_t requiredLength = 0; - if (::sysctl(&mib[0], mib.count(), Q_NULLPTR, &requiredLength, Q_NULLPTR, 0) < 0) + if (::sysctl(&mib[0], mib.count(), nullptr, &requiredLength, nullptr, 0) < 0) return NodeInfo(); QByteArray name(requiredLength, 0); - if (::sysctl(&mib[0], mib.count(), name.data(), &requiredLength, Q_NULLPTR, 0) < 0) + if (::sysctl(&mib[0], mib.count(), name.data(), &requiredLength, nullptr, 0) < 0) return NodeInfo(); // query node value requiredLength = 0; - if (::sysctl(&oid[0], oid.count(), Q_NULLPTR, &requiredLength, Q_NULLPTR, 0) < 0) + if (::sysctl(&oid[0], oid.count(), nullptr, &requiredLength, nullptr, 0) < 0) return NodeInfo(); QByteArray value(requiredLength, 0); - if (::sysctl(&oid[0], oid.count(), value.data(), &requiredLength, Q_NULLPTR, 0) < 0) + if (::sysctl(&oid[0], oid.count(), value.data(), &requiredLength, nullptr, 0) < 0) return NodeInfo(); // query value format mib[1] = 4; // Magic undocumented code requiredLength = 0; - if (::sysctl(&mib[0], mib.count(), Q_NULLPTR, &requiredLength, Q_NULLPTR, 0) < 0) + if (::sysctl(&mib[0], mib.count(), nullptr, &requiredLength, nullptr, 0) < 0) return NodeInfo(); QByteArray buf(requiredLength, 0); - if (::sysctl(&mib[0], mib.count(), buf.data(), &requiredLength, Q_NULLPTR, 0) < 0) + if (::sysctl(&mib[0], mib.count(), buf.data(), &requiredLength, nullptr, 0) < 0) return NodeInfo(); QDataStream in(buf); |