--- a/emailuis/nmsettingui/src/nmsettingsviewfactory.cpp	Fri Sep 17 08:27:21 2010 +0300
+++ b/emailuis/nmsettingui/src/nmsettingsviewfactory.cpp	Mon Oct 04 00:05:37 2010 +0300
@@ -57,7 +57,9 @@
     const HbIcon &icon,
     const HbDataFormModelItem *parent)
  : CpSettingFormEntryItemData(itemDataHelper, text, description, icon, parent),
-   mSettingsManager(new NmMailboxSettingsManager()), mSettingsViewLauncher(0),mPrevView(0)
+   mSettingsManager(new NmMailboxSettingsManager()),
+   mSettingsViewLauncher(NULL),
+   mPrevView(NULL)
 {
     NM_FUNCTION;
 }
@@ -82,8 +84,9 @@
     const HbIcon &icon,
     const HbDataFormModelItem *parent)
  : CpSettingFormEntryItemData(itemDataHelper, text, description, icon, parent),
-     mSettingsManager(new NmMailboxSettingsManager()), mSettingsViewLauncher(viewLauncher),
-     mPrevView(0)
+     mSettingsManager(new NmMailboxSettingsManager()),
+     mSettingsViewLauncher(viewLauncher),
+     mPrevView(NULL)
 {
     NM_FUNCTION;
 }
@@ -111,7 +114,7 @@
 {
     NM_FUNCTION;
 
-    CpBaseSettingView *view = 0;
+    CpBaseSettingView *view = NULL;
     QList<NmMailbox *> mailboxList;
     mSettingsManager->listMailboxes(mailboxList);
     const int mailboxCount(mailboxList.count());
@@ -254,7 +257,7 @@
             mainWindow->removeView(currentView);
             currentView->deleteLater();
         }
-        mPrevView = 0;
+        mPrevView = NULL;
     }
 }