napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[users] Drop QRegExpValidator

Browse Source 
- QREValidator is a GUI part, so to avoid a dependency on GUI for the
  (non-GUI) Config object, port to the simpler QRE (which we had
  available anyway)
This commit is contained in:
Adriaan de Groot 2020-07-29 12:27:56 +02:00
parent b9372ba432
commit f75839340a
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/users/Config.cpp
View File

@ -28,7 +28,6 @@
#include <QFile> #include <QFile>
#include <QRegExp> #include <QRegExp>
#include <QRegExpValidator>
static const QRegExp USERNAME_RX( "^[a-z_][a-z0-9_-]*[$]?$" ); static const QRegExp USERNAME_RX( "^[a-z_][a-z0-9_-]*[$]?$" );
static constexpr const int USERNAME_MAX_LENGTH = 31; static constexpr const int USERNAME_MAX_LENGTH = 31;
@ -132,15 +131,12 @@ Config::loginNameStatus() const
} }
} }
QString login( m_loginName ); // make a copy because validate() doesn't take const& QRegExp validateFirstLetter( "^[a-z_]" );
QRegExpValidator validateEntireLoginName( USERNAME_RX ); if ( validateFirstLetter.indexIn( m_loginName ) != 0 )
QRegExpValidator validateFirstLetter( QRegExp( "[a-z_].*" ) ); // anchors are implicit in QRegExpValidator
int pos = -1;
if ( validateFirstLetter.validate( login, pos ) == QValidator::Invalid )
{ {
return tr( "Your username must start with a lowercase letter or underscore." ); return tr( "Your username must start with a lowercase letter or underscore." );
} }
if ( validateEntireLoginName.validate( login, pos ) == QValidator::Invalid ) if ( !USERNAME_RX.exactMatch( m_loginName ) )
{ {
return tr( "Only lowercase letters, numbers, underscore and hyphen are allowed." ); return tr( "Only lowercase letters, numbers, underscore and hyphen are allowed." );
} }
@ -202,11 +198,7 @@ Config::hostNameStatus() const
} }
} }
QString text = m_hostName; if ( !HOSTNAME_RX.exactMatch( m_hostName ) )
QRegExpValidator val( HOSTNAME_RX );
int pos = -1;
if ( val.validate( text, pos ) == QValidator::Invalid )
{ {
return tr( "Only letters, numbers, underscore and hyphen are allowed." ); return tr( "Only letters, numbers, underscore and hyphen are allowed." );
} }