FCL/sf/mw/accesssec: comparison securitysettings/eapqtdialogs/src/eapusernamepwddialog.cpp

equal deleted inserted replaced

-:372d2d6c5cf9
+:ad1f037f1ac2
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
-* Description: Dialog implementation
+* Description:   User authentication Dialog implementation
 *
 */
+/*
+* %version: 4 %
+*/
 #include <eapqtvalidator.h>
 #include <eapqtexpandedeaptype.h>
 #include <eapqtconfiginterface.h>
 #include <eapqtconfig.h>
+#include <HbParameterLengthLimiter>
+#include <HbTranslator>
+#include <HbLineEdit>
+#include <HbAction>
 #include "eapusernamepwddialog.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
 #endif
 EapUsernamePwdDialog::EapUsernamePwdDialog(const QVariantMap &parameters)
 :mEdit1(NULL),
 mEdit2(NULL),
 mUnameValidator(NULL),
 mPwdValidator(NULL),
-mTranslator(new HbTranslator("eapprompts"))
+mTranslator(new HbTranslator("eapprompts")),
+mClose(false),
+mOkActionPressed(false)
 {
 OstTraceFunctionEntry0( EAPUSERNAMEPWDDIALOG_EAPUSERNAMEPWDDIALOG_ENTRY );
 qDebug("EapUsernamePwdDialog::EapUsernamePwdDialog ENTER");
 createDialog(parameters);
-mClose = false;
-mOkActionPressed = false;
 OstTraceFunctionExit0( EAPUSERNAMEPWDDIALOG_EAPUSERNAMEPWDDIALOG_EXIT );
 qDebug("EapUsernamePwdDialog::EapUsernamePwdDialog EXIT");
 }
 /**
 void EapUsernamePwdDialog::createDialog(const QVariantMap &parameters )
 {
 OstTraceFunctionEntry0( EAPUSERNAMEPWDDIALOG_CREATEDIALOG_ENTRY );
 qDebug("EapUsernamePwdDialog::createDialog ENTER");
-QString keyauthmethod = QString("authmethod");
+QString keyauthmethod("authmethod");
-QString keyuname = QString("username");
+QString keyuname("username");
-QString keyeaptype = QString("eaptype");
+QString keyeaptype("eaptype");
-QString unamestr = QString("");
+QString unamestr;
-QString authMethodstr = QString("FOO");
+QString authMethodstr;
+//Get default username (if exists) and
+//auth method strings from parameters
 if ( parameters.empty() == false ) {
 if ( parameters.contains(keyuname) ) {
 QVariant variant = parameters.value(keyuname);
 unamestr = variant.toString();
 }
 QVariant variant = parameters.value(keyauthmethod);
 authMethodstr = variant.toString();
 }
 }
-QString labelText1 = QString(hbTrId("txt_occ_dialog_1_user_name").arg(authMethodstr));
+QString labelText1(HbParameterLengthLimiter(hbTrId("txt_occ_dialog_1_user_name")).arg(authMethodstr));
-QString labelText2 = QString(hbTrId("txt_occ_dialog_password"));
+QString labelText2(HbParameterLengthLimiter(hbTrId("txt_occ_dialog_password")));
 //Set the dialog to be on the screen until user reacts
 //by pressing any of the Action buttons
 this->setModal(true);
 this->setTimeout(HbPopup::NoTimeout);
 mEdit1 = this->lineEdit(0);
 mEdit1->setText(unamestr);
 this->setPromptText(labelText2, 1);
 mEdit2 = this->lineEdit(1);
+//Get the EAP type for the Line Edits (Validator)
 QByteArray ba;
 if ( parameters.contains(keyeaptype) ) {
 QVariant variant = parameters.value(keyeaptype);
 ba = variant.toByteArray();
 }
 Q_ASSERT( ba.isEmpty() == false );
 EapQtExpandedEapType e_type(ba);
 EapQtConfigInterface eap_config_if;
-mUnameValidator = eap_config_if.validatorEap(e_type,
+mUnameValidator.reset(eap_config_if.validatorEap(e_type,
-EapQtConfig::Username);
+EapQtConfig::Username));
+Q_ASSERT( mUnameValidator.isNull() == false );
 mUnameValidator->updateEditor(mEdit1);
-mPwdValidator = eap_config_if.validatorEap(e_type,
+mPwdValidator.reset(eap_config_if.validatorEap(e_type,
-EapQtConfig::Password);
+EapQtConfig::Password));
+Q_ASSERT( mPwdValidator.isNull() == false );
 mPwdValidator->updateEditor(mEdit2);
-QList<QAction*> action_list = this->actions();
+//Remove all default actions from the dialog
+QList<QAction*> action_list = this->actions();
 for ( int i = 0; i < action_list.count(); i++ ) {
 this->removeAction(action_list.at(i));
 }
+//Add a new Ok button action
 HbAction* actionOk = new HbAction(hbTrId("txt_common_button_ok"),this);
 this->addAction(actionOk);
+//Add a new Cancel button action
 HbAction* actionCancel = new HbAction(hbTrId("txt_common_button_cancel"),this);
 this->addAction( actionCancel );
+//Disconnect action Ok from the default SLOT and connect to
+//a SLOT owned by this class
 disconnect(actionOk, SIGNAL(triggered()),this, SLOT(close()));
 bool connected = connect(actionOk, SIGNAL(triggered()), this, SLOT(okPressed()));
 Q_ASSERT(connected == true);
+//Disconnect action Cancel from the default SLOT and connect to
+//a SLOT owned by this class
 disconnect(actionCancel, SIGNAL(triggered()),this, SLOT(close()));
 connected = connect(actionCancel, SIGNAL(triggered()), this, SLOT(cancelPressed()));
 Q_ASSERT(connected == true);
 // Connect the about to close and hide signals, so that we are able to inform
 {
 OstTraceFunctionEntry0( EAPUSERNAMEPWDDIALOG_DEAPUSERNAMEPWDDIALOG_ENTRY );
 qDebug("EapUsernamePwdDialog::~EapUsernamePwdDialog");
 //The dialog widgets are deleted as the dialog is deleted
-delete mPwdValidator;
+// mPwdValidator:   scoped pointer deleted automatically
-delete mUnameValidator;
+// mUnameValidator: scoped pointer deleted automatically
 OstTraceFunctionExit0( EAPUSERNAMEPWDDIALOG_DEAPUSERNAMEPWDDIALOG_EXIT );
 }
 /**
-* Line edit validator
+* Line Edit Validator
 */
 bool EapUsernamePwdDialog::validate() const
 {
 qDebug("EapUsernamePwdDialog::validate ENTER");
 if ( validate() == true && mOkActionPressed == false ) {
 mOkActionPressed = true;
 QVariantMap data;
-QString editStr1 = mEdit1->text();
+data["username"] = mEdit1->text();
+data["password"] = mEdit2->text();
-QString editStr2 = mEdit2->text();
-QVariant variant1(editStr1);
-QVariant variant2(editStr2);
-data["username"] = variant1;
-data["password"] = variant2;
 qDebug("EapUsernamePwdDialog::okPressed: emit deviceDialogData");
 emit deviceDialogData(data);
 closeDeviceDialog(true);
 */
 void EapUsernamePwdDialog::closingDialog()
 {
 OstTraceFunctionEntry0( EAPUSERNAMEPWDDIALOG_CLOSINGDIALOG_ENTRY );
 qDebug("EapUsernamePwdDialog::closingDialog ENTER");
-closeDeviceDialog(false);
 qDebug("EapUsernamePwdDialog::closingDialog EXIT");
 OstTraceFunctionExit0( EAPUSERNAMEPWDDIALOG_CLOSINGDIALOG_EXIT );
 }
 /**

changeset 34	ad1f037f1ac2
parent 26	9abfd4f00d37
child 36	c98682f98478