mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 10:46:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use std::pair instead of QPair

Browse source 
PR #19548.
This commit is contained in:
Victor Chernyakin 2023-09-02 23:39:34 -07:00 committed by GitHub
parent 4d2015cfed
commit 65930ddf94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/base/http/requestparser.cpp
View file

@ -31,6 +31,7 @@
#include "requestparser.h" #include "requestparser.h"
#include <algorithm> #include <algorithm>
#include <utility>
#include <QByteArrayView> #include <QByteArrayView>
#include <QDebug> #include <QDebug>
@ -45,7 +46,7 @@
using namespace Http; using namespace Http;
using namespace Utils::ByteArray; using namespace Utils::ByteArray;
using QStringPair = QPair<QString, QString>; using QStringPair = std::pair<QString, QString>;
namespace namespace
{ {

1
src/base/utils/net.cpp
View file

@ -30,7 +30,6 @@
#include <QList> #include <QList>
#include <QNetworkInterface> #include <QNetworkInterface>
#include <QPair>
#include <QSslCertificate> #include <QSslCertificate>
#include <QSslKey> #include <QSslKey>
#include <QString> #include <QString>

3
src/base/utils/net.h
View file

@ -29,6 +29,7 @@
#pragma once #pragma once
#include <optional> #include <optional>
#include <utility>
#include <QtContainerFwd> #include <QtContainerFwd>
#include <QHostAddress> #include <QHostAddress>
@ -40,7 +41,7 @@ class QString;
namespace Utils::Net namespace Utils::Net
{ {
// alias for `QHostAddress::parseSubnet()` return type // alias for `QHostAddress::parseSubnet()` return type
using Subnet = QPair<QHostAddress, int>; using Subnet = std::pair<QHostAddress, int>;
bool isValidIP(const QString &ip); bool isValidIP(const QString &ip);
std::optional<Subnet> parseSubnet(const QString &subnetStr); std::optional<Subnet> parseSubnet(const QString &subnetStr);