diff -r d2517372cc44 -r ae69c2e8bc34 fotaapplication/fotaserver/src/fotafullscreendialog.cpp
--- a/fotaapplication/fotaserver/src/fotafullscreendialog.cpp	Tue Sep 28 17:53:08 2010 +0530
+++ b/fotaapplication/fotaserver/src/fotafullscreendialog.cpp	Fri Oct 15 11:46:45 2010 +0530
@@ -11,13 +11,13 @@
  *
  * Contributors:
  *
- * Description: 
+ * Description: FotaFullscreenDialog, which is responsible for showing the fullscreen dialog of FOTA from the docml.
  *
  */
 
 #include "fotafullscreendialog.h"
 
-#include <hbaction.h>
+#include <HbAction.h>
 #include <hbprogressbar.h>
 #include <hbicon.h>
 #include <hbextendedlocale.h>
@@ -27,122 +27,130 @@
 
 
 // ---------------------------------------------------------------------------
-// CFotaDownloadNotifHandler::FotaFullscreenDialog
+// HbFotaFullscreenDialog::HbFotaFullscreenDialog
 // Constructor of the full screen dialogs, it takes all the widgets from the docml
 // initializes it and sets the progress bar to zero.
 // ---------------------------------------------------------------------------
 //
 
 
-FotaFullscreenDialog::FotaFullscreenDialog(CFotaServer* aObserver)
+HbFotaFullscreenDialog::HbFotaFullscreenDialog(CFotaServer* aObserver)
     {
-    FLOG(_L("FotaFullscreenDialog::FotaFullscreenDialog >>"));
+    FLOG(_L("HbFotaFullscreenDialog::HbFotaFullscreenDialog >>"));
     bool ok = false;
-    iServer = aObserver;
-    iloader.load(":/xml/data/fullscreendialog.docml", &ok);
+    m_Server = aObserver;
+    m_loader.load(":/xml/data/fullscreendialog.docml", &ok);
     if (!ok)
         {
         return;
         }
-    iClicked = EFalse;
-    idialog = qobject_cast<HbDialog *> (iloader.findWidget("dialog"));
+    m_Clicked = EFalse;
+    m_dialog = qobject_cast<HbDialog *> (m_loader.findWidget("dialog"));
 
-	idialog->setTimeout(HbPopup::NoTimeout);
+		m_dialog->setTimeout(HbPopup::NoTimeout);
    
-    iPrimaryAction = qobject_cast<HbPushButton *> (iloader.findWidget(
+    m_PrimaryAction = qobject_cast<HbPushButton *> (m_loader.findWidget(
             "btnHide"));
 			
-     iSecondaryAction = qobject_cast<HbPushButton *> (iloader.findWidget(
+     m_SecondaryAction = qobject_cast<HbPushButton *> (m_loader.findWidget(
             "btnResumeLater"));
 			
 			
     
-    iprogressBar = qobject_cast<HbProgressBar *> (iloader.findWidget(
+    m_progressBar = qobject_cast<HbProgressBar *> (m_loader.findWidget(
             "horizontalProgressBar"));
-    iprogressBar->setProgressValue(0);
+    m_progressBar->setProgressValue(0);
 	
-	    /*iInstallNote = qobject_cast<HbLabel *> (iloader.findWidget(
-            "lblinstallnote"));*/
-    iDownloadState = qobject_cast<HbLabel *> (iloader.findWidget(
+	  m_InstallNote = qobject_cast<HbLabel *> (m_loader.findWidget(
+            "lblinstallnote"));
+    m_InstallNote->setPlainText(hbTrId(
+            "txt_device_update_info_installation_will_proceed_n"));
+            
+    m_DownloadState = qobject_cast<HbLabel *> (m_loader.findWidget(
             "lblDownloadState"));
-    //iEmergencyIcon = qobject_cast<HbLabel *> (iloader.findWidget(
-    //        "icnEmergency"));
-    iChargerIcon = qobject_cast<HbLabel *> (iloader.findWidget("icnCharger"));
-    HbIcon iconCharger;
-    //iconCharger.setIconName(:/icons/qgn_prop_sml_http.svg);
-    //iChargerIcon->setIcon(iconCharger);
+    m_DownloadState->setPlainText(hbTrId("txt_device_update_info_downloading"));
+            
+    m_EmergencyIcon = qobject_cast<HbLabel *> (m_loader.findWidget(
+            "icnEmergency"));
     HbIcon iconEmergency;
-    //iconEmergency.setIconName(:/icons/qgn_prop_sml_http.svg);
-    //iEmergencyIcon->setIcon(iconEmergency);
-    //iEmergencyNote = qobject_cast<HbLabel *> (iloader.findWidget(
-    //        "lblEmergency"));
-    //iRestartIcon = qobject_cast<HbLabel *> (iloader.findWidget("icnInstall"));
-    //HbIcon iconRestart;
-    //iconRestart.setIconName(:/icons/qgn_prop_sml_http.svg);
-    //iRestartIcon->setIcon(iconRestart);
-    //iRestartNote = qobject_cast<HbLabel *> (iloader.findWidget(
-    //        "lblRestartNote"));
-    //installEventFilter(this);
-    iPrimaryAction->setText(hbTrId("txt_common_button_hide"));
-    iSecondaryAction->setText(hbTrId("txt_device_update_button_resume_later"));
-    iTitle = qobject_cast<HbLabel *> (iloader.findWidget("lblTitle"));
-    iTitle->setPlainText(hbTrId("txt_device_update_title_updating_phone"));
-    iDownloadState->setPlainText(hbTrId("txt_device_update_info_downloading"));
-    //iInstallNote->setPlainText(hbTrId(
-    //        "txt_device_update_info_installation_will_proceed_n"));
-    iChargerNote = qobject_cast<HbLabel *> (iloader.findWidget("lblcharger"));
-    iChargerNote->setPlainText(hbTrId(
+    iconEmergency.setIconName(":/icons/qgn_prop_sml_http.svg");
+    m_EmergencyIcon->setIcon(iconEmergency);
+    
+    m_ChargerIcon = qobject_cast<HbLabel *> (m_loader.findWidget("icnCharger"));
+    HbIcon iconCharger;
+    iconCharger.setIconName(":/icons/qgn_prop_sml_http.svg");
+    m_ChargerIcon->setIcon(iconCharger);
+    
+    m_RestartIcon = qobject_cast<HbLabel *> (m_loader.findWidget("icnInstall"));
+    HbIcon iconRestart;
+    iconRestart.setIconName(":/icons/qgn_prop_sml_http.svg");
+    m_RestartIcon->setIcon(iconRestart);
+    
+    m_PrimaryAction->setText(hbTrId("txt_common_button_hide"));
+    m_SecondaryAction->setText(hbTrId("txt_device_update_button_resume_later"));
+    m_Title = qobject_cast<HbLabel *> (m_loader.findWidget("lblTitle"));
+    m_Title->setPlainText(hbTrId("txt_device_update_title_updating_phone"));
+    
+    
+    m_ChargerNote = qobject_cast<HbLabel *> (m_loader.findWidget("lblcharger"));
+    m_ChargerNote->setPlainText(hbTrId(
             "txt_device_update_info_FS_its_recommended_to_connec"));
-    //iRestartNote->setPlainText(hbTrId(
-    //        "txt_device_update_info_FS_after_the_installation_the"));
-    //iEmergencyNote->setPlainText(hbTrId(
-    //        "txt_device_update_info_FS_during_the_installation_the"));
+            
+    m_RestartNote = qobject_cast<HbLabel *> (m_loader.findWidget(
+            "lblRestartNote"));
+    m_RestartNote->setPlainText(hbTrId(
+            "txt_device_update_info_FS_after_the_installation_the"));
+            
+    m_EmergencyNote = qobject_cast<HbLabel *> (m_loader.findWidget(
+            "lblEmergency"));
+    m_EmergencyNote->setPlainText(hbTrId(
+            "txt_device_update_info_FS_during_the_installation_the"));
 
-    QObject::connect(iPrimaryAction, SIGNAL(clicked()), this,
-            SLOT(LSKSelected()));
-    QObject::connect(iSecondaryAction, SIGNAL(clicked()), this,
-            SLOT(RSKSelected()));
-    QObject::connect(idialog, SIGNAL(aboutToClose()), this,
+    QObject::connect(m_PrimaryAction, SIGNAL(clicked()), this,
+            SLOT(lSKSelected()));
+    QObject::connect(m_SecondaryAction, SIGNAL(clicked()), this,
+            SLOT(rSKSelected()));
+    QObject::connect(m_dialog, SIGNAL(aboutToClose()), this,
             SLOT(aboutToClose()));
 
-    RefreshDialog();
-    FLOG(_L("FotaFullscreenDialog::FotaFullscreenDialog <<"));
+    refreshDialog();
+    FLOG(_L("HbFotaFullscreenDialog::HbFotaFullscreenDialog <<"));
     }
 
 
 
 // ---------------------------------------------------------------------------
-// CFotaDownloadNotifHandler::refreshDialog
+// HbFotaFullscreenDialog::refreshDialog
 // This function is used to refresh the contents of the full screen dialog
 // once it is changed.
 // ---------------------------------------------------------------------------
 //
 
 
-void FotaFullscreenDialog::RefreshDialog()
+void HbFotaFullscreenDialog::refreshDialog()
     {
-    FLOG(_L("FotaFullscreenDialog::RefreshDialog >>"));
-    if (idialog)
+    FLOG(_L("HbFotaFullscreenDialog::RefreshDialog >>"));
+    if (m_dialog)
         {
-        FLOG(_L("FotaFullscreenDialog::idialog >>"));
-        iClicked = EFalse;
-        idialog->show();
+        FLOG(_L("HbFotaFullscreenDialog::idialog >>"));
+        m_Clicked = EFalse;
+        m_dialog->show();
         }
-    FLOG(_L("FotaFullscreenDialog::RefreshDialog <<"));
+    FLOG(_L("HbFotaFullscreenDialog::RefreshDialog <<"));
     }
 
 // ---------------------------------------------------------------------------
-// CFotaDownloadNotifHandler::setsoftwaredetails
+// HbFotaFullscreenDialog::setSoftwareDetails
 // This function is called to set the details of the software,which is downloaded.
 // ---------------------------------------------------------------------------
 //
 
-void FotaFullscreenDialog::SetSoftwareDetails(int size,
+void HbFotaFullscreenDialog::setSoftwareDetails(int size,
         const QString version, const QString aName)
     {
     //set Sw Details
-    FLOG(_L("FotaFullscreenDialog::RefreshDialog >>"));
-    iSwDetails = qobject_cast<HbLabel *> (iloader.findWidget("lblSwVersion"));
+    FLOG(_L("HbFotaFullscreenDialog::RefreshDialog >>"));
+    m_SwDetails = qobject_cast<HbLabel *> (m_loader.findWidget("lblSwVersion"));
     QString content;
     
     TReal sizeKB = size / 1024;
@@ -161,295 +169,275 @@
         content = hbTrId("txt_device_update_info_new_device_software_availab_Kb") .arg(aName) .arg(version).arg(sizeRounded);
         }
 
-    iSwDetails->setPlainText(content);
-    FLOG(_L("FotaFullscreenDialog::RefreshDialog <<"));
+    m_SwDetails->setPlainText(content);
+    FLOG(_L("HbFotaFullscreenDialog::RefreshDialog <<"));
     }
 
 // ---------------------------------------------------------------------------
-// CFotaDownloadNotifHandler::close
+// HbFotaFullscreenDialog::close
 // This slot is called to manually close the dialog.
 // ---------------------------------------------------------------------------
 //
 
-void FotaFullscreenDialog::Close()
+void HbFotaFullscreenDialog::close()
     {
-    FLOG(_L("FotaFullscreenDialog::Close <<"));
-    iClicked = ETrue;
-    if (idialog)
-        idialog->close();
-    FLOG(_L("FotaFullscreenDialog::Close >>"));
+    FLOG(_L("HbFotaFullscreenDialog::Close <<"));
+    m_Clicked = ETrue;
+    if (m_dialog)
+        m_dialog->close();
+    FLOG(_L("HbFotaFullscreenDialog::Close >>"));
     }
 
 // ---------------------------------------------------------------------------
-// CFotaDownloadNotifHandler::setwarningdetails
+// HbFotaFullscreenDialog::setWarningDetails
 // This function is to set the warnings details of the full screen dialog
 // according to the state of the firmware update.
 // ---------------------------------------------------------------------------
 //
 
-void FotaFullscreenDialog::SetWarningDetails(TFotaWarningType aType)
+void HbFotaFullscreenDialog::setWarningDetails(TFotaWarningType aType)
     {
-    FLOG(_L("FotaFullscreenDialog::SetWarningDetails <<"));
+    FLOG(_L("HbFotaFullscreenDialog::SetWarningDetails <<"));
     //set heading content
     if (aType == EHbFotaDownload)
         {
-        FLOG(_L("FotaFullscreenDialog::EHbFotaDownload"));
-        idialog->setTimeout(HbPopup::NoTimeout);
-        iInstallNote = qobject_cast<HbLabel *> (iloader.findWidget(
-                    "lblinstallnote"));
-        iInstallNote->setPlainText(hbTrId(
-                    "txt_device_update_info_installation_will_proceed_n"));
-        //User::After(1000);
-        iInstallNote->setVisible(false);
-        
-        iRestartNote = qobject_cast<HbLabel *> (iloader.findWidget(
-                    "lblRestartNote"));
-        iRestartNote->setPlainText(hbTrId(
-                    "txt_device_update_info_FS_after_the_installation_the"));
-        //User::After(1000);
-        iRestartNote->setVisible(false);
-        
-        iRestartIcon = qobject_cast<HbLabel *> (iloader.findWidget("icnInstall"));
-        HbIcon iconRestart;
-        //iconRestart.setIconName(:/icons/qgn_prop_sml_http.svg);
-        //iRestartIcon->setIcon(iconRestart);
-        //User::After(1000);
-        iRestartIcon->setVisible(false);
-        
-        iEmergencyNote = qobject_cast<HbLabel *> (iloader.findWidget(
-                    "lblEmergency"));
-        iEmergencyNote->setPlainText(hbTrId(
-                   "txt_device_update_info_FS_during_the_installation_the"));
-        //User::After(1000);
-        iEmergencyNote->setVisible(false);
-        
-        iEmergencyIcon = qobject_cast<HbLabel *> (iloader.findWidget(
-                    "icnEmergency"));
-        HbIcon iconEmergency;
-        //iconEmergency.setIconName(:/icons/qgn_prop_sml_http.svg);
-        //iEmergencyIcon->setIcon(iconEmergency);
-        //User::After(1000);
-        iEmergencyIcon->setVisible(false);
-
+        FLOG(_L("HbFotaFullscreenDialog::EHbFotaDownload"));
+        m_dialog->setTimeout(HbPopup::NoTimeout);
+        m_InstallNote->setVisible(false);
+        m_RestartNote->setVisible(false);
+        m_RestartIcon->setVisible(false);
+        m_EmergencyNote->setVisible(false);
+        m_EmergencyIcon->setVisible(false);
         }
     else if (aType == EHbFotaUpdate)
         {
-        FLOG(_L("FotaFullscreenDialog::EHbFotaUpdate"));
-        idialog->setTimeout(HbPopup::ContextMenuTimeout);
+        FLOG(_L("HbFotaFullscreenDialog::EHbFotaUpdate"));
+        m_dialog->setTimeout(HbPopup::ContextMenuTimeout);
         HbIcon iconCharger;
-        //iconCharger.setIconName(:/icons/qgn_prop_sml_http.svg);
-        //iChargerIcon->setIcon(iconCharger);
+        iconCharger.setIconName(":/icons/qtg_small_charger.svg");
+        m_ChargerIcon->setIcon(iconCharger);
         HbIcon iconRestart;
-        //iconRestart.setIconName(:/icons/qgn_prop_sml_http.svg);
-        //iRestartIcon->setIcon(iconRestart);
-        iInstallNote->setPlainText(hbTrId(
+        iconRestart.setIconName(":/icons/qtg_small_reboot.svg");
+        m_RestartIcon->setIcon(iconRestart);
+        m_InstallNote->setPlainText(hbTrId(
                 "txt_device_update_info_installation_will_proceed_n"));
-        iChargerNote->setPlainText(hbTrId(
+        m_ChargerNote->setPlainText(hbTrId(
                 "txt_device_update_info_FS_its_recommended_to_connec"));
-        iRestartNote->setPlainText(hbTrId(
+        m_RestartNote->setPlainText(hbTrId(
                 "txt_device_update_info_FS_after_the_installation_the"));
-        iInstallNote->setVisible(true);
-        iRestartNote->setVisible(true);
-        iRestartIcon->setVisible(true);
-        iEmergencyNote->setVisible(true);
-        iEmergencyIcon->setVisible(true);
-        iDownloadState->setPlainText(hbTrId(
+        m_InstallNote->setVisible(true);
+        m_RestartNote->setVisible(true);
+        m_RestartIcon->setVisible(true);
+        m_EmergencyNote->setVisible(true);
+        m_EmergencyIcon->setVisible(true);
+        m_DownloadState->setPlainText(hbTrId(
                 "txt_device_update_info_download_complete"));
-        iDownloadState->setVisible(true);
-        iPrimaryAction->setEnabled(ETrue);
+        m_DownloadState->setVisible(true);
+        m_PrimaryAction->setEnabled(ETrue);
         }
     else if (aType == EHbFotaLowBattery)
         {
-        FLOG(_L("FotaFullscreenDialog::EHbFotaLowBattery"));
-        idialog->setTimeout(HbPopup::NoTimeout);
+        FLOG(_L("HbFotaFullscreenDialog::EHbFotaLowBattery"));
+        m_dialog->setTimeout(HbPopup::NoTimeout);
         HbIcon iconCharger;
-        //iconCharger.setIconName(:/icons/qgn_prop_sml_http.svg);
-        //iChargerIcon->setIcon(iconCharger);
+        iconCharger.setIconName(":/icons/qtg_small_reboot.svg");
+        m_ChargerIcon->setIcon(iconCharger);
         HbIcon iconRestart;
-        //iconRestart.setIconName(:/icons/qgn_prop_sml_http.svg);
-        //iRestartIcon->setIcon(iconRestart);
-        iInstallNote->setPlainText(hbTrId(
+        iconRestart.setIconName(":/icons/qtg_small_phone_disabled.svg");
+        m_RestartIcon->setIcon(iconRestart);
+        m_InstallNote->setPlainText(hbTrId(
                 "txt_device_update_info_to_proceed_with_installatio"));
-        iChargerNote->setPlainText(hbTrId(
+        m_ChargerNote->setPlainText(hbTrId(
                 "txt_device_update_info_FS_after_the_installation_the"));
-        iRestartNote->setPlainText(hbTrId(
+        m_RestartNote->setPlainText(hbTrId(
                 "txt_device_update_info_FS_during_the_installation_the"));
-        //iEmergencyNote->setPlainText(hbTrId("txt_device_update_info_FS_during_the_installation_the"));
-        iInstallNote->setVisible(true);
-        iRestartNote->setVisible(true);
-        iRestartIcon->setVisible(true);
-        iEmergencyNote->setVisible(false);
-        iEmergencyIcon->setVisible(false);
-        iDownloadState->setPlainText(hbTrId(
+        m_InstallNote->setVisible(true);
+        m_RestartNote->setVisible(true);
+        m_RestartIcon->setVisible(true);
+        m_EmergencyNote->setVisible(false);
+        m_EmergencyIcon->setVisible(false);
+        m_DownloadState->setPlainText(hbTrId(
                 "txt_device_update_info_download_complete"));
-        iDownloadState->setVisible(true);
-        iPrimaryAction->setText(hbTrId("txt_device_update_button_continue"));
-        iSecondaryAction->setText(hbTrId(
+        m_DownloadState->setVisible(true);
+        m_PrimaryAction->setText(hbTrId("txt_device_update_button_continue"));
+        m_SecondaryAction->setText(hbTrId(
                 "txt_device_update_button_install_later"));
-        iPrimaryAction->setEnabled(EFalse);
+        m_PrimaryAction->setEnabled(EFalse);
         }
-    RefreshDialog();
-    FLOG(_L("FotaFullscreenDialog::SetWarningDetails >>"));
+    refreshDialog();
+    FLOG(_L("HbFotaFullscreenDialog::SetWarningDetails >>"));
     }
 
 // ---------------------------------------------------------------------------
-// CFotaDownloadNotifHandler::updateprogressbar
+// HbFotaFullscreenDialog::updateprogressbar
 // This function is called to update the progress bar with the download progress details/.
 // ---------------------------------------------------------------------------
 //
 
-void FotaFullscreenDialog::UpdateProgressBar(TInt aProgress)
+void HbFotaFullscreenDialog::updateProgressBar(TInt aProgress)
     {
-    FLOG(_L("FotaFullscreenDialog::UpdateProgressBar <<"));
-    iprogressBar->setProgressValue(aProgress);
-    FLOG(_L("FotaFullscreenDialog::UpdateProgressBar >>"));
+    FLOG(_L("HbFotaFullscreenDialog::UpdateProgressBar <<"));
+    m_progressBar->setProgressValue(aProgress);
+    FLOG(_L("HbFotaFullscreenDialog::UpdateProgressBar >>"));
     }
 
 // ---------------------------------------------------------------------------
-// CFotaDownloadNotifHandler::DisableRSK
+// HbFotaFullscreenDialog::disableRSK
 // This function is called disable the RSK of the dialog when the postpone limeit expires
 // ---------------------------------------------------------------------------
 //
 
-void FotaFullscreenDialog::DisableRSK(TBool aVal)
+void HbFotaFullscreenDialog::disableRSK(TBool aVal)
     {
-    FLOG(_L("FotaFullscreenDialog::DisableRSK <<"));
-    iSecondaryAction->setEnabled(!aVal);
-    FLOG(_L("FotaFullscreenDialog::DisableRSK >>"));
-    }
-
-bool FotaFullscreenDialog::IsLSKEnabled()
-    {
-    FLOG(_L("FotaFullscreenDialog::IsLSKEnabled <<"));
-    return (iPrimaryAction->isEnabled());
+    FLOG(_L("HbFotaFullscreenDialog::DisableRSK <<"));
+    m_SecondaryAction->setEnabled(!aVal);
+    FLOG(_L("HbFotaFullscreenDialog::DisableRSK >>"));
     }
 
 // ---------------------------------------------------------------------------
-// CFotaDownloadNotifHandler::cancelSelected
+// HbFotaFullscreenDialog::isLSKEnabled
+// This function is called to check if left softkey of the fullscreen dialog is disabled or not.
+// ---------------------------------------------------------------------------
+//
+
+bool HbFotaFullscreenDialog::isLSKEnabled()
+    {
+    FLOG(_L("HbFotaFullscreenDialog::IsLSKEnabled <<"));
+    return (m_PrimaryAction->isEnabled());
+    }
+
+// ---------------------------------------------------------------------------
+// HbFotaFullscreenDialog::cancelSelected
 // This slot is called when user presses the left softkey of fullscreen dialog.
 // ---------------------------------------------------------------------------
 //
 
-void FotaFullscreenDialog::LSKSelected()
+void HbFotaFullscreenDialog::lSKSelected()
     {
     FLOG(_L("FotaFullscreenDialog::LSKSelected <<"));
-    iClicked = ETrue;
-    idialog->hide();
-    iServer->HandleFullScreenDialogResponse(EHbLSK);
-    FLOG(_L("FotaFullscreenDialog::LSKSelected >>"));
+    m_Clicked = ETrue;
+    m_dialog->hide();
+    m_Server->HandleFullScreenDialogResponse(EHbLSK);
+    FLOG(_L("HbFotaFullscreenDialog::LSKSelected >>"));
     }
 	
 	
 	// ---------------------------------------------------------------------------
-// CFotaDownloadNotifHandler::cancelSelected
+// HbFotaFullscreenDialog::cancelSelected
 // This slot is called when user presses the right softkey of fullscreen dialog.
 // ---------------------------------------------------------------------------
 //
 
-void FotaFullscreenDialog::RSKSelected()
+void HbFotaFullscreenDialog::rSKSelected()
     {
-    FLOG(_L("FotaFullscreenDialog::RSKSelected >>"));
-    iClicked = ETrue;
-    idialog->hide();
-    iServer->HandleFullScreenDialogResponse(EHbRSK);
-    FLOG(_L("FotaFullscreenDialog::RSKSelected <<"));
+    FLOG(_L("HbFotaFullscreenDialog::RSKSelected >>"));
+    m_Clicked = ETrue;
+    m_dialog->hide();
+    m_Server->HandleFullScreenDialogResponse(EHbRSK);
+    FLOG(_L("HbFotaFullscreenDialog::RSKSelected <<"));
     }
 
 // ---------------------------------------------------------------------------
-// CFotaDownloadNotifHandler::~FotaFullscreenDialog
+// HbFotaFullscreenDialog::~HbFotaFullscreenDialog
 // Destructor which destroys all the widgets
 // ---------------------------------------------------------------------------
 //
 
-FotaFullscreenDialog::~FotaFullscreenDialog()
+HbFotaFullscreenDialog::~HbFotaFullscreenDialog()
     {
-    FLOG(_L("~ FotaFullscreenDialog <<"));
+    FLOG(_L("~ HbFotaFullscreenDialog <<"));
 
-    QObject::disconnect(iPrimaryAction, SIGNAL(clicked()), this,
+    QObject::disconnect(m_PrimaryAction, SIGNAL(clicked()), this,
             SLOT(LSKSelected()));
-    QObject::disconnect(iSecondaryAction, SIGNAL(clicked()), this,
+    QObject::disconnect(m_SecondaryAction, SIGNAL(clicked()), this,
             SLOT(RSKSelected()));
-    QObject::disconnect(idialog, SIGNAL(aboutToClose()), this,
+    QObject::disconnect(m_dialog, SIGNAL(aboutToClose()), this,
             SLOT(aboutToClose()));
 
-    if (iprogressBar)
-        iprogressBar->deleteLater();
+    if (m_progressBar)
+        m_progressBar->deleteLater();
 
-    if (iPrimaryAction)
-        delete iPrimaryAction;
+    if (m_PrimaryAction)
+        delete m_PrimaryAction;
 
-    if (iSecondaryAction)
-        delete iSecondaryAction;
+    if (m_SecondaryAction)
+        delete m_SecondaryAction;
 
-    if (iTitle)
-        delete iTitle;
+    if (m_Title)
+        delete m_Title;
 
-    if (iSwDetails)
-        delete iSwDetails;
+    if (m_SwDetails)
+        delete m_SwDetails;
 
-    if (iInstallNote)
-        delete iInstallNote;
+    if (m_InstallNote)
+        delete m_InstallNote;
 
-    if (iRestartNote)
-        delete iRestartNote;
+    if (m_RestartNote)
+        delete m_RestartNote;
 
-    if (iRestartIcon)
-        delete iRestartIcon;
+    if (m_RestartIcon)
+        delete m_RestartIcon;
 
-    if (iEmergencyNote)
-        delete iEmergencyNote;
+    if (m_EmergencyNote)
+        delete m_EmergencyNote;
 
-    if (iEmergencyIcon)
-        delete iEmergencyIcon;
+    if (m_EmergencyIcon)
+        delete m_EmergencyIcon;
 
-    if (iDownloadState)
-        delete iDownloadState;
+    if (m_DownloadState)
+        delete m_DownloadState;
 
-    if (idialog)
-        delete idialog;
+    if (m_dialog)
+        delete m_dialog;
 
-    FLOG(_L("~ FotaFullscreenDialog >>"));
+    FLOG(_L("~ HbFotaFullscreenDialog >>"));
     }
 
 // ---------------------------------------------------------------------------
-// CFotaDownloadNotifHandler::showUpdateDialog
+// HbFotaFullscreenDialog::showUpdateDialog
 // This function is called when download is complete and update dialog has to be shown.
 // ---------------------------------------------------------------------------
 //
 
-void FotaFullscreenDialog::ShowUpdateDialog()
+void HbFotaFullscreenDialog::showUpdateDialog()
     {
-    FLOG(_L("FotaFullscreenDialog::ShowUpdateDialog <<"));
-    iPrimaryAction->setText(hbTrId("txt_common_button_continue_dialog"));
-    iSecondaryAction->setText(
+    FLOG(_L("HbFotaFullscreenDialog::ShowUpdateDialog <<"));
+    m_PrimaryAction->setText(hbTrId("txt_common_button_continue_dialog"));
+    m_SecondaryAction->setText(
             hbTrId("txt_device_update_button_install_later"));
-    SetWarningDetails(EHbFotaUpdate);
-    FLOG(_L("FotaFullscreenDialog::ShowUpdateDialog >>"));
+    setWarningDetails(EHbFotaUpdate);
+    FLOG(_L("HbFotaFullscreenDialog::ShowUpdateDialog >>"));
     }
 
 
-void FotaFullscreenDialog::SetVisible(TBool aVisible)
+// ---------------------------------------------------------------------------
+// HbFotaFullscreenDialog::setVisible
+// This function is called to make the fullscreen dialog visible.
+// ---------------------------------------------------------------------------
+//
+
+void HbFotaFullscreenDialog::setVisible(TBool aVisible)
 {
     FLOG(_L("RefreshDialog::SetVisible >>"));
-    RefreshDialog();
+    refreshDialog();
     FLOG(_L("RefreshDialog::SetVisible <<"));
 }
 // ---------------------------------------------------------------------------
-// CFotaDownloadNotifHandler::aboutToClose
+// HbFotaFullscreenDialog::aboutToClose
 // This slot is called when full screen dialogs is cloased during a timeout.
 // ---------------------------------------------------------------------------
 //
 
-void FotaFullscreenDialog::aboutToClose()
+void HbFotaFullscreenDialog::aboutToClose()
     {
-    FLOG(_L("FotaFullscreenDialog::aboutToClose <<"));
-    if (!iClicked)
+    FLOG(_L("HbFotaFullscreenDialog::aboutToClose <<"));
+    if (!m_Clicked)
         {
         FLOG(_L("Calling fotaserver as timedout..."));
-        iServer->HandleFullScreenDialogResponse(EHbLSK);
+        m_Server->HandleFullScreenDialogResponse(EHbLSK);
         }
-    iClicked = EFalse;
-    FLOG(_L("FotaFullscreenDialog::aboutToClose >>"));
+    m_Clicked = EFalse;
+    FLOG(_L("HbFotaFullscreenDialog::aboutToClose >>"));
     }