diff -r 43e204e6ae2e -r e7b10d6d7ba3 engine/src/FeedEngine.cpp --- a/engine/src/FeedEngine.cpp Fri Mar 12 00:20:10 2010 +0000 +++ b/engine/src/FeedEngine.cpp Fri Mar 12 09:34:08 2010 +0000 @@ -208,7 +208,7 @@ } iActiveFeed->SetLastError(KErrNone); - DBUpdateFeed(*iActiveFeed); + DBUpdateFeedL(*iActiveFeed); iUpdatingFeedFileName.Copy (iPodcastModel.SettingsEngine().PrivatePath ()); _LIT(KFileNameFormat, "%lu.xml"); @@ -427,7 +427,7 @@ return EFalse; } -TBool CFeedEngine::DBUpdateFeed(const CFeedInfo &aItem) +TBool CFeedEngine::DBUpdateFeedL(const CFeedInfo &aItem) { DP2("CFeedEngine::DBUpdateFeed, title=%S, URL=%S", &aItem.Title(), &aItem.Url()); @@ -517,7 +517,7 @@ time.HomeTime(); iActiveFeed->SetLastUpdated(time); iActiveFeed->SetLastError(aError); - NotifyFeedUpdateComplete(aError); + NotifyFeedUpdateCompleteL(aError); } break; case EUpdatingFeed: @@ -587,7 +587,7 @@ }break; } - NotifyFeedUpdateComplete(aError); + NotifyFeedUpdateCompleteL(aError); // we will wait until the image has been downloaded to start the next feed update. if (iClientState == EIdle) @@ -600,7 +600,7 @@ // change client state to not updating iClientState = EIdle; - NotifyFeedUpdateComplete(aError); + NotifyFeedUpdateCompleteL(aError); UpdateNextFeedL(); }break; case ESearching: @@ -620,7 +620,7 @@ } else { - NotifyOpmlParsingComplete(aError, 0); + NotifyOpmlParsingCompleteL(aError, 0); } BaflUtils::DeleteFile(iPodcastModel.FsSession(), iSearchResultsFileName); @@ -629,10 +629,10 @@ DP("CFeedEngine::CompleteL END"); } -void CFeedEngine::NotifyFeedUpdateComplete(TInt aError) +void CFeedEngine::NotifyFeedUpdateCompleteL(TInt aError) { DP("CFeedEngine::NotifyFeedUpdateComplete"); - DBUpdateFeed(*iActiveFeed); + DBUpdateFeedL(*iActiveFeed); for (TInt i=0;iFeedDownloadFinishedL(iAutoUpdatedInitiator?MFeedEngineObserver::EFeedAutoUpdate:MFeedEngineObserver::EFeedManualUpdate, iActiveFeed->Uid(), aError)); @@ -1013,9 +1013,9 @@ return feedInfo; } -EXPORT_C void CFeedEngine::UpdateFeed(CFeedInfo *aItem) +EXPORT_C void CFeedEngine::UpdateFeedL(CFeedInfo *aItem) { - DBUpdateFeed(*aItem); + DBUpdateFeedL(*aItem); } EXPORT_C void CFeedEngine::SearchForFeedL(TDesC& aSearchString) @@ -1071,12 +1071,12 @@ } -EXPORT_C void CFeedEngine::OpmlParsingComplete(TInt aError, TUint aNumFeedsAdded) +EXPORT_C void CFeedEngine::OpmlParsingCompleteL(TInt aError, TUint aNumFeedsAdded) { - NotifyOpmlParsingComplete(aError, aNumFeedsAdded); + NotifyOpmlParsingCompleteL(aError, aNumFeedsAdded); } -void CFeedEngine::NotifyOpmlParsingComplete(TInt aError, TUint aNumFeedsAdded) +void CFeedEngine::NotifyOpmlParsingCompleteL(TInt aError, TUint aNumFeedsAdded) { for (TInt i=0;i