From 60297d4d1e17705c128d11a1ef6f200e59ba4708 Mon Sep 17 00:00:00 2001 From: Zhao Yuhang <2546789017@qq.com> Date: Thu, 10 Apr 2025 16:20:35 +0800 Subject: Port away from QPair QPair is just an alias of std::pair anyway. Task-number: QTBUG-115841 Change-Id: I26fc90adcc775aac9955ad57304af914dc4ed48f Reviewed-by: Ulf Hermann --- src/quicktestutils/qml/testhttpserver.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/quicktestutils/qml/testhttpserver.cpp') diff --git a/src/quicktestutils/qml/testhttpserver.cpp b/src/quicktestutils/qml/testhttpserver.cpp index f6003b4a71..9e24e860d4 100644 --- a/src/quicktestutils/qml/testhttpserver.cpp +++ b/src/quicktestutils/qml/testhttpserver.cpp @@ -107,7 +107,7 @@ QString TestHTTPServer::errorString() const bool TestHTTPServer::serveDirectory(const QString &dir, Mode mode) { - m_directories.append(qMakePair(dir, mode)); + m_directories.append(std::make_pair(dir, mode)); return true; } @@ -328,7 +328,7 @@ bool TestHTTPServer::reply(QTcpSocket *socket, const QByteArray &fileNameIn) response += data; if (mode == Delay) { - m_toSend.append(qMakePair(socket, response)); + m_toSend.append(std::make_pair(socket, response)); QTimer::singleShot(500, this, &TestHTTPServer::sendOne); return false; } @@ -341,7 +341,7 @@ bool TestHTTPServer::reply(QTcpSocket *socket, const QByteArray &fileNameIn) socket->write(response.left(m_chunkSize)); for (qsizetype offset = m_chunkSize, end = response.length(); offset < end; offset += m_chunkSize) { - m_toSend.append(qMakePair(socket, response.mid(offset, m_chunkSize))); + m_toSend.append(std::make_pair(socket, response.mid(offset, m_chunkSize))); } QTimer::singleShot(1, this, &TestHTTPServer::sendChunk); -- cgit v1.2.3