QuasarApp/QMLLoginView
4
0
Fork 0
mirror of https://github.com/QuasarApp/QMLLoginView.git synced 2025-04-27 10:14:37 +00:00
Code Issues Projects Releases Wiki Activity

add qt6 sopport

Browse Source
This commit is contained in:
Andrei Yankovich 2020-12-27 16:24:55 +03:00
parent 5f1de16eff
commit 9b4842846a
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LoginView/src/countrysparser.cpp
View File

@ -41,7 +41,7 @@ bool CountrysParser::parseXMLSource(const QString &xmlFile, QHash<int, QString>
break;
}
if (token == QXmlStreamReader::StartElement && xml.name() == "countries") {
if (token == QXmlStreamReader::StartElement && xml.name() == QString("countries")) {
success = parseCountries(xml, result);
break;
}
@ -81,20 +81,20 @@ bool CountrysParser::parseCountry(QXmlStreamReader& xml, QHash<int, QString>& re
int code = 0;
QString name;
while (!(xml.readNext() == QXmlStreamReader::EndElement && xml.name() == "country")) {
while (!(xml.readNext() == QXmlStreamReader::EndElement && xml.name() == QString("country"))) {
if (!isValidItem(xml)) {
return false;
}
if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == "code") {
if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == QString("code")) {
code = getCode(xml);
if (code < 0) {
qDebug() << "error parse, code of country is invalid: line "
<< xml.lineNumber();
return false;
}
} else if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == "name") {
} else if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == QString("name")) {
name = getName(xml);
if (name.isEmpty()) {
qDebug() << "error parse, name of country is empty: line "
@ -113,13 +113,13 @@ bool CountrysParser::parseCountries(QXmlStreamReader &xml, QHash<int, QString>&
if (xml.tokenType() != QXmlStreamReader::StartElement)
return false;
while (!(xml.readNext() == QXmlStreamReader::EndElement && xml.name() == "countries")) {
while (!(xml.readNext() == QXmlStreamReader::EndElement && xml.name() == QString("countries"))) {
if (!isValidItem(xml)) {
return false;
}
if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == "country" && !parseCountry(xml, result)) {
if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == QString("country") && !parseCountry(xml, result)) {
return false;
}
}

11
LoginView/src/lvmainmodel.cpp
View File

@ -11,6 +11,7 @@
#include <QQmlApplicationEngine>
#include <QQmlContext>
#include <QDebug>
#include <QRegularExpression>
namespace LoginView {
@ -183,7 +184,7 @@ void LVMainModel::checkValid(const UserData& data) {
UserViewValidationData result;
result.setNickname(fNickname() && (data.nickname().contains(" ") || data.nickname().isEmpty()));
result.setEmail(fEMail() && !data.email().contains(QRegExp("^([a-zA-Z0-9_\-\.]+)@([a-zA-Z0-9_\-\.]+)\.([a-zA-Z]{2,5})$")));
result.setEmail(fEMail() && !data.email().contains(QRegularExpression("^([a-zA-Z0-9_\-\.]+)@([a-zA-Z0-9_\-\.]+)\.([a-zA-Z]{2,5})$")));
result.setCountry(m_countryList.size() && !m_countryList.contains(data.country()));
result.setLastName(fLastName() && false);
result.setFirstName(fFirstName() && (data.firstName().contains(" ") || data.firstName().isEmpty()));
@ -197,22 +198,22 @@ void LVMainModel::checkValid(const UserData& data) {
if (m_validLvl & PasswordValidationLvl::NumberChars) {
passwordValidation = passwordValidation &&
data.rawPassword().contains(QRegExp("[0-9]"));
data.rawPassword().contains(QRegularExpression("[0-9]"));
}
if (m_validLvl & PasswordValidationLvl::LitinSmallChars) {
passwordValidation = passwordValidation &&
data.rawPassword().contains(QRegExp("[a-z]"));
data.rawPassword().contains(QRegularExpression("[a-z]"));
}
if (m_validLvl & PasswordValidationLvl::LatinLargeChars) {
passwordValidation = passwordValidation &&
data.rawPassword().contains(QRegExp("[A-Z]"));
data.rawPassword().contains(QRegularExpression("[A-Z]"));
}
if (m_validLvl & PasswordValidationLvl::ExtraChars) {
passwordValidation = passwordValidation &&
data.rawPassword().contains(QRegExp("[!@#$%^&*]"));
data.rawPassword().contains(QRegularExpression("[!@#$%^&*]"));
}
result.setRawPassword(!passwordValidation);