summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-10-06 11:41:10 +0200
committerMarc Mutz <marc.mutz@qt.io>2022-10-06 18:20:07 +0200
commit6c87f1194bdfbf4a4bd4cde5d1528fab2b882848 (patch)
treeb2802c274ce154db28c10f5fbabbaa4b7cdd0f30
parent953c5833acb7c78afd39d287e27ca580ea4232ba (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. Task-number: QTBUG-99313 Change-Id: Ic16fb6a4366062e341ae1f439fe442aec2795a17 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
-rw-r--r--src/serialport/qserialportinfo_freebsd.cpp4
-rw-r--r--tests/auto/qserialport/tst_qserialport.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/serialport/qserialportinfo_freebsd.cpp b/src/serialport/qserialportinfo_freebsd.cpp
index bfc7989d..5852cd7b 100644
--- a/src/serialport/qserialportinfo_freebsd.cpp
+++ b/src/serialport/qserialportinfo_freebsd.cpp
@@ -284,10 +284,10 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
QList<QSerialPortInfo> serialPortInfoList;
- for (const QSerialPortInfo &cuaCandidate : qAsConst(cuaCandidates)) {
+ for (const QSerialPortInfo &cuaCandidate : std::as_const(cuaCandidates)) {
const QString cuaPortName = cuaCandidate.portName();
const QString cuaToken = deviceProperty(cuaPortName, "cua");
- for (const QSerialPortInfo &ttyCandidate : qAsConst(ttyCandidates)) {
+ for (const QSerialPortInfo &ttyCandidate : std::as_const(ttyCandidates)) {
const QString ttyPortName = ttyCandidate.portName();
const QString ttyToken = deviceProperty(ttyPortName, "tty");
if (cuaToken != ttyToken)
diff --git a/tests/auto/qserialport/tst_qserialport.cpp b/tests/auto/qserialport/tst_qserialport.cpp
index 3ee44809..9613208b 100644
--- a/tests/auto/qserialport/tst_qserialport.cpp
+++ b/tests/auto/qserialport/tst_qserialport.cpp
@@ -247,7 +247,7 @@ void tst_QSerialPort::openExisting()
QFETCH(bool, openResult);
QFETCH(QSerialPort::SerialPortError, errorCode);
- for (const QString &serialPortName : qAsConst(m_availablePortNames)) {
+ for (const QString &serialPortName : std::as_const(m_availablePortNames)) {
QSerialPort serialPort(serialPortName);
QSignalSpy errorSpy(&serialPort, &QSerialPort::errorOccurred);
QVERIFY(errorSpy.isValid());