Changeset 19225 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 28, 2009 7:10:07 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3837: New registration method - burn fix.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxRegistrationDlg.h (modified) (1 diff)
• src/VBoxRegistrationDlg.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxRegistrationDlg.h

@@ -74 +74 @@
     void finish();
 
+    bool isFieldValid (QLineEdit *aLe) const;
+
     VBoxRegistrationDlg **mSelf;
     QIWidgetValidator    *mWvalReg;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxRegistrationDlg.cpp

@@ -501 +501 @@
     {
         /* Check for fields correctness */
-        if (mLeOldEmail->validator()->validate (mLeOldEmail->text(), pos) != QValidator::Acceptable ||
-            mLeOldPassword->validator()->validate (mLeOldPassword->text(), pos) != QValidator::Acceptable)
+        if (!isFieldValid (mLeOldEmail) || !isFieldValid (mLeOldPassword))
             valid = false;
     }
@@ -508 +507 @@
     {
         /* Check for fields correctness */
-        if (mLeNewFirstName->validator()->validate (mLeNewFirstName->text(), pos) != QValidator::Acceptable ||
-            mLeNewLastName->validator()->validate (mLeNewLastName->text(), pos) != QValidator::Acceptable ||
-            mLeNewCompany->validator()->validate (mLeNewCompany->text(), pos) != QValidator::Acceptable ||
-            mLeNewCountry->validator()->validate (mLeNewCountry->text(), pos) != QValidator::Acceptable ||
-            mLeNewEmail->validator()->validate (mLeNewEmail->text(), pos) != QValidator::Acceptable ||
-            mLeNewPassword->validator()->validate (mLeNewPassword->text(), pos) != QValidator::Acceptable ||
-            mLeNewPassword2->validator()->validate (mLeNewPassword2->text(), pos) != QValidator::Acceptable)
+        if (!isFieldValid (mLeNewFirstName) || !isFieldValid (mLeNewLastName) ||
+            !isFieldValid (mLeNewCompany) || !isFieldValid (mLeNewCountry) ||
+            !isFieldValid (mLeNewEmail) ||
+            !isFieldValid (mLeNewPassword) || !isFieldValid (mLeNewPassword2))
             valid = false;
 
@@ -564 +560 @@
 }
 
+bool VBoxRegistrationDlg::isFieldValid (QLineEdit *aLe) const
+{
+    QString text (aLe->text());
+    int position;
+    return aLe->validator()->validate (text, position) == QValidator::Acceptable;
+}
+