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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepim/kleopatra
From:       Marc Mutz <mutz () kde ! org>
Date:       2008-07-02 8:40:08
Message-ID: 1214988008.749064.9019.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 827074 by mutz:

Add various QValidator's, factored out from adduiseriddialog.cpp, and make the email \
one IDNA-aware

 M  +1 -0      CMakeLists.txt  
 M  +5 -10     dialogs/adduseriddialog.cpp  
 A             utils/validation.cpp   [License: GPL (v2+) (+Qt exception)]
 A             utils/validation.h   [License: GPL (v2+) (+Qt exception)]


--- branches/kdepim/enterprise4/kdepim/kleopatra/CMakeLists.txt #827073:827074
@@ -110,6 +110,7 @@
   utils/output.cpp
   utils/exception.cpp
   utils/formatting.cpp
+  utils/validation.cpp
   utils/wsastarter.cpp
   utils/classify.cpp
   utils/iodevicelogger.cpp
--- branches/kdepim/enterprise4/kdepim/kleopatra/dialogs/adduseriddialog.cpp \
#827073:827074 @@ -36,10 +36,10 @@
 
 #include "ui_adduseriddialog.h"
 
+#include <utils/validation.h>
+
 #include <QString>
 #include <QStringList>
-#include <QRegExp>
-#include <QRegExpValidator>
 #include <QPushButton>
 
 #include <cassert>
@@ -68,14 +68,9 @@
         {
             setupUi( qq );
 
-            // these are modeled after gnupg/g10/keygen.c:ask_user_id:
-            const QRegExp nameRX( "[^0-9<>][^<>@]{4,}" );
-            const QRegExp emailRX( \
"[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?" \
                );
-            const QRegExp commentRX( "[^()]*" );
-
-            nameLE->setValidator( new QRegExpValidator( nameRX, nameLE ) );
-            emailLE->setValidator( new QRegExpValidator( emailRX, emailLE ) );
-            commentLE->setValidator( new QRegExpValidator( commentRX, commentLE ) );
+            nameLE->setValidator( Validation::pgpName( nameLE ) );
+            emailLE->setValidator( Validation::email( emailLE ) );
+            commentLE->setValidator( Validation::pgpComment( commentLE ) );
         }
 
         QPushButton * okPB() const {


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