qt: Migrate to Qt6. (#6418)

This commit is contained in:
Steveice10
2023-05-05 03:10:34 -07:00
committed by GitHub
parent 70335a7f4d
commit 2273df4d70
32 changed files with 299 additions and 464 deletions

View File

@@ -5,7 +5,7 @@
#include <QComboBox>
#include <QFuture>
#include <QIntValidator>
#include <QRegExpValidator>
#include <QRegularExpression>
#include <QString>
#include <QtConcurrent/QtConcurrentRun>
#include "citra_qt/main.h"

View File

@@ -4,7 +4,7 @@
#pragma once
#include <QRegExp>
#include <QRegularExpression>
#include <QString>
#include <QValidator>
@@ -30,15 +30,17 @@ public:
private:
/// room name can be alphanumeric and " " "_" "." and "-" and must have a size of 4-20
QRegExp room_name_regex = QRegExp(QStringLiteral("^[a-zA-Z0-9._- ]{4,20}$"));
QRegExpValidator room_name;
QRegularExpression room_name_regex =
QRegularExpression(QStringLiteral("^[a-zA-Z0-9._\\- ]{4,20}$"));
QRegularExpressionValidator room_name;
/// nickname can be alphanumeric and " " "_" "." and "-" and must have a size of 4-20
QRegExp nickname_regex = QRegExp(QStringLiteral("^[a-zA-Z0-9._- ]{4,20}$"));
QRegExpValidator nickname;
QRegularExpression nickname_regex =
QRegularExpression(QStringLiteral("^[a-zA-Z0-9._\\- ]{4,20}$"));
QRegularExpressionValidator nickname;
/// ipv4 / ipv6 / hostnames
QRegExp ip_regex = QRegExp(QStringLiteral(
QRegularExpression ip_regex = QRegularExpression(QStringLiteral(
// IPv4 regex
"^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$|"
// IPv6 regex
@@ -59,7 +61,7 @@ private:
"\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?$|"
// Hostname regex
"^([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\\.)+[a-zA-Z]{2,}$"));
QRegExpValidator ip;
QRegularExpressionValidator ip;
/// port must be between 0 and 65535
QIntValidator port;