flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-15 01:05:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T118, formatted authenticated user

Browse Source
This commit is contained in:
Klaus Basan
2017-10-26 01:34:21 +02:00
parent b74623599e
commit 5ac8a24e74
2 changed files with 21 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/blackmisc/network/authenticateduser.cpp
View File

@@ -49,8 +49,8 @@ namespace BlackMisc
QString CAuthenticatedUser::convertToQString(bool i18n) const QString CAuthenticatedUser::convertToQString(bool i18n) const
{ {
Q_UNUSED(i18n); Q_UNUSED(i18n);
if (this->m_realname.isEmpty()) return "<no realname>"; if (m_realname.isEmpty()) return "<no realname>";
QString s = this->m_realname; QString s = m_realname;
if (this->hasValidDbKey()) if (this->hasValidDbKey())
{ {
s.append(this->getDbKeyAsStringInParentheses(" ")); s.append(this->getDbKeyAsStringInParentheses(" "));
@@ -77,13 +77,13 @@ namespace BlackMisc
void CAuthenticatedUser::setRealName(const QString &realname) void CAuthenticatedUser::setRealName(const QString &realname)
{ {
const QString rn(realname.trimmed().simplified()); const QString rn(realname.trimmed().simplified());
this->m_realname = rn; m_realname = rn;
} }
void CAuthenticatedUser::setUsername(const QString &username) void CAuthenticatedUser::setUsername(const QString &username)
{ {
const QString un(username.trimmed().simplified().toUpper()); const QString un(username.trimmed().simplified().toUpper());
this->m_username = un; m_username = un;
} }
CStatusMessageList CAuthenticatedUser::validate() const CStatusMessageList CAuthenticatedUser::validate() const
@@ -139,18 +139,12 @@ namespace BlackMisc
const ColumnIndex i = index.frontCasted<ColumnIndex>(); const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i) switch (i)
{ {
case IndexVatsimId: case IndexVatsimId: return CVariant::fromValue(m_vatsimId);
return CVariant::fromValue(this->m_vatsimId); case IndexEmail: return CVariant::fromValue(m_email);
case IndexEmail: case IndexPassword: return CVariant::fromValue(m_password);
return CVariant::fromValue(this->m_email); case IndexRealName: return CVariant::fromValue(m_realname);
case IndexPassword: case IndexUsername: return CVariant::fromValue(m_username);
return CVariant::fromValue(this->m_password); default: return CValueObject::propertyByIndex(index);
case IndexRealName:
return CVariant::fromValue(this->m_realname);
case IndexUsername:
return CVariant::fromValue(this->m_username);
default:
return CValueObject::propertyByIndex(index);
} }
} }
@@ -161,24 +155,12 @@ namespace BlackMisc
const ColumnIndex i = index.frontCasted<ColumnIndex>(); const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i) switch (i)
{ {
case IndexVatsimId: case IndexVatsimId: this->setVatsimId(variant.toInt()); break;
this->setVatsimId(variant.toInt()); case IndexEmail: this->setEmail(variant.value<QString>()); break;
break; case IndexPassword: this->setPassword(variant.value<QString>()); break;
case IndexEmail: case IndexRealName: this->setRealName(variant.value<QString>()); break;
this->setEmail(variant.value<QString>()); case IndexUsername: this->setUsername(variant.value<QString>()); break;
break; default: CValueObject::setPropertyByIndex(index, variant); break;
case IndexPassword:
this->setPassword(variant.value<QString>());
break;
case IndexRealName:
this->setRealName(variant.value<QString>());
break;
case IndexUsername:
this->setUsername(variant.value<QString>());
break;
default:
CValueObject::setPropertyByIndex(index, variant);
break;
} }
} }
} // namespace } // namespace

10
src/blackmisc/network/authenticateduser.h
View File

@@ -81,13 +81,13 @@ namespace BlackMisc
void setPassword(const QString &pw) { m_password = pw.trimmed(); } void setPassword(const QString &pw) { m_password = pw.trimmed(); }
//! Valid user object? //! Valid user object?
bool isValid() const { return !this->m_realname.isEmpty() && this->hasValidDbKey(); } bool isValid() const { return !m_realname.isEmpty() && this->hasValidDbKey(); }
//! Valid credentials? //! Valid credentials?
bool hasValidCredentials() const { return this->isValid() && !this->m_password.isEmpty(); } bool hasValidCredentials() const { return this->isValid() && !m_password.isEmpty(); }
//! Valid real name? //! Valid real name?
bool hasValidRealName() const { return !this->m_realname.isEmpty(); } bool hasValidRealName() const { return !m_realname.isEmpty(); }
//! Validate, provide details about issues //! Validate, provide details about issues
BlackMisc::CStatusMessageList validate() const; BlackMisc::CStatusMessageList validate() const;
@@ -99,7 +99,7 @@ namespace BlackMisc
void setEmail(const QString &email) { m_email = email.trimmed(); } void setEmail(const QString &email) { m_email = email.trimmed(); }
//! Valid email? //! Valid email?
bool hasValidEmail() const { return !this->m_email.isEmpty(); } bool hasValidEmail() const { return !m_email.isEmpty(); }
//! Get id. //! Get id.
int getVatsimId() const { return m_vatsimId; } int getVatsimId() const { return m_vatsimId; }
@@ -150,7 +150,7 @@ namespace BlackMisc
void setEnabled(bool enabled) { m_enabled = enabled; } void setEnabled(bool enabled) { m_enabled = enabled; }
//! Enabled //! Enabled
bool isEnabled() const { return this->m_enabled; } bool isEnabled() const { return m_enabled; }
//! Entitled to directly update models //! Entitled to directly update models
bool canDirectlyWriteModels() const; bool canDirectlyWriteModels() const;