# HG changeset patch
# User ssb
# Date 1277399499 -19800
# Node ID 7b4e99af46e4014f3302425952ec7827d0422938
# Parent  6b620215f837e5726b428f06846f063c987300ac# Parent  dd5904dc0ea9d0afcfb5b65316dc21b77e546a46
merging heads

diff -r 6b620215f837 -r 7b4e99af46e4 uiservicetab/vimpstengine/inc/cvimpstenginesessioncntxtobserver.h
--- a/uiservicetab/vimpstengine/inc/cvimpstenginesessioncntxtobserver.h	Wed Jun 09 09:27:17 2010 +0300
+++ b/uiservicetab/vimpstengine/inc/cvimpstenginesessioncntxtobserver.h	Thu Jun 24 22:41:39 2010 +0530
@@ -68,7 +68,7 @@
 		 * @return CVIMPSTEngineSessionCntxtObserver new instance of this class
 	 	 */
 		static CVIMPSTEngineSessionCntxtObserver* 
-							CVIMPSTEngineSessionCntxtObserver::NewL(TUint32 aServiceId);
+							NewL(TUint32 aServiceId);
         /**
 	     * Two-phased constructor.
 	     * @param aSettingsId: settings id.
@@ -76,7 +76,7 @@
 		 * @return CVIMPSTEngineSessionCntxtObserver new instance of this class
 	 	 */							
 	    static CVIMPSTEngineSessionCntxtObserver* 
-	    					CVIMPSTEngineSessionCntxtObserver::NewLC(TUint32 aServiceId);
+	    					NewLC(TUint32 aServiceId);
 	    
 	    
 	   /**
diff -r 6b620215f837 -r 7b4e99af46e4 uiservicetab/vimpststorage/inc/cvimpststoragemanager.h
--- a/uiservicetab/vimpststorage/inc/cvimpststoragemanager.h	Wed Jun 09 09:27:17 2010 +0300
+++ b/uiservicetab/vimpststorage/inc/cvimpststoragemanager.h	Thu Jun 24 22:41:39 2010 +0530
@@ -91,7 +91,7 @@
         static CVIMPSTStorageManager* NewL();
         
         // ConstructL
-        void CVIMPSTStorageManager::ConstructL();
+        void ConstructL();
   
        
     private:
diff -r 6b620215f837 -r 7b4e99af46e4 uiservicetabsettings/src/rvimpstsettingsreleasearray.cpp
--- a/uiservicetabsettings/src/rvimpstsettingsreleasearray.cpp	Wed Jun 09 09:27:17 2010 +0300
+++ b/uiservicetabsettings/src/rvimpstsettingsreleasearray.cpp	Thu Jun 24 22:41:39 2010 +0530
@@ -32,6 +32,6 @@
 void RVIMPSTSettingsReleaseArray::Close()
 	{
 	ResetAndDestroy();
-	RPointerArray::Close();
+	RPointerArray<HBufC>::Close();
 	}