diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-11-11 16:26:04 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-11-12 08:42:25 +0100 |
commit | 2f2e25c3beea21c14bb75b2f32b5ee4700759a89 (patch) | |
tree | eff1132b9135642b076cec6796691f91bbd07188 /examples/bluetooth | |
parent | cad49b3be482b41f1ae43b5c9ce4d009a810240b (diff) |
Port from qAsConst() to std::as_const()
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.
Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace.
This is a 6.4 re-run of the script we ran in dev, in order to avoid
conflicts between the branches when cherry-picking.
Change-Id: I5eca3df3179dfb2b2682c75a479ba9a4259cc703
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'examples/bluetooth')
-rw-r--r-- | examples/bluetooth/btchat/chatserver.cpp | 2 | ||||
-rw-r--r-- | examples/bluetooth/btchat/remoteselector.cpp | 2 | ||||
-rw-r--r-- | examples/bluetooth/heartrate-game/devicefinder.cpp | 2 | ||||
-rw-r--r-- | examples/bluetooth/lowenergyscanner/device.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/examples/bluetooth/btchat/chatserver.cpp b/examples/bluetooth/btchat/chatserver.cpp index d65bb87e..2e6c314d 100644 --- a/examples/bluetooth/btchat/chatserver.cpp +++ b/examples/bluetooth/btchat/chatserver.cpp @@ -109,7 +109,7 @@ void ChatServer::sendMessage(const QString &message) { QByteArray text = message.toUtf8() + '\n'; - for (QBluetoothSocket *socket : qAsConst(clientSockets)) + for (QBluetoothSocket *socket : std::as_const(clientSockets)) socket->write(text); } //! [sendMessage] diff --git a/examples/bluetooth/btchat/remoteselector.cpp b/examples/bluetooth/btchat/remoteselector.cpp index d0e91509..5872cec5 100644 --- a/examples/bluetooth/btchat/remoteselector.cpp +++ b/examples/bluetooth/btchat/remoteselector.cpp @@ -68,7 +68,7 @@ void RemoteSelector::serviceDiscovered(const QBluetoothServiceInfo &serviceInfo) qDebug() << "\tRFCOMM server channel:" << serviceInfo.serverChannel(); #endif const QBluetoothAddress address = serviceInfo.device().address(); - for (const QBluetoothServiceInfo &info : qAsConst(m_discoveredServices)) { + for (const QBluetoothServiceInfo &info : std::as_const(m_discoveredServices)) { if (info.device().address() == address) return; } diff --git a/examples/bluetooth/heartrate-game/devicefinder.cpp b/examples/bluetooth/heartrate-game/devicefinder.cpp index 54dbd2bb..1b29b443 100644 --- a/examples/bluetooth/heartrate-game/devicefinder.cpp +++ b/examples/bluetooth/heartrate-game/devicefinder.cpp @@ -104,7 +104,7 @@ void DeviceFinder::connectToService(const QString &address) m_deviceDiscoveryAgent->stop(); DeviceInfo *currentDevice = nullptr; - for (QObject *entry : qAsConst(m_devices)) { + for (QObject *entry : std::as_const(m_devices)) { auto device = qobject_cast<DeviceInfo *>(entry); if (device && device->getAddress() == address ) { currentDevice = device; diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp index d6540a2f..d645931c 100644 --- a/examples/bluetooth/lowenergyscanner/device.cpp +++ b/examples/bluetooth/lowenergyscanner/device.cpp @@ -106,7 +106,7 @@ void Device::scanServices(const QString &address) { // We need the current device for service discovery. - for (auto d: qAsConst(devices)) { + for (auto d: std::as_const(devices)) { if (auto device = qobject_cast<DeviceInfo *>(d)) { if (device->getAddress() == address ) { currentDevice.setDevice(device->getDevice()); @@ -187,7 +187,7 @@ void Device::serviceScanDone() void Device::connectToService(const QString &uuid) { QLowEnergyService *service = nullptr; - for (auto s: qAsConst(m_services)) { + for (auto s: std::as_const(m_services)) { auto serviceInfo = qobject_cast<ServiceInfo *>(s); if (!serviceInfo) continue; |