--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.cpp	Wed Jun 23 18:12:20 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.cpp	Tue Jul 06 14:15:47 2010 +0300
@@ -24,15 +24,15 @@
   CpNetworkPlugin::CpNetworkPlugin
  */
 CpNetworkPlugin::CpNetworkPlugin() : 
-    QObject(0),
-    m_localisation(0)
+    QObject(NULL),
+    m_localisation(NULL),
+    m_networkStatus(NULL)
 {
     INSTALL_TRACE_MSG_HANDLER;
     DPRINT << ": IN";
     
-    // Set scoped pointer 
+    // Create guarded objects
     m_localisation.reset(new CpPhoneLocalisation); 
-    
     m_networkStatus.reset(new CpNetworkStatus); 
     
     // Install required translations
@@ -61,9 +61,7 @@
         CpItemDataHelper &itemDataHelper) const
 {   
     DPRINT << ": IN";
-    
     QList<CpSettingFormItemData*> ret;
-    
     ret.append(new CpSettingFormEntryItemDataImpl<CpNetworkPluginView>(
             itemDataHelper,
             hbTrId("txt_cp_dblist_mobile_network"),