thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make InputValidator class members static

Browse source
This commit is contained in:
Konstantinos Sideris 2017-05-14 16:36:30 +03:00
parent 7502f167ae
commit b3bb0531de
6 changed files with 22 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

29
include/InputValidator.h
View file

@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MATRIXIDVALIDATOR_H
#define MATRIXIDVALIDATOR_H
#ifndef MATRIX_INPUT_VALIDATOR_H
#define MATRIX_INPUT_VALIDATOR_H
#include <QRegExp>
#include <QRegExpValidator>
@ -24,26 +24,11 @@
class InputValidator
{
public:
InputValidator(QObject *parent = 0);
// Validators for the different types of input.
QRegExpValidator *id_;
QRegExpValidator *localpart_;
QRegExpValidator *password_;
QRegExpValidator *domain_;
private:
// Regular expression used to validate the whole matrix id.
const QRegExp matrix_id_;
// Regular expressino to validate the matrix localpart.
const QRegExp matrix_localpart_;
// Regular expression to validate a password for a matrix account.
const QRegExp matrix_password_;
// Regular expression to validate a domain name.
const QRegExp server_domain_;
static QRegExpValidator Id;
static QRegExpValidator Localpart;
static QRegExpValidator Password;
static QRegExpValidator Domain;
};
#endif // MATRIXIDVALIDATOR_H
#endif // MATRIX_INPUT_VALIDATOR_H

3
include/LoginPage.h
View file

@ -25,7 +25,6 @@
#include <QWidget>
#include "FlatButton.h"
#include "InputValidator.h"
#include "LoginSettings.h"
#include "MatrixClient.h"
#include "OverlayModal.h"
@ -84,8 +83,6 @@ private:
LoginSettings *login_settings_;
QString custom_domain_;
InputValidator *matrix_id_validator_;
// Matrix client API provider.
QSharedPointer<MatrixClient> client_;
};

3
include/RegisterPage.h
View file

@ -26,7 +26,6 @@
#include "Avatar.h"
#include "FlatButton.h"
#include "InputValidator.h"
#include "MatrixClient.h"
#include "RaisedButton.h"
#include "TextField.h"
@ -71,8 +70,6 @@ private:
TextField *password_confirmation_;
TextField *server_input_;
InputValidator *validator_;
// Matrix client API provider.
QSharedPointer<MatrixClient> client_;
};