Merge.
--- a/uiservicetab/vimpstengine/inc/cvimpstenginesessioncntxtobserver.h Sun Mar 14 13:08:42 2010 +0000
+++ b/uiservicetab/vimpstengine/inc/cvimpstenginesessioncntxtobserver.h Mon Mar 29 12:25:49 2010 +0100
@@ -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);
/**
--- a/uiservicetab/vimpststorage/inc/cvimpststoragemanager.h Sun Mar 14 13:08:42 2010 +0000
+++ b/uiservicetab/vimpststorage/inc/cvimpststoragemanager.h Mon Mar 29 12:25:49 2010 +0100
@@ -91,7 +91,7 @@
static CVIMPSTStorageManager* NewL();
// ConstructL
- void CVIMPSTStorageManager::ConstructL();
+ void ConstructL();
private:
--- a/uiservicetabsettings/src/rvimpstsettingsreleasearray.cpp Sun Mar 14 13:08:42 2010 +0000
+++ b/uiservicetabsettings/src/rvimpstsettingsreleasearray.cpp Mon Mar 29 12:25:49 2010 +0100
@@ -32,6 +32,6 @@
void RVIMPSTSettingsReleaseArray::Close()
{
ResetAndDestroy();
- RPointerArray::Close();
+ RPointerArray< HBufC >::Close();
}