diff -r 7a0216d033ac -r fe6b6762fccd securitysettings/qtconfigutils/eapqtconfiginterface/inc/eapqtvalidatorusername.h
--- a/securitysettings/qtconfigutils/eapqtconfiginterface/inc/eapqtvalidatorusername.h	Wed Jun 23 18:14:55 2010 +0300
+++ b/securitysettings/qtconfigutils/eapqtconfiginterface/inc/eapqtvalidatorusername.h	Tue Jul 06 14:18:35 2010 +0300
@@ -2,7 +2,7 @@
  * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
  * All rights reserved.
  * This component and the accompanying materials are made available
- * under the terms of the License "Eclipse Public License v1.0"
+ * under the terms of "Eclipse Public License v1.0"
  * which accompanies this distribution, and is available
  * at the URL "http://www.eclipse.org/legal/epl-v10.html".
  *
@@ -17,47 +17,53 @@
  */
 
 /*
- * %version: 5 %
+ * %version: 7 %
  */
 
-#ifndef EAPQTVALIDATOR_USERNAME_H
-#define EAPQTVALIDATOR_USERNAME_H
+#ifndef EAPQTVALIDATORUSERNAME_H
+#define EAPQTVALIDATORUSERNAME_H
 
+// System includes
 #include <eapqtvalidator.h>
 #include <eapqtexpandedeaptype.h>
 
-/*!
- * @addtogroup group_eap_config_if_impl
- * @{
- */
-/*!
- */
+// User includes
+
+// Forward declarations
+
+// External data types
+
+// Constants
+
+// Class declaration
 class EapQtValidatorUsername: public EapQtValidator
 {
+
 public:
 
-    explicit EapQtValidatorUsername(EapQtExpandedEapType type);
+    // Data types
+
+    explicit EapQtValidatorUsername(const EapQtExpandedEapType& type);
     ~EapQtValidatorUsername();
 
     // from EapQtValidator
-    EapQtValidator::Status validate(QVariant value);
-    void updateEditor(HbLineEdit *edit);
+    EapQtValidator::Status validate(const QVariant& value);
+    void updateEditor(HbLineEdit* const edit);
 
 private:
 
     EapQtValidatorUsername();
     Q_DISABLE_COPY(EapQtValidatorUsername)
 
-    EapQtValidator::Status validateGeneral(QVariant value);
-    bool validateCharacters(QString& str);
-    void updateEditorGeneral(HbLineEdit *edit);
+    EapQtValidator::Status validateGeneral(const QVariant& value);
+    bool validateCharacters(const QString& str);
+    void updateEditorGeneral(HbLineEdit* const edit);
+    bool isEmptyAllowed();
 
-private:
+private: // data
+
     EapQtExpandedEapType mEapType;
 
 };
 
-/*! @} */
-
-#endif
-
+#endif // EAPQTVALIDATORUSERNAME_H