--- a/application/inc/PodcastAppui.h Mon Mar 01 22:57:56 2010 +0000
+++ b/application/inc/PodcastAppui.h Sat Mar 06 10:22:09 2010 +0000
@@ -58,7 +58,7 @@
class MTimeoutObserver
{
public:
- virtual void HandleTimeout(const CTimeout& aId, TInt aError)=0;
+ virtual void HandleTimeoutL(const CTimeout& aId, TInt aError)=0;
protected:
virtual ~MTimeoutObserver() {}
};
@@ -99,7 +99,7 @@
void RunL()
{
TInt r=iStatus.Int();
- iObserver.HandleTimeout(*this, r);
+ iObserver.HandleTimeoutL(*this, r);
}
protected:
@@ -115,9 +115,9 @@
~CPodcastAppUi();
void SetActiveTab(TInt aIndex);
- void UpdateQueueTab(TInt aQueueLength);
- void TabLeft();
- void TabRight();
+ void UpdateQueueTabL(TInt aQueueLength);
+ void TabLeftL();
+ void TabRightL();
void NaviSetTextL(TInt aResourceId);
void NaviShowTabGroupL();
@@ -128,7 +128,7 @@
CArrayFix<TCoeHelpContext>* HelpContextL() const;
void HandleCommandL(TInt aCommand);
protected:
- void HandleTimeout(const CTimeout& aId, TInt aError);
+ void HandleTimeoutL(const CTimeout& aId, TInt aError);
protected:
// from MConnectionObserver
--- a/application/inc/PodcastFeedView.h Mon Mar 01 22:57:56 2010 +0000
+++ b/application/inc/PodcastFeedView.h Sat Mar 06 10:22:09 2010 +0000
@@ -39,7 +39,7 @@
static CPodcastFeedView* NewLC(CPodcastModel& aPodcastModel);
~CPodcastFeedView();
void UpdateItemL(TInt aIndex);
- void CheckResumeDownload();
+ void CheckResumeDownloadL();
void UpdateToolbar(TBool aVisible=ETrue);
protected:
--- a/application/inc/PodcastListView.h Mon Mar 01 22:57:56 2010 +0000
+++ b/application/inc/PodcastListView.h Sat Mar 06 10:22:09 2010 +0000
@@ -63,7 +63,7 @@
void ScrollToVisible();
void Draw(const TRect& aRect) const;
- void SetLongTapDetected(TBool aLongTapDetected);
+ void SetLongTapDetectedL(TBool aLongTapDetected);
CEikFormattedCellListBox * iListbox;
@@ -133,9 +133,9 @@
void RunAboutDialogL();
void SetEmptyTextL(TInt aResourceId);
- void ShowOkMessage(TDesC &aText);
- void ShowErrorMessage(TDesC &aText);
- TInt ShowQueryMessage(TDesC &aText);
+ void ShowOkMessageL(TDesC &aText);
+ void ShowErrorMessageL(TDesC &aText);
+ TInt ShowQueryMessageL(TDesC &aText);
void CloseToolbarExtension();
void ShowWaitDialogL(TDesC &aWaitText);
void CloseWaitDialog();
--- a/application/inc/PodcastShowsView.h Mon Mar 01 22:57:56 2010 +0000
+++ b/application/inc/PodcastShowsView.h Sat Mar 06 10:22:09 2010 +0000
@@ -110,8 +110,8 @@
* image was loaded successfully.
*/
virtual void ImageOperationCompleteL(TInt aError);
- void HandleSetShowPlayed(TBool aPlayed);
- void HandleDeleteShow();
+ void HandleSetShowPlayedL(TBool aPlayed);
+ void HandleDeleteShowL();
void UpdateViewTitleL();
void CreateIconsL();
void GetShowErrorText(TDes &aErrorMessage, TInt aErrorCode);
Binary file application/sis/podcatcher_udeb.sis has changed
Binary file application/sis/podcatcher_udeb_signed.sis has changed
Binary file application/sis/podcatcher_urel.sis has changed
Binary file application/sis/podcatcher_urel_signed.sis has changed
--- a/application/src/PodcastAppui.cpp Mon Mar 01 22:57:56 2010 +0000
+++ b/application/src/PodcastAppui.cpp Sat Mar 06 10:22:09 2010 +0000
@@ -202,7 +202,7 @@
iNaviPane->PushL(*iNaviTabGroup);
iNaviStyle = ENaviTabGroup;
- UpdateQueueTab(iPodcastModel->ShowEngine().GetNumDownloadingShows());
+ UpdateQueueTabL(iPodcastModel->ShowEngine().GetNumDownloadingShows());
}
void CPodcastAppUi::TabChangedL (TInt aIndex)
@@ -236,12 +236,12 @@
}
}
-void CPodcastAppUi::HandleTimeout(const CTimeout& /*aId*/, TInt /*aError*/)
+void CPodcastAppUi::HandleTimeoutL(const CTimeout& /*aId*/, TInt /*aError*/)
{
- iFeedView->CheckResumeDownload();
+ iFeedView->CheckResumeDownloadL();
}
-void CPodcastAppUi::UpdateQueueTab(TInt aQueueLength)
+void CPodcastAppUi::UpdateQueueTabL(TInt aQueueLength)
{
if (iNaviStyle == ENaviTabGroup)
{
@@ -264,7 +264,7 @@
}
}
-void CPodcastAppUi::TabLeft()
+void CPodcastAppUi::TabLeftL()
{
if (iNaviStyle == ENaviTabGroup)
{
@@ -277,7 +277,7 @@
}
}
-void CPodcastAppUi::TabRight()
+void CPodcastAppUi::TabRightL()
{
if (iNaviStyle == ENaviTabGroup)
{
--- a/application/src/PodcastFeedView.cpp Mon Mar 01 22:57:56 2010 +0000
+++ b/application/src/PodcastFeedView.cpp Sat Mar 06 10:22:09 2010 +0000
@@ -268,7 +268,7 @@
{
TBuf<KMaxMessageLength> message;
iEikonEnv->ReadResourceL(message, R_PODCAST_CONNECTION_ERROR);
- ShowErrorMessage(message);
+ ShowErrorMessageL(message);
}
}
break;
@@ -551,7 +551,7 @@
{
TBuf<KMaxMessageLength> message;
iEikonEnv->ReadResourceL(message, R_EXIT_SHOWS_DOWNLOADING);
- if(ShowQueryMessage(message))
+ if(ShowQueryMessageL(message))
{
// pass it on to AppUi, which will exit for us
CPodcastListView::HandleCommandL(aCommand);
@@ -569,7 +569,7 @@
break;
}
- iListContainer->SetLongTapDetected(EFalse); // in case we got here by long tapping
+ iListContainer->SetLongTapDetectedL(EFalse); // in case we got here by long tapping
UpdateToolbar();
}
@@ -630,7 +630,7 @@
// ask if users wants to update it now
TBuf<KMaxMessageLength> message;
iEikonEnv->ReadResourceL(message, R_ADD_FEED_SUCCESS);
- if(ShowQueryMessage(message))
+ if(ShowQueryMessageL(message))
{
CFeedInfo *info = iPodcastModel.FeedEngine().GetFeedInfoByUid(newFeedInfo->Uid());
@@ -644,7 +644,7 @@
{
TBuf<KMaxMessageLength> message;
iEikonEnv->ReadResourceL(message, R_ADD_FEED_EXISTS);
- ShowErrorMessage(message);
+ ShowErrorMessageL(message);
}
CleanupStack::PopAndDestroy(newFeedInfo);
@@ -675,7 +675,7 @@
iEikonEnv->ReadResourceL(dlgMessage, R_ADD_FEED_REPLACE);
// Ask the user if it is OK to remove all shows
- if ( ShowQueryMessage(dlgMessage))
+ if ( ShowQueryMessageL(dlgMessage))
{
PodcastUtils::FixProtocolsL(url);
@@ -702,7 +702,7 @@
// the feed existed. Object deleted in AddFeed.
TBuf<KMaxMessageLength> dlgMessage;
iEikonEnv->ReadResourceL(dlgMessage, R_ADD_FEED_EXISTS);
- ShowErrorMessage(dlgMessage);
+ ShowErrorMessageL(dlgMessage);
}
CleanupStack::PopAndDestroy(temp);
}
@@ -712,7 +712,7 @@
{
info->SetTitleL(title);
info->SetCustomTitle();
- iPodcastModel.FeedEngine().UpdateFeed(info);
+ iPodcastModel.FeedEngine().UpdateFeedL(info);
UpdateListboxItemsL();
}
}
@@ -733,7 +733,7 @@
TBuf<KMaxMessageLength> message;
iEikonEnv->ReadResourceL(templ, R_PODCAST_REMOVE_FEED_PROMPT);
message.Format(templ, &info->Title());
- if(ShowQueryMessage(message))
+ if(ShowQueryMessageL(message))
{
iPodcastModel.FeedEngine().RemoveFeedL(iItemIdArray[index]);
iItemArray->Delete(index);
@@ -797,7 +797,7 @@
if (err != KErrNone) {
TBuf<KMaxMessageLength> message;
iEikonEnv->ReadResourceL(message, R_IMPORT_FEED_FAILURE);
- ShowErrorMessage(message);
+ ShowErrorMessageL(message);
}
}
@@ -853,13 +853,13 @@
TBuf<KMaxMessageLength> templ;
iEikonEnv->ReadResourceL(templ, R_EXPORT_FEED_SUCCESS);
message.Format(templ, numFeeds);
- ShowOkMessage(message);
+ ShowOkMessageL(message);
}
else
{
TBuf<KMaxMessageLength> message;
iEikonEnv->ReadResourceL(message, R_EXPORT_FEED_FAILURE);
- ShowErrorMessage(message);
+ ShowErrorMessageL(message);
}
}
CleanupStack::PopAndDestroy(fileDlg);
@@ -869,7 +869,7 @@
CleanupStack::PopAndDestroy(memDlg);
}
-void CPodcastFeedView::CheckResumeDownload()
+void CPodcastFeedView::CheckResumeDownloadL()
{
// if there are shows queued for downloading, ask if we should resume now
RShowInfoArray showsDownloading;
@@ -880,7 +880,7 @@
TBuf<KMaxMessageLength> msg;
iEikonEnv->ReadResourceL(msg, R_PODCAST_ENABLE_DOWNLOADS_PROMPT);
- if (ShowQueryMessage(msg))
+ if (ShowQueryMessageL(msg))
{
// need to suspend downloads before ResumeDownloadL will work :)
iPodcastModel.SettingsEngine().SetDownloadSuspended(ETrue);
@@ -908,7 +908,7 @@
{
TBuf<KMaxMessageLength> message;
iEikonEnv->ReadResourceL(message, R_PODCAST_CONNECTION_ERROR);
- ShowErrorMessage(message);
+ ShowErrorMessageL(message);
}
break;
case KErrNone:
@@ -928,7 +928,7 @@
iEikonEnv->ReadResourceL(templ, R_IMPORT_FEED_SUCCESS);
message.Format(templ, aNumFeedsImported);
- if(ShowQueryMessage(message))
+ if(ShowQueryMessageL(message))
{
HandleCommandL(EPodcastUpdateAllFeeds);
}
@@ -936,11 +936,12 @@
break;
case EOpmlSearching:
delete iWaitDialog;
+ iWaitDialog = NULL;
if (iPodcastModel.FeedEngine().GetSearchResults().Count() == 0)
{
TBuf<KMaxMessageLength> message;
iEikonEnv->ReadResourceL(message, R_SEARCH_NORESULTS);
- ShowErrorMessage(message);
+ ShowErrorMessageL(message);
}
else
{
@@ -974,7 +975,7 @@
return; // we don't allow feed manipulation while update is running
}
- iListContainer->SetLongTapDetected(ETrue);
+ iListContainer->SetLongTapDetectedL(ETrue);
const TInt KListboxDefaultHeight = 19; // for some reason it returns 19 for an empty listbox in S^1
TInt lbHeight = iListContainer->Listbox()->CalcHeightBasedOnNumOfItems(
--- a/application/src/PodcastListView.cpp Mon Mar 01 22:57:56 2010 +0000
+++ b/application/src/PodcastListView.cpp Sat Mar 06 10:22:09 2010 +0000
@@ -100,7 +100,7 @@
}
}
-void CPodcastListContainer::SetLongTapDetected(TBool aLongTapDetected)
+void CPodcastListContainer::SetLongTapDetectedL(TBool aLongTapDetected)
{
iLongTapDetected = aLongTapDetected;
@@ -327,7 +327,7 @@
CleanupStack::PopAndDestroy(emptyText);
}
-void CPodcastListView::ShowOkMessage(TDesC &aText)
+void CPodcastListView::ShowOkMessageL(TDesC &aText)
{
CAknNoteDialog* dlg= new(ELeave) CAknNoteDialog();
CleanupStack::PushL(dlg);
@@ -336,7 +336,7 @@
dlg->ExecuteLD(R_MESSAGEDLG_OK);
}
-void CPodcastListView::ShowErrorMessage(TDesC &aText)
+void CPodcastListView::ShowErrorMessageL(TDesC &aText)
{
CAknNoteDialog* dlg= new(ELeave) CAknNoteDialog();
CleanupStack::PushL(dlg);
@@ -345,7 +345,7 @@
dlg->ExecuteLD(R_ERRORDLG_OK);
}
-TInt CPodcastListView::ShowQueryMessage(TDesC &aText)
+TInt CPodcastListView::ShowQueryMessageL(TDesC &aText)
{
CAknQueryDialog* dlg= new(ELeave) CAknQueryDialog();
@@ -377,7 +377,7 @@
void CPodcastListView::HandleLongTapEventL( const TPoint& aPenEventLocation, const TPoint& /* aPenEventScreenLocation */)
{
DP("CPodcastListView::HandleLongTapEventL BEGIN");
- iListContainer->SetLongTapDetected(ETrue);
+ iListContainer->SetLongTapDetectedL(ETrue);
const TInt KListboxDefaultHeight = 19; // for some reason it returns 19 for an empty listbox in S^1
TInt lbHeight = iListContainer->Listbox()->CalcHeightBasedOnNumOfItems(
iListContainer->Listbox()->Model()->NumberOfItems()) - KListboxDefaultHeight;
@@ -423,10 +423,10 @@
switch (aKeyEvent.iCode)
{
case EKeyRightArrow:
- ((CPodcastAppUi*)AppUi())->TabRight();
+ ((CPodcastAppUi*)AppUi())->TabRightL();
return EKeyWasConsumed;
case EKeyLeftArrow:
- ((CPodcastAppUi*)AppUi())->TabLeft();
+ ((CPodcastAppUi*)AppUi())->TabLeftL();
return EKeyWasConsumed;
}
}
--- a/application/src/PodcastQueueView.cpp Mon Mar 01 22:57:56 2010 +0000
+++ b/application/src/PodcastQueueView.cpp Sat Mar 06 10:22:09 2010 +0000
@@ -246,7 +246,7 @@
{
TBuf<KMaxMessageLength> message;
iEikonEnv->ReadResourceL(message, R_PODCAST_CONNECTION_ERROR);
- ShowErrorMessage(message);
+ ShowErrorMessageL(message);
}
break;
default: // Do nothing
@@ -510,9 +510,9 @@
TBuf<KMaxMessageLength> msg;
iEikonEnv->ReadResourceL(msg, R_CLEAR_QUERY);
- if(ShowQueryMessage(msg))
+ if(ShowQueryMessageL(msg))
{
- iPodcastModel.ShowEngine().RemoveAllDownloads();
+ iPodcastModel.ShowEngine().RemoveAllDownloadsL();
UpdateListboxItemsL();
}
}
--- a/application/src/PodcastSearchView.cpp Mon Mar 01 22:57:56 2010 +0000
+++ b/application/src/PodcastSearchView.cpp Sat Mar 06 10:22:09 2010 +0000
@@ -239,7 +239,7 @@
iEikonEnv->ReadResourceL(templ, R_ADD_FEED_QUERY);
message.Format(templ, &newInfo->Title());
- if(ShowQueryMessage(message)) {
+ if(ShowQueryMessageL(message)) {
TBool added = iPodcastModel.FeedEngine().AddFeedL(*newInfo);
if (added)
@@ -247,7 +247,7 @@
// ask if user wants to update it now
TBuf<KMaxMessageLength> message;
iEikonEnv->ReadResourceL(message, R_ADD_FEED_SUCCESS);
- if(ShowQueryMessage(message))
+ if(ShowQueryMessageL(message))
{
CFeedInfo *info = iPodcastModel.FeedEngine().GetFeedInfoByUid(newInfo->Uid());
@@ -261,7 +261,7 @@
{
TBuf<KMaxMessageLength> message;
iEikonEnv->ReadResourceL(message, R_ADD_FEED_EXISTS);
- ShowErrorMessage(message);
+ ShowErrorMessageL(message);
}
}
}
--- a/application/src/PodcastShowsView.cpp Mon Mar 01 22:57:56 2010 +0000
+++ b/application/src/PodcastShowsView.cpp Sat Mar 06 10:22:09 2010 +0000
@@ -255,7 +255,7 @@
{
TBuf<KMaxMessageLength> message;
iEikonEnv->ReadResourceL(message, R_PODCAST_CONNECTION_ERROR);
- ShowErrorMessage(message);
+ ShowErrorMessageL(message);
}
break;
default:
@@ -555,17 +555,17 @@
switch (aCommand)
{
case EPodcastMarkAsPlayed:
- HandleSetShowPlayed(ETrue);
+ HandleSetShowPlayedL(ETrue);
break;
case EPodcastMarkAsUnplayed:
- HandleSetShowPlayed(EFalse);
+ HandleSetShowPlayedL(EFalse);
break;
case EPodcastMarkAllPlayed:
- iPodcastModel.MarkSelectionPlayed();
+ iPodcastModel.MarkSelectionPlayedL();
UpdateListboxItemsL();
break;
case EPodcastDeleteShow:
- HandleDeleteShow();
+ HandleDeleteShowL();
break;
case EPodcastDownloadShow:
{
@@ -605,7 +605,7 @@
CPodcastListView::HandleCommandL(aCommand);
break;
}
- iListContainer->SetLongTapDetected(EFalse);
+ iListContainer->SetLongTapDetectedL(EFalse);
UpdateToolbar();
}
@@ -739,7 +739,7 @@
{
DP("CPodcastShowsView::HandleLongTapEventL BEGIN");
- iListContainer->SetLongTapDetected(ETrue);
+ iListContainer->SetLongTapDetectedL(ETrue);
const TInt KListboxDefaultHeight = 19; // for some reason it returns 19 for an empty listbox in S^1
TInt lbHeight = iListContainer->Listbox()->CalcHeightBasedOnNumOfItems(
@@ -768,7 +768,7 @@
DP("CPodcastShowsView::HandleLongTapEventL END");
}
-void CPodcastShowsView::HandleSetShowPlayed(TBool aPlayed)
+void CPodcastShowsView::HandleSetShowPlayedL(TBool aPlayed)
{
TInt index = iListContainer->Listbox()->CurrentItemIndex();
@@ -777,13 +777,13 @@
{
CShowInfo *info = iPodcastModel.ActiveShowList()[index];
info->SetPlayState(aPlayed ? EPlayed : ENeverPlayed);
- iPodcastModel.ShowEngine().UpdateShow(*info);
+ iPodcastModel.ShowEngine().UpdateShowL(*info);
UpdateShowItemDataL(iPodcastModel.ActiveShowList()[index], index, 0);
iListContainer->Listbox()->DrawItem(index);
}
}
-void CPodcastShowsView::HandleDeleteShow()
+void CPodcastShowsView::HandleDeleteShowL()
{
TInt index = iListContainer->Listbox()->CurrentItemIndex();
@@ -794,7 +794,7 @@
TBuf<KMaxMessageLength> templ;
iEikonEnv->ReadResourceL(templ, R_PODCAST_DELETE_SHOW_PROMPT);
msg.Format(templ, &(info->Title()));
- if (ShowQueryMessage(msg))
+ if (ShowQueryMessageL(msg))
{
iPodcastModel.ShowEngine().DeleteShowL(iPodcastModel.ActiveShowList()[index]->Uid());
@@ -802,7 +802,7 @@
info->SetDownloadState(ENotDownloaded);
info->SetPlayState(EPlayed);
- iPodcastModel.ShowEngine().UpdateShow(*info);
+ iPodcastModel.ShowEngine().UpdateShowL(*info);
UpdateShowItemDataL(iPodcastModel.ActiveShowList()[index], index, 0);
iListContainer->Listbox()->DrawItem(index);
@@ -812,7 +812,7 @@
void CPodcastShowsView::DownloadQueueUpdatedL(TInt aDownloadingShows, TInt aQueuedShows)
{
- ((CPodcastAppUi*)AppUi())->UpdateQueueTab(aDownloadingShows+aQueuedShows);
+ ((CPodcastAppUi*)AppUi())->UpdateQueueTabL(aDownloadingShows+aQueuedShows);
}
void CPodcastShowsView::FeedUpdateAllCompleteL(TFeedState /*aState*/)
--- a/engine/inc/ConnectionEngine.h Mon Mar 01 22:57:56 2010 +0000
+++ b/engine/inc/ConnectionEngine.h Sat Mar 06 10:22:09 2010 +0000
@@ -90,7 +90,7 @@
// UI Setting
TBool ConnectionSettingL();
- void ReportConnection(TInt aError);
+ void ReportConnectionL(TInt aError);
void ReportConnectionSelectionStart();
void ReportConnectionSelectionEnd();
--- a/engine/inc/FeedEngine.h Mon Mar 01 22:57:56 2010 +0000
+++ b/engine/inc/FeedEngine.h Sat Mar 06 10:22:09 2010 +0000
@@ -78,7 +78,7 @@
void RunFeedTimer();
- IMPORT_C void UpdateFeed(CFeedInfo *aItem);
+ IMPORT_C void UpdateFeedL(CFeedInfo *aItem);
/**
* Returns the current internal state of the feed engine4
*/
@@ -94,7 +94,7 @@
IMPORT_C void AddSearchResultL(CFeedInfo *item);
IMPORT_C const RFeedInfoArray& GetSearchResults();
- IMPORT_C void OpmlParsingComplete(TInt aError, TUint aNumFeedsAdded);
+ IMPORT_C void OpmlParsingCompleteL(TInt aError, TUint aNumFeedsAdded);
protected:
static TInt CompareFeedsByTitle(const CFeedInfo &a, const CFeedInfo &b);
@@ -117,8 +117,8 @@
void GetFeedImageL(CFeedInfo *aFeedInfo);
void UpdateNextFeedL();
- void NotifyFeedUpdateComplete(TInt aError);
- void NotifyOpmlParsingComplete(TInt aError, TUint aNumFeedsAdded);
+ void NotifyFeedUpdateCompleteL(TInt aError);
+ void NotifyOpmlParsingCompleteL(TInt aError, TUint aNumFeedsAdded);
private:
@@ -127,7 +127,7 @@
TBool DBAddFeedL(const CFeedInfo& aTtem);
CFeedInfo* DBGetFeedInfoByUidL(TUint aFeedUid);
TUint DBGetFeedCount();
- TBool DBUpdateFeed(const CFeedInfo& aItem);
+ TBool DBUpdateFeedL(const CFeedInfo& aItem);
void DBGetStatsByFeed(TUint aFeedUid, TUint &aNumShows, TUint &aNumUnplayed);
--- a/engine/inc/MetaDataReaderObserver.h Mon Mar 01 22:57:56 2010 +0000
+++ b/engine/inc/MetaDataReaderObserver.h Sat Mar 06 10:22:09 2010 +0000
@@ -21,7 +21,7 @@
class MMetaDataReaderObserver {
public:
- virtual void ReadMetaData(CShowInfo& aShowInfo) = 0;
+ virtual void ReadMetaDataL(CShowInfo& aShowInfo) = 0;
virtual void ReadMetaDataCompleteL() = 0;
};
--- a/engine/inc/PodcastModel.h Mon Mar 01 22:57:56 2010 +0000
+++ b/engine/inc/PodcastModel.h Sat Mar 06 10:22:09 2010 +0000
@@ -93,7 +93,7 @@
IMPORT_C void GetShowsDownloadedL();
IMPORT_C void GetShowsDownloadingL();
IMPORT_C void GetShowsByFeedL(TUint aFeedUid);
- IMPORT_C void MarkSelectionPlayed();
+ IMPORT_C void MarkSelectionPlayedL();
TInt FindActiveShowByUid(TUint aUid);
IMPORT_C TBool IsFirstStartup();
--- a/engine/inc/ShowEngine.h Mon Mar 01 22:57:56 2010 +0000
+++ b/engine/inc/ShowEngine.h Sat Mar 06 10:22:09 2010 +0000
@@ -38,7 +38,7 @@
public:
IMPORT_C void AddDownloadL(CShowInfo& info);
IMPORT_C TBool RemoveDownloadL(TUint aUid);
- IMPORT_C void RemoveAllDownloads();
+ IMPORT_C void RemoveAllDownloadsL();
IMPORT_C void SuspendDownloads();
IMPORT_C void ResumeDownloadsL();
@@ -57,7 +57,7 @@
IMPORT_C CShowInfo* DBGetShowByFileNameL(TFileName aFileName);
IMPORT_C TBool AddShowL(const CShowInfo& item);
- IMPORT_C void DeletePlayedShows(RShowInfoArray &aShowInfoArray);
+ IMPORT_C void DeletePlayedShowsL(RShowInfoArray &aShowInfoArray);
IMPORT_C void DeleteAllShowsByFeedL(TUint aFeedUid,TBool aDeleteFiles=ETrue);
IMPORT_C void DeleteShowL(TUint aShowUid, TBool aRemoveFile=ETrue);
IMPORT_C void DeleteOldShowsByFeed(TUint aFeedUid);
@@ -66,7 +66,7 @@
IMPORT_C void RemoveObserver(MShowEngineObserver *observer);
IMPORT_C void NotifyShowListUpdatedL();
- IMPORT_C void UpdateShow(CShowInfo& aInfo);
+ IMPORT_C void UpdateShowL(CShowInfo& aInfo);
IMPORT_C void GetMimeType(const TDesC& aFileName, TDes& aMimeType);
@@ -81,7 +81,7 @@
void DownloadInfo(CHttpClient* aClient, int aSize);
void FileError(TUint aError);
// from MetaDataReaderObserver
- void ReadMetaData(CShowInfo& aShowInfo);
+ void ReadMetaDataL(CShowInfo& aShowInfo);
void ReadMetaDataCompleteL();
private:
@@ -106,8 +106,8 @@
// DB methods
CShowInfo* DBGetShowByUidL(TUint aUid);
void DBFillShowInfoFromStmtL(sqlite3_stmt *st, CShowInfo* showInfo);
- TBool DBAddShow(const CShowInfo& aItem);
- TBool DBUpdateShow(CShowInfo& aItem);
+ TBool DBAddShowL(const CShowInfo& aItem);
+ TBool DBUpdateShowL(CShowInfo& aItem);
void DBGetShowsByFeedL(RShowInfoArray& aShowArray, TUint aFeedUid);
void DBGetAllShowsL(RShowInfoArray& aShowArray);
void DBGetNewShowsL(RShowInfoArray& aShowArray);
--- a/engine/src/ConnectionEngine.cpp Mon Mar 01 22:57:56 2010 +0000
+++ b/engine/src/ConnectionEngine.cpp Sat Mar 06 10:22:09 2010 +0000
@@ -64,7 +64,7 @@
}
iConnectionState = iStatus.Int() == KErrNone?CConnectionEngine::EConnected:CConnectionEngine::ENotConnected;
- ReportConnection( iStatus.Int() );
+ ReportConnectionL( iStatus.Int() );
}
void CConnectionEngine::DoCancel()
@@ -272,7 +272,7 @@
}
-void CConnectionEngine::ReportConnection(TInt aError)
+void CConnectionEngine::ReportConnectionL(TInt aError)
{
TInt noObservers = iObserverArray.Count();
while(noObservers)
--- a/engine/src/FeedEngine.cpp Mon Mar 01 22:57:56 2010 +0000
+++ b/engine/src/FeedEngine.cpp Sat Mar 06 10:22:09 2010 +0000
@@ -422,7 +422,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());
@@ -512,7 +512,7 @@
time.HomeTime();
iActiveFeed->SetLastUpdated(time);
iActiveFeed->SetLastError(aError);
- NotifyFeedUpdateComplete(aError);
+ NotifyFeedUpdateCompleteL(aError);
}
break;
case EUpdatingFeed:
@@ -579,7 +579,7 @@
}break;
}
- NotifyFeedUpdateComplete(aError);
+ NotifyFeedUpdateCompleteL(aError);
// we will wait until the image has been downloaded to start the next feed update.
if (iClientState == EIdle)
@@ -592,7 +592,7 @@
// change client state to not updating
iClientState = EIdle;
- NotifyFeedUpdateComplete(aError);
+ NotifyFeedUpdateCompleteL(aError);
UpdateNextFeedL();
}break;
case ESearching:
@@ -612,7 +612,7 @@
}
else
{
- NotifyOpmlParsingComplete(aError, 0);
+ NotifyOpmlParsingCompleteL(aError, 0);
}
BaflUtils::DeleteFile(iPodcastModel.FsSession(), iSearchResultsFileName);
@@ -621,10 +621,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;i<iObservers.Count();i++)
{
TRAP_IGNORE(iObservers[i]->FeedDownloadFinishedL(iAutoUpdatedInitiator?MFeedEngineObserver::EFeedAutoUpdate:MFeedEngineObserver::EFeedManualUpdate, iActiveFeed->Uid(), aError));
@@ -1005,9 +1005,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)
@@ -1063,12 +1063,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<iObservers.Count();i++)
{
--- a/engine/src/MetaDataReader.cpp Mon Mar 01 22:57:56 2010 +0000
+++ b/engine/src/MetaDataReader.cpp Sat Mar 06 10:22:09 2010 +0000
@@ -148,7 +148,7 @@
buf = NULL;
}
- iObserver.ReadMetaData(*iShow);
+ TRAP_IGNORE(iObserver.ReadMetaDataL(*iShow));
iPlayer->Stop();
iShow = NULL;
TRAP_IGNORE(ParseNextShowL());
--- a/engine/src/OpmlParser.cpp Mon Mar 01 22:57:56 2010 +0000
+++ b/engine/src/OpmlParser.cpp Sat Mar 06 10:22:09 2010 +0000
@@ -73,7 +73,7 @@
void COpmlParser::OnEndDocumentL(TInt aErrorCode)
{
- iFeedEngine.OpmlParsingComplete(aErrorCode, iNumFeedsAdded);
+ iFeedEngine.OpmlParsingCompleteL(aErrorCode, iNumFeedsAdded);
//DP("OnEndDocumentL()");
}
@@ -152,7 +152,8 @@
iFeedEngine.AddSearchResultL(newFeed);
CleanupStack::Pop(newFeed);
} else {
- if(iFeedEngine.AddFeedL(*newFeed))
+ TRAPD(err, iFeedEngine.AddFeedL(*newFeed))
+ if (err == KErrNone)
{
iNumFeedsAdded++;
}
@@ -229,7 +230,7 @@
void COpmlParser::OnError(TInt aErrorCode)
{
DP1("COpmlParser::OnError %d", aErrorCode);
- iFeedEngine.OpmlParsingComplete(aErrorCode, iNumFeedsAdded);
+ iFeedEngine.OpmlParsingCompleteL(aErrorCode, iNumFeedsAdded);
}
TAny* COpmlParser::GetExtendedInterface(const TInt32 /*aUid*/)
--- a/engine/src/PodcastModel.cpp Mon Mar 01 22:57:56 2010 +0000
+++ b/engine/src/PodcastModel.cpp Sat Mar 06 10:22:09 2010 +0000
@@ -408,12 +408,12 @@
iShowEngine->GetShowsByFeedL(iActiveShowList, aFeedUid);
}
-EXPORT_C void CPodcastModel::MarkSelectionPlayed()
+EXPORT_C void CPodcastModel::MarkSelectionPlayedL()
{
for (int i=0;i<iActiveShowList.Count();i++) {
if(iActiveShowList[i]->PlayState() != EPlayed) {
iActiveShowList[i]->SetPlayState(EPlayed);
- iShowEngine->UpdateShow(*iActiveShowList[i]);
+ iShowEngine->UpdateShowL(*iActiveShowList[i]);
}
}
}
--- a/engine/src/ShowEngine.cpp Mon Mar 01 22:57:56 2010 +0000
+++ b/engine/src/ShowEngine.cpp Sat Mar 06 10:22:09 2010 +0000
@@ -115,7 +115,7 @@
DP("CShowEngine::ResumeDownloadsL END");
}
-EXPORT_C void CShowEngine::RemoveAllDownloads()
+EXPORT_C void CShowEngine::RemoveAllDownloadsL()
{
if (!iPodcastModel.SettingsEngine().DownloadSuspended())
{
@@ -145,7 +145,7 @@
if (info != NULL)
{
info->SetDownloadState(ENotDownloaded);
- DBUpdateShow(*info);
+ DBUpdateShowL(*info);
delete info;
}
DBRemoveDownload(aUid);
@@ -231,7 +231,7 @@
if (showInfo == NULL)
{
- DBAddShow(aItem);
+ DBAddShowL(aItem);
return ETrue;
}
else
@@ -299,7 +299,7 @@
}
iShowDownloading->SetDownloadState(EDownloaded);
- DBUpdateShow(*iShowDownloading);
+ DBUpdateShowL(*iShowDownloading);
DBRemoveDownload(iShowDownloading->Uid());
AddShowToMpxCollection(*iShowDownloading);
NotifyShowFinishedL(aError);
@@ -313,7 +313,7 @@
if(aError >= HTTPStatus::EBadRequest && aError <= HTTPStatus::EBadRequest+200)
{
iShowDownloading->SetDownloadState(EFailedDownload);
- DBUpdateShow(*iShowDownloading);
+ DBUpdateShowL(*iShowDownloading);
DBRemoveDownload(iShowDownloading->Uid());
NotifyShowFinishedL(aError);
@@ -323,7 +323,7 @@
else // other kind of error, missing network etc, reque this show
{
iShowDownloading->SetDownloadState(EQueued);
- DBUpdateShow(*iShowDownloading);
+ DBUpdateShowL(*iShowDownloading);
}
iDownloadErrors++;
@@ -343,7 +343,7 @@
if(iShowDownloading)
{
iShowDownloading->SetDownloadState(EQueued);
- DBUpdateShow(*iShowDownloading);
+ DBUpdateShowL(*iShowDownloading);
}
iPodcastModel.SettingsEngine().SetDownloadSuspended(ETrue);
NotifyShowFinishedL(aError);
@@ -734,7 +734,7 @@
showInfo->SetLastError(lasterror);
}
-TBool CShowEngine::DBAddShow(const CShowInfo& aItem)
+TBool CShowEngine::DBAddShowL(const CShowInfo& aItem)
{
DP2("CShowEngine::DBAddShow, title=%S, URL=%S", &aItem.Title(), &aItem.Url());
@@ -804,7 +804,7 @@
sqlite3_finalize(st);
}
-TBool CShowEngine::DBUpdateShow(CShowInfo& aItem)
+TBool CShowEngine::DBUpdateShowL(CShowInfo& aItem)
{
DP1("CShowEngine::DBUpdateShow, title='%S'", &aItem.Title());
@@ -1058,7 +1058,7 @@
}
}
-EXPORT_C void CShowEngine::DeletePlayedShows(RShowInfoArray &aShowInfoArray)
+EXPORT_C void CShowEngine::DeletePlayedShowsL(RShowInfoArray &aShowInfoArray)
{
for (TInt i = 0; i < aShowInfoArray.Count(); i++)
{
@@ -1072,7 +1072,7 @@
}
BaflUtils::DeleteFile(iPodcastModel.FsSession(), aShowInfoArray[i]->FileName());
aShowInfoArray[i]->SetDownloadState(ENotDownloaded);
- DBUpdateShow(*aShowInfoArray[i]);
+ DBUpdateShowL(*aShowInfoArray[i]);
}
}
}
@@ -1116,7 +1116,7 @@
}
info->SetDownloadState(ENotDownloaded);
- DBUpdateShow(*info);
+ DBUpdateShowL(*info);
delete info;
}
}
@@ -1159,7 +1159,7 @@
EXPORT_C void CShowEngine::AddDownloadL(CShowInfo& aInfo)
{
aInfo.SetDownloadState(EQueued);
- DBUpdateShow(aInfo);
+ DBUpdateShowL(aInfo);
DBAddDownload(aInfo.Uid());
DownloadNextShowL();
}
@@ -1199,14 +1199,14 @@
DP1("CShowEngine::DownloadNextShow\tDownloading: %S", &(info->Title()));
info->SetDownloadState(EDownloading);
info->SetLastError(KErrNone);
- DBUpdateShow(*info);
+ DBUpdateShowL(*info);
iShowDownloading = info;
TRAPD(error,getOk = GetShowL(info));
if (error != KErrNone || !getOk)
{
info->SetDownloadState(EFailedDownload);
DBRemoveDownload(info->Uid());
- DBUpdateShow(*info);
+ DBUpdateShowL(*info);
info = DBGetNextDownloadL();
if(info == NULL)
@@ -1264,10 +1264,10 @@
}
}
-void CShowEngine::ReadMetaData(CShowInfo& aShowInfo)
+void CShowEngine::ReadMetaDataL(CShowInfo& aShowInfo)
{
//DP1("Read %S", &(aShowInfo->Title()));
- DBUpdateShow(aShowInfo);
+ DBUpdateShowL(aShowInfo);
}
void CShowEngine::ReadMetaDataCompleteL()
@@ -1276,9 +1276,9 @@
MetaDataReader().SetIgnoreTrackNo(EFalse);
}
-EXPORT_C void CShowEngine::UpdateShow(CShowInfo& aInfo)
+EXPORT_C void CShowEngine::UpdateShowL(CShowInfo& aInfo)
{
- DBUpdateShow(aInfo);
+ DBUpdateShowL(aInfo);
}
EXPORT_C CMetaDataReader& CShowEngine::MetaDataReader()