From 65930ddf9472dd8e38c0985328545195104e14a4 Mon Sep 17 00:00:00 2001
From: Victor Chernyakin <56512186+LocalSpook@users.noreply.github.com>
Date: Sat, 2 Sep 2023 23:39:34 -0700
Subject: [PATCH] Use `std::pair` instead of `QPair`

PR #19548.
---
 src/base/http/requestparser.cpp | 3 ++-
 src/base/utils/net.cpp          | 1 -
 src/base/utils/net.h            | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/base/http/requestparser.cpp b/src/base/http/requestparser.cpp
index 497077707..c513e0018 100644
--- a/src/base/http/requestparser.cpp
+++ b/src/base/http/requestparser.cpp
@@ -31,6 +31,7 @@
 #include "requestparser.h"
 
 #include <algorithm>
+#include <utility>
 
 #include <QByteArrayView>
 #include <QDebug>
@@ -45,7 +46,7 @@
 
 using namespace Http;
 using namespace Utils::ByteArray;
-using QStringPair = QPair<QString, QString>;
+using QStringPair = std::pair<QString, QString>;
 
 namespace
 {
diff --git a/src/base/utils/net.cpp b/src/base/utils/net.cpp
index 58ba1083e..63f8f2eb7 100644
--- a/src/base/utils/net.cpp
+++ b/src/base/utils/net.cpp
@@ -30,7 +30,6 @@
 
 #include <QList>
 #include <QNetworkInterface>
-#include <QPair>
 #include <QSslCertificate>
 #include <QSslKey>
 #include <QString>
diff --git a/src/base/utils/net.h b/src/base/utils/net.h
index add22d732..ef035bfd2 100644
--- a/src/base/utils/net.h
+++ b/src/base/utils/net.h
@@ -29,6 +29,7 @@
 #pragma once
 
 #include <optional>
+#include <utility>
 
 #include <QtContainerFwd>
 #include <QHostAddress>
@@ -40,7 +41,7 @@ class QString;
 namespace Utils::Net
 {
     // alias for `QHostAddress::parseSubnet()` return type
-    using Subnet = QPair<QHostAddress, int>;
+    using Subnet = std::pair<QHostAddress, int>;
 
     bool isValidIP(const QString &ip);
     std::optional<Subnet> parseSubnet(const QString &subnetStr);