--- a/messagingfw/msgsrvnstore/server/src/msvindexadapter.cpp Tue Aug 31 15:41:11 2010 +0300
+++ b/messagingfw/msgsrvnstore/server/src/msvindexadapter.cpp Wed Sep 01 12:27:27 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -109,7 +109,7 @@
delete folderNode;
}
- iFreePoolInstance->ReleaseEntryL(iRootEntry);
+ iFreePoolInstance->ReleaseEntry(iRootEntry);
iRootEntry = NULL;
// 3. Delete internal data structure.
@@ -432,7 +432,7 @@
iServer.Log(_L("Cache initialized succesfully."));
#endif
- TMsvId tmpNextId = 0;
+ TMsvId tmpNextId = NULL;
iDbAdapter->GetMaxTMsvIdL(tmpNextId);
iNextCreateId = (tmpNextId >= KFirstFreeEntryId)? (tmpNextId+1) : KFirstFreeEntryId;
@@ -976,7 +976,7 @@
TMsvId parentId = entry->Entry().Parent();
if(releaseEntry)
{
- iFreePoolInstance->ReleaseEntryL(entry, ETrue);
+ iFreePoolInstance->ReleaseEntry(entry, ETrue);
}
CMsvEntrySelection* children = new(ELeave)CMsvEntrySelection;
CleanupStack::PushL(children);
@@ -1051,7 +1051,7 @@
// Release the entry, since it is not added to cache.
if(releaseEntry)
{
- iFreePoolInstance->ReleaseEntryL(entry, ETrue);
+ iFreePoolInstance->ReleaseEntry(entry, ETrue);
}
User::LeaveIfError(err);
CleanupStack::PopAndDestroy(); //children
@@ -1423,9 +1423,9 @@
newVisibleFolderNode->DeleteEntryL(oldEntry->GetId());
User::Leave(err);
}
-
- UpdateDates(*oldEntry, EFalse);
- if(aForcedUpdate || changedPrivateInfo && aOwnerId != KMsvServerId )
+ UpdateDates(*oldEntry, EFalse);
+
+ if(aForcedUpdate || changedPrivateInfo && aOwnerId != KMsvServerId )
{
oldEntry->SetEntryOwnerId(aOwnerId);
}
@@ -1487,7 +1487,7 @@
newParentEntry,
descendentList,
resetOldParentOwnerFlag);
- iNonCommittedChangedEntryList.AppendL(entryDetails);
+ iNonCommittedChangedEntryList.Append(entryDetails);
if(descendentList)
CleanupStack::Pop(descendentList);
}
@@ -1672,7 +1672,7 @@
if(aIsDanglingEntry)
{
// Release CMsvCacheEntry to freepool.
- iFreePoolInstance->ReleaseEntryL(serverEntry, ETrue);
+ iFreePoolInstance->ReleaseEntry(serverEntry, ETrue);
}
return KErrNone;
}
@@ -3670,7 +3670,7 @@
// we need to release the entry explicitly.
if(releaseEntry)
{
- iFreePoolInstance->ReleaseEntryL(entry, ETrue);
+ iFreePoolInstance->ReleaseEntry(entry, ETrue);
User::LeaveIfError(err);
}
else
@@ -3703,7 +3703,7 @@
);
if(releaseEntry)
{
- iFreePoolInstance->ReleaseEntryL(entry, ETrue);
+ iFreePoolInstance->ReleaseEntry(entry, ETrue);
}
User::LeaveIfError(err);
CleanupStack::PopAndDestroy(); //children
@@ -3757,7 +3757,7 @@
TMsvId parentId = entry->Entry().Parent();
if(releaseEntry)
{
- iFreePoolInstance->ReleaseEntryL(entry, ETrue);
+ iFreePoolInstance->ReleaseEntry(entry, ETrue);
}
// Find the parent in the cache - we may need to update its owner status flag both in cache and DB.
@@ -3768,7 +3768,7 @@
updateTheParent = EFalse;
if(releaseEntry)
{
- iFreePoolInstance->ReleaseEntryL(entry, ETrue);
+ iFreePoolInstance->ReleaseEntry(entry, ETrue);
}
}
else