[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/runtime/accountwizard
From:       Casey Link <unnamedrambler () gmail ! com>
Date:       2010-07-29 18:42:56
Message-ID: 20100729184256.1438AAC7A9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1156806 by link:

Use the newly refactored kpimutils email validator.

 M  +3 -24     personaldatapage.cpp  


--- trunk/KDE/kdepim/runtime/accountwizard/personaldatapage.cpp #1156805:1156806
@@ -25,7 +25,9 @@
 #include "resource.h"
 #include "ispdb/ispdb.h"
 
+#include <kpimutils/emailvalidator.h>
 #include <kpimutils/email.h>
+
 #include <kemailsettings.h>
 
 #include <mailtransport/transport.h>
@@ -33,30 +35,7 @@
 #include <KDebug>
 
 #include <QScrollArea>
-#include <QValidator>
 
-class EmailValidator : public QValidator {
-  public:
-    EmailValidator( QObject* parent ) : QValidator( parent ) {}
-    virtual State validate( QString& str, int& pos ) const
-    {
-      Q_UNUSED( pos );
-      if ( KPIMUtils::isValidSimpleAddress( str ) )
-        return QValidator::Acceptable;
-
-      // we'll say any string that doesn't have whitespace
-      // is an intermediate email string
-      if( QRegExp("\\s").indexIn(str) > -1 )
-        return QValidator::Invalid;
-      return QValidator::Intermediate;
-    }
-
-    virtual void fixup( QString& str ) const
-    {
-      str = str.trimmed();
-    }
-};
-
 PersonalDataPage::PersonalDataPage(Dialog* parent) :
   Page( parent ), mSetupManager( parent->setupManager() )
 {
@@ -79,7 +58,7 @@
 
   ui.setupUi( pageParent );
 
-  EmailValidator* emailValidator = new EmailValidator( this );
+  KPIMUtils::EmailValidator* emailValidator = new KPIMUtils::EmailValidator( this );
   ui.emailEdit->setValidator( emailValidator );
 
   KEMailSettings e;
[prev in list] [next in list] [prev in thread] [next in thread]