--- a/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserverdatamanager.cpp	Tue Feb 02 00:23:10 2010 +0200
+++ b/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserverdatamanager.cpp	Tue Mar 23 23:17:02 2010 +0200
@@ -16,9 +16,9 @@
 */
 
 
-#include <liwcommon.h>
-#include <s32mem.h>
-#include <escapeutils.h>
+#include <LiwCommon.h>
+#include <S32MEM.h>
+#include <EscapeUtils.h>
 
 #include "cpserverdatamanager.h"
 #include "ccontentmap.h"
@@ -132,19 +132,7 @@
     }
 
 // ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CCPDataManager::AddNonPersistentDataL( const CCPLiwMap* aMap )
-    {
-    CLiwDefaultList* notificationList = CLiwDefaultList::NewLC( );
-    BuildChangeInfoForAddL( aMap, notificationList );
-    HandleChangeL( notificationList );
-    CleanupStack::PopAndDestroy( notificationList );
-    }
-
-// ---------------------------------------------------------------------------
-//
+// 
 // ---------------------------------------------------------------------------
 //
 void CCPDataManager::GetListL( const CCPLiwMap& aMap,
@@ -510,35 +498,10 @@
 	}
 
 // -----------------------------------------------------------------------------
-//
+// 
 // -----------------------------------------------------------------------------
-//
-void CCPDataManager::BuildChangeInfoForAddL( const CCPLiwMap* aMap,
-        CLiwDefaultList* aChangeInfoList )
-    {
-    CLiwDefaultMap* changeInfoMap = CLiwDefaultMap::NewLC();
-
-    CopyVariantL(KId, aMap, changeInfoMap );
-    CopyVariantL(KPublisherId, aMap, changeInfoMap );
-    CopyVariantL(KContentType, aMap, changeInfoMap );
-    CopyVariantL(KContentId, aMap, changeInfoMap );
-    CopyVariantL(KFlag, aMap, changeInfoMap );
-    CopyVariantL(KType, aMap, changeInfoMap );
-    CopyVariantL(KActionTrigger, aMap, changeInfoMap );
-    CopyVariantL(KDataMap, aMap, changeInfoMap );
-    CopyActionTrigger16L( aMap, changeInfoMap );
-
-    changeInfoMap->InsertL( KOperation, TLiwVariant( KOperationAdd ) );
-
-    aChangeInfoList->AppendL( TLiwVariant( changeInfoMap ) );
-    CleanupStack::PopAndDestroy( changeInfoMap );
-    }
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-void CCPDataManager::CopyVariantL(const TDesC8& aKey,
+//   
+void CCPDataManager::CopyVariantL(const TDesC8& aKey, 
 		const CLiwMap* aInMap, CLiwDefaultMap* aOutMap )
 	{
 	TLiwVariant variant;