# HG changeset patch
# User teknolog
# Date 1268386448 0
# Node ID e7b10d6d7ba32d14ce34b946529c6a2d45215916
# Parent  43e204e6ae2e53e2df97baabc32b59d748bb764e# Parent  56d4e0784e5db146fb4f64a38253a5e713403423
Merge with symbian1 branch

diff -r 43e204e6ae2e -r e7b10d6d7ba3 application/data/PodcastClient_english.rls
--- a/application/data/PodcastClient_english.rls	Fri Mar 12 00:20:10 2010 +0000
+++ b/application/data/PodcastClient_english.rls	Fri Mar 12 09:34:08 2010 +0000
@@ -58,6 +58,9 @@
 rls_string STRING_r_podcast_setting_alwaysask "Always ask"
 rls_string STRING_r_podcast_setting_useiap "Select access point"
 rls_string STRING_r_podcast_setting_iaplist "Access points"
+rls_string STRING_r_on "On"
+rls_string STRING_r_off "Off"
+
 
 // Choicelist for autodownload
 rls_string STRING_podcast_autoupdate_option1 "Off"
diff -r 43e204e6ae2e -r e7b10d6d7ba3 application/data/PodcastStrings.ra
--- a/application/data/PodcastStrings.ra	Fri Mar 12 00:20:10 2010 +0000
+++ b/application/data/PodcastStrings.ra	Fri Mar 12 09:34:08 2010 +0000
@@ -16,22 +16,10 @@
 *
 */
 
-RESOURCE TBUF r_podcast_main_player_cmd{buf = STRING_r_view_player_cmd;}
-RESOURCE TBUF r_podcast_show_cmd{buf = STRING_r_view_show_cmd;}
-RESOURCE TBUF r_podcast_update_cmd{buf = STRING_r_update_feeds_cmd;}
 RESOURCE TBUF r_podcast_update_all_cmd{buf = STRING_r_update_all_feeds_cmd;}
-RESOURCE TBUF r_podcast_view_cmd {buf = STRING_r_view_cmd;}
-RESOURCE TBUF r_podcast_remove_feed_title {buf = STRING_r_remove_feed_title;}
 RESOURCE TBUF r_podcast_remove_feed_prompt {buf = STRING_r_remove_feed_prompt;}
-RESOURCE TBUF r_podcast_update_new_feed_title {buf = STRING_r_update_new_feed_title;}
 RESOURCE TBUF r_podcast_update_new_feed_prompt {buf = STRING_r_update_new_feed_prompt;}
-RESOURCE TBUF r_podcast_delete_played_title {buf = STRING_r_delete_played_title;}
-RESOURCE TBUF r_podcast_delete_played_prompt {buf = STRING_r_delete_played_prompt;}
-RESOURCE TBUF r_podcast_delete_show_title {buf = STRING_r_delete_show_title;}
 RESOURCE TBUF r_podcast_delete_show_prompt {buf = STRING_r_delete_show_prompt;}
-RESOURCE TBUF r_podcast_remove_chapter_title {buf = STRING_r_remove_chapter_title;}
-RESOURCE TBUF r_podcast_remove_chapter_prompt {buf = STRING_r_remove_chapter_prompt;}
-RESOURCE TBUF r_podcast_enable_downloads_title {buf = STRING_r_enable_downloads_title;}
 RESOURCE TBUF r_podcast_enable_downloads_prompt {buf = STRING_r_enable_downloads_prompt;}
 RESOURCE TBUF r_podcast_feeds_title_format {buf = STRING_r_podcast_feeds_title_format;}
 RESOURCE TBUF r_podcast_feeds_status_format {buf = STRING_r_podcast_feeds_status_format;}
@@ -47,30 +35,19 @@
 RESOURCE TBUF r_podcast_feeds_never_updated {buf = STRING_r_podcast_shows_never_updated;}
 RESOURCE TBUF r_podcast_feeds_is_updating {buf = STRING_r_podcast_feeds_is_updating;}
 RESOURCE TBUF r_podcast_feeds_no_feeds {buf = STRING_r_podcast_no_feeds;}
-RESOURCE TBUF r_podcast_import_feeds_title {buf = STRING_r_view_import_feeds_title;}
-RESOURCE TBUF r_podcast_export_feeds_title {buf = STRING_r_view_export_feeds_title;}
 RESOURCE TBUF r_podcast_export_feeds_softkey {buf = STRING_r_view_export_feeds_softkey;}
 RESOURCE TBUF r_podcast_pending_status_active {buf = STRING_r_podcast_shows_title_download;}
 RESOURCE TBUF r_podcast_pending_status_suspended {buf = STRING_r_podcast_shows_downloads_suspended;}
 RESOURCE TBUF r_podcast_feeds_status {buf = STRING_r_view_feeds_status;}
 RESOURCE TBUF r_add_feed_exists {buf = STRING_r_add_feed_exists;}
-RESOURCE TBUF r_add_feed_exists_title {buf = STRING_r_add_feed_exists_title;}
 RESOURCE TBUF r_add_feed_replace {buf = STRING_r_add_feed_replace;}
-RESOURCE TBUF r_add_feed_replace_title {buf = STRING_r_add_feed_replace_title;}
-RESOURCE TBUF r_catchup_feed {buf = STRING_r_catchup_feed;}
-RESOURCE TBUF r_catchup_feed_title {buf = STRING_r_catchup_feed_title;}
 RESOURCE TBUF r_remove_all_dlg {buf = STRING_r_remove_all_dlg;}
-RESOURCE TBUF r_question_title {buf = STRING_r_question_title;}
 RESOURCE TBUF r_podcast_addfeed_prompt {buf = STRING_r_add_feed_prompt;}
 RESOURCE TBUF r_podcast_addfeed_title_prompt {buf = STRING_r_add_feed_title_prompt;}
 RESOURCE TBUF r_tabgroup_feeds {buf = STRING_r_tabgroup_feeds;}
 RESOURCE TBUF r_tabgroup_queue {buf = STRING_r_tabgroup_queue;}
 RESOURCE TBUF r_tabgroup_queue_counter {buf = STRING_r_tabgroup_queue_counter;}
-RESOURCE TBUF r_tabgroup_search {buf = STRING_r_search;}
-RESOURCE TBUF r_tabgroup_shows {buf = STRING_r_tabgroup_shows;}
-RESOURCE TBUF r_search_prompt {buf = STRING_r_search_title;}
 RESOURCE TBUF r_podcast_no_search_results {buf = STRING_r_podcast_empty_list;}
-RESOURCE TBUF r_add_feed_title {buf=STRING_add_feed_title;}
 RESOURCE TBUF r_add_feed_query {buf=STRING_add_feed_query;}
 RESOURCE TBUF r_add_feed_success {buf=STRING_add_feed_success;}
 RESOURCE TBUF r_add_feed_failure {buf=STRING_add_feed_error;}
diff -r 43e204e6ae2e -r e7b10d6d7ba3 application/inc/PodcastAppui.h
--- a/application/inc/PodcastAppui.h	Fri Mar 12 00:20:10 2010 +0000
+++ b/application/inc/PodcastAppui.h	Fri Mar 12 09:34:08 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
diff -r 43e204e6ae2e -r e7b10d6d7ba3 application/inc/PodcastFeedView.h
--- a/application/inc/PodcastFeedView.h	Fri Mar 12 00:20:10 2010 +0000
+++ b/application/inc/PodcastFeedView.h	Fri Mar 12 09:34:08 2010 +0000
@@ -39,10 +39,10 @@
         static CPodcastFeedView* NewLC(CPodcastModel& aPodcastModel);
         ~CPodcastFeedView();
         void UpdateItemL(TInt aIndex);
-		void CheckResumeDownload();
+		void CheckResumeDownloadL();
 		void UpdateToolbar(TBool aVisible=ETrue);
 		TBool ViewingShows();
-
+		
 	protected:
 	    void ConstructL();
 		CPodcastFeedView(CPodcastModel& aPodcastModel);
diff -r 43e204e6ae2e -r e7b10d6d7ba3 application/inc/PodcastListView.h
--- a/application/inc/PodcastListView.h	Fri Mar 12 00:20:10 2010 +0000
+++ b/application/inc/PodcastListView.h	Fri Mar 12 09:34:08 2010 +0000
@@ -63,7 +63,7 @@
 		void ScrollToVisible();
     	void Draw(const TRect& aRect) const;
     	
-    	void SetLongTapDetected(TBool aLongTapDetected);
+    	void SetLongTapDetectedL(TBool aLongTapDetected);
 
     	CEikFormattedCellListBox * iListbox;		
 
@@ -134,9 +134,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();
diff -r 43e204e6ae2e -r e7b10d6d7ba3 application/inc/PodcastShowsView.h
--- a/application/inc/PodcastShowsView.h	Fri Mar 12 00:20:10 2010 +0000
+++ b/application/inc/PodcastShowsView.h	Fri Mar 12 09:34:08 2010 +0000
@@ -101,8 +101,8 @@
 private:
 	void GetShowIcons(CShowInfo* aShowInfo, TInt& aIconIndex);
 	void DisplayShowInfoDialogL();
-	void HandleSetShowPlayed(TBool aPlayed);
-	void HandleDeleteShow();
+	void HandleSetShowPlayedL(TBool aPlayed);
+	void HandleDeleteShowL();
 	void UpdateViewTitleL();
 	void CreateIconsL();
 	void GetShowErrorText(TDes &aErrorMessage, TInt aErrorCode);
diff -r 43e204e6ae2e -r e7b10d6d7ba3 application/sis/podcatcher_udeb.sis
Binary file application/sis/podcatcher_udeb.sis has changed
diff -r 43e204e6ae2e -r e7b10d6d7ba3 application/sis/podcatcher_udeb_signed.sis
Binary file application/sis/podcatcher_udeb_signed.sis has changed
diff -r 43e204e6ae2e -r e7b10d6d7ba3 application/sis/podcatcher_urel.sis
Binary file application/sis/podcatcher_urel.sis has changed
diff -r 43e204e6ae2e -r e7b10d6d7ba3 application/sis/podcatcher_urel_signed.sis
Binary file application/sis/podcatcher_urel_signed.sis has changed
diff -r 43e204e6ae2e -r e7b10d6d7ba3 application/src/PodcastAppui.cpp
--- a/application/src/PodcastAppui.cpp	Fri Mar 12 00:20:10 2010 +0000
+++ b/application/src/PodcastAppui.cpp	Fri Mar 12 09:34:08 2010 +0000
@@ -205,7 +205,7 @@
 	iNaviPane->PushL(*iNaviTabGroup);
 	iNaviStyle = ENaviTabGroup;
 
-	UpdateQueueTab(iPodcastModel->ShowEngine().GetNumDownloadingShows());
+	UpdateQueueTabL(iPodcastModel->ShowEngine().GetNumDownloadingShows());
 	}
 
 void CPodcastAppUi::TabChangedL (TInt aIndex)
@@ -225,7 +225,7 @@
 			else
 				{
 				newview = KUidPodcastFeedViewID;
-				} 
+				}
 			} 
 		else if (aIndex == KTabIdQueue)
 			{
@@ -250,12 +250,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)
 		{
@@ -278,7 +278,7 @@
 		}
 	}
 
-void CPodcastAppUi::TabLeft()
+void CPodcastAppUi::TabLeftL()
 	{
 	if (iNaviStyle == ENaviTabGroup) 
 		{
@@ -291,7 +291,7 @@
 		}
 	}
 
-void CPodcastAppUi::TabRight()
+void CPodcastAppUi::TabRightL()
 	{
 	if (iNaviStyle == ENaviTabGroup) 
 		{
diff -r 43e204e6ae2e -r e7b10d6d7ba3 application/src/PodcastFeedView.cpp
--- a/application/src/PodcastFeedView.cpp	Fri Mar 12 00:20:10 2010 +0000
+++ b/application/src/PodcastFeedView.cpp	Fri Mar 12 09:34:08 2010 +0000
@@ -175,10 +175,6 @@
 	                                  const TDesC8& aCustomMessage)
 	{
 	CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage);
-	if (iFirstActivateAfterLaunch)
-		{
-		iFirstActivateAfterLaunch = EFalse;
-		}
 	
 	if (aPrevViewId.iViewUid == KUidPodcastShowsViewID)
 		{
@@ -186,8 +182,13 @@
 		iViewingShows = EFalse;
 		}
 	
-	UpdateListboxItemsL();		
-	UpdateToolbar();
+		UpdateListboxItemsL();		
+		UpdateToolbar();
+
+	if (iFirstActivateAfterLaunch)
+		{
+		iFirstActivateAfterLaunch = EFalse;
+		}
 	}
 
 void CPodcastFeedView::DoDeactivate()
@@ -260,7 +261,7 @@
 				{
 				TBuf<KMaxMessageLength> message;
 				iEikonEnv->ReadResourceL(message, R_PODCAST_CONNECTION_ERROR);
-				ShowErrorMessage(message);
+				ShowErrorMessageL(message);
 				}
 			}
 			break;
@@ -543,7 +544,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);
@@ -561,7 +562,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();
 	}
 
@@ -622,7 +623,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());
 					
@@ -636,7 +637,7 @@
 				{
 				TBuf<KMaxMessageLength> message;
 				iEikonEnv->ReadResourceL(message, R_ADD_FEED_EXISTS);
-				ShowErrorMessage(message);
+				ShowErrorMessageL(message);
 				}		
 			
 			CleanupStack::PopAndDestroy(newFeedInfo);
@@ -667,7 +668,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);
 					
@@ -694,7 +695,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);
 				}
@@ -704,7 +705,7 @@
 				{
 					info->SetTitleL(title);
 					info->SetCustomTitle();	
-					iPodcastModel.FeedEngine().UpdateFeed(info);
+					iPodcastModel.FeedEngine().UpdateFeedL(info);
 					UpdateListboxItemsL();
 				}
 			}
@@ -725,7 +726,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);
@@ -789,7 +790,7 @@
 				if (err != KErrNone) {
 					TBuf<KMaxMessageLength> message;
 					iEikonEnv->ReadResourceL(message, R_IMPORT_FEED_FAILURE);
-					ShowErrorMessage(message);
+					ShowErrorMessageL(message);
 					}
 				}
 				
@@ -845,13 +846,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);
@@ -861,7 +862,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;
@@ -872,7 +873,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);
@@ -900,7 +901,7 @@
 			{
 			TBuf<KMaxMessageLength> message;
 			iEikonEnv->ReadResourceL(message, R_PODCAST_CONNECTION_ERROR);
-			ShowErrorMessage(message);
+			ShowErrorMessageL(message);
 			}
 			break;
 		case KErrNone: 
@@ -920,7 +921,7 @@
 				iEikonEnv->ReadResourceL(templ, R_IMPORT_FEED_SUCCESS);
 				message.Format(templ, aNumFeedsImported);
 				
-				if(ShowQueryMessage(message))
+				if(ShowQueryMessageL(message))
 					{
 					HandleCommandL(EPodcastUpdateAllFeeds);
 					}
@@ -928,11 +929,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
 					{
@@ -966,7 +968,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(
diff -r 43e204e6ae2e -r e7b10d6d7ba3 application/src/PodcastListView.cpp
--- a/application/src/PodcastListView.cpp	Fri Mar 12 00:20:10 2010 +0000
+++ b/application/src/PodcastListView.cpp	Fri Mar 12 09:34:08 2010 +0000
@@ -101,7 +101,7 @@
         }
     }
 
-void CPodcastListContainer::SetLongTapDetected(TBool aLongTapDetected)
+void CPodcastListContainer::SetLongTapDetectedL(TBool aLongTapDetected)
 	{
 	iLongTapDetected = aLongTapDetected;
 	
@@ -334,7 +334,7 @@
 	CleanupStack::PopAndDestroy(emptyText);	
 	}
 
-void CPodcastListView::ShowOkMessage(TDesC &aText)
+void CPodcastListView::ShowOkMessageL(TDesC &aText)
 	{
 	CAknNoteDialog* dlg= new(ELeave) CAknNoteDialog();
 	CleanupStack::PushL(dlg);
@@ -343,7 +343,7 @@
 	dlg->ExecuteLD(R_MESSAGEDLG_OK);
 	}
 
-void CPodcastListView::ShowErrorMessage(TDesC &aText)
+void CPodcastListView::ShowErrorMessageL(TDesC &aText)
 	{
 	CAknNoteDialog* dlg= new(ELeave) CAknNoteDialog();
 	CleanupStack::PushL(dlg);
@@ -352,7 +352,7 @@
 	dlg->ExecuteLD(R_ERRORDLG_OK);
 	}
 
-TInt CPodcastListView::ShowQueryMessage(TDesC &aText)
+TInt CPodcastListView::ShowQueryMessageL(TDesC &aText)
 	{
 	CAknQueryDialog* dlg= new(ELeave) CAknQueryDialog();
 	
@@ -384,7 +384,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;
@@ -430,10 +430,10 @@
 		switch (aKeyEvent.iCode)
 			{
 			case EKeyRightArrow:
-				((CPodcastAppUi*)AppUi())->TabRight();
+				((CPodcastAppUi*)AppUi())->TabRightL();
 				return EKeyWasConsumed;
 			case EKeyLeftArrow:
-				((CPodcastAppUi*)AppUi())->TabLeft();
+				((CPodcastAppUi*)AppUi())->TabLeftL();
 				return EKeyWasConsumed;
 			}
 		}
diff -r 43e204e6ae2e -r e7b10d6d7ba3 application/src/PodcastQueueView.cpp
--- a/application/src/PodcastQueueView.cpp	Fri Mar 12 00:20:10 2010 +0000
+++ b/application/src/PodcastQueueView.cpp	Fri Mar 12 09:34:08 2010 +0000
@@ -248,7 +248,7 @@
 				{
 				TBuf<KMaxMessageLength> message;
 				iEikonEnv->ReadResourceL(message, R_PODCAST_CONNECTION_ERROR);
-				ShowErrorMessage(message);
+				ShowErrorMessageL(message);
 				}
 				break;
 			default: // Do nothing
@@ -516,9 +516,9 @@
 			TBuf<KMaxMessageLength> msg;
 			iEikonEnv->ReadResourceL(msg, R_CLEAR_QUERY);
 												
-			if(ShowQueryMessage(msg))
+			if(ShowQueryMessageL(msg))
 				{
-				iPodcastModel.ShowEngine().RemoveAllDownloads();
+				iPodcastModel.ShowEngine().RemoveAllDownloadsL();
 				UpdateListboxItemsL();
 				}
 			}
@@ -558,7 +558,7 @@
 			CPodcastListView::HandleCommandL(aCommand);
 			break;
 		}
-	iListContainer->SetLongTapDetected(EFalse); // in case we got here by long tapping
+	iListContainer->SetLongTapDetectedL(EFalse); // in case we got here by long tapping
 	UpdateToolbar();
 	}
 	
diff -r 43e204e6ae2e -r e7b10d6d7ba3 application/src/PodcastSearchView.cpp
--- a/application/src/PodcastSearchView.cpp	Fri Mar 12 00:20:10 2010 +0000
+++ b/application/src/PodcastSearchView.cpp	Fri Mar 12 09:34:08 2010 +0000
@@ -231,7 +231,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)
@@ -239,7 +239,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());
 							
@@ -253,7 +253,7 @@
 						{
 						TBuf<KMaxMessageLength> message;
 						iEikonEnv->ReadResourceL(message, R_ADD_FEED_EXISTS);
-						ShowErrorMessage(message);
+						ShowErrorMessageL(message);
 						}		
 				}
 				}
diff -r 43e204e6ae2e -r e7b10d6d7ba3 application/src/PodcastShowsView.cpp
--- a/application/src/PodcastShowsView.cpp	Fri Mar 12 00:20:10 2010 +0000
+++ b/application/src/PodcastShowsView.cpp	Fri Mar 12 09:34:08 2010 +0000
@@ -262,7 +262,7 @@
 			{
 			TBuf<KMaxMessageLength> message;
 			iEikonEnv->ReadResourceL(message, R_PODCAST_CONNECTION_ERROR);
-			ShowErrorMessage(message);
+			ShowErrorMessageL(message);
 			}
 			break;
 		default:
@@ -556,17 +556,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:
 			{
@@ -607,7 +607,7 @@
 			CPodcastListView::HandleCommandL(aCommand);
 			break;
 		}
-	iListContainer->SetLongTapDetected(EFalse);
+	iListContainer->SetLongTapDetectedL(EFalse);
 
 	UpdateToolbar();
 	}
@@ -717,7 +717,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(
@@ -746,7 +746,7 @@
 	DP("CPodcastShowsView::HandleLongTapEventL END");
 }
 
-void CPodcastShowsView::HandleSetShowPlayed(TBool aPlayed)
+void CPodcastShowsView::HandleSetShowPlayedL(TBool aPlayed)
 	{
 
 	TInt index = iListContainer->Listbox()->CurrentItemIndex();
@@ -755,13 +755,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();
 
@@ -772,7 +772,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());
 			
@@ -780,7 +780,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);					
@@ -790,7 +790,7 @@
 
 void CPodcastShowsView::DownloadQueueUpdatedL(TInt aDownloadingShows, TInt aQueuedShows)
 	{
-	((CPodcastAppUi*)AppUi())->UpdateQueueTab(aDownloadingShows+aQueuedShows);
+	((CPodcastAppUi*)AppUi())->UpdateQueueTabL(aDownloadingShows+aQueuedShows);
 	UpdateListboxItemsL();
 	}
 
diff -r 43e204e6ae2e -r e7b10d6d7ba3 engine/BWINS/podcastengineu.def
--- a/engine/BWINS/podcastengineu.def	Fri Mar 12 00:20:10 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,173 +0,0 @@
-EXPORTS
-	??0CShowInfo@@QAE@PAV0@@Z @ 1 NONAME ; CShowInfo::CShowInfo(class CShowInfo *)
-	??1CFeedInfo@@UAE@XZ @ 2 NONAME ; CFeedInfo::~CFeedInfo(void)
-	??1CPodcastModel@@UAE@XZ @ 3 NONAME ; CPodcastModel::~CPodcastModel(void)
-	??1CShowInfo@@UAE@XZ @ 4 NONAME ; CShowInfo::~CShowInfo(void)
-	?ActiveClientUid@CFeedEngine@@QAEIXZ @ 5 NONAME ; unsigned int CFeedEngine::ActiveClientUid(void)
-	?ActiveFeedInfo@CPodcastModel@@QAEPAVCFeedInfo@@XZ @ 6 NONAME ; class CFeedInfo * CPodcastModel::ActiveFeedInfo(void)
-	?ActiveShowList@CPodcastModel@@QAEAAV?$RPointerArray@VCShowInfo@@@@XZ @ 7 NONAME ; class RPointerArray<class CShowInfo> & CPodcastModel::ActiveShowList(void)
-	?AddObserver@CFeedEngine@@QAEXPAVMFeedEngineObserver@@@Z @ 8 NONAME ; void CFeedEngine::AddObserver(class MFeedEngineObserver *)
-	?AddObserver@CShowEngine@@QAEXPAVMShowEngineObserver@@@Z @ 9 NONAME ; void CShowEngine::AddObserver(class MShowEngineObserver *)
-	?AddObserver@CSoundEngine@@QAEXPAVMSoundEngineObserver@@@Z @ 10 NONAME ; void CSoundEngine::AddObserver(class MSoundEngineObserver *)
-	?BaseDir@CSettingsEngine@@QAEAAV?$TBuf@$0BAA@@@XZ @ 11 NONAME ; class TBuf<256> & CSettingsEngine::BaseDir(void)
-	?ClientState@CFeedEngine@@QAE?AW4TClientState@@XZ @ 12 NONAME ; enum TClientState CFeedEngine::ClientState(void)
-	?DeleteAllShowsByFeedL@CShowEngine@@QAEXIH@Z @ 13 NONAME ; void CShowEngine::DeleteAllShowsByFeedL(unsigned int, int)
-	?DeletePlayedShows@CShowEngine@@QAEXAAV?$RPointerArray@VCShowInfo@@@@@Z @ 14 NONAME ; void CShowEngine::DeletePlayedShows(class RPointerArray<class CShowInfo> &)
-	?DeleteShowL@CShowEngine@@QAEXIH@Z @ 15 NONAME ; void CShowEngine::DeleteShowL(unsigned int, int)
-	?Description@CFeedInfo@@QBEABVTDesC16@@XZ @ 16 NONAME ; class TDesC16 const & CFeedInfo::Description(void) const
-	?Description@CShowInfo@@QBEABVTDesC16@@XZ @ 17 NONAME ; class TDesC16 const & CShowInfo::Description(void) const
-	?DownloadAutomatically@CSettingsEngine@@QAEHXZ @ 18 NONAME ; int CSettingsEngine::DownloadAutomatically(void)
-	?ExportFeedsL@CFeedEngine@@QAEHAAV?$TBuf@$0BAA@@@@Z @ 19 NONAME ; int CFeedEngine::ExportFeedsL(class TBuf<256> &)
-	?FeedEngine@CPodcastModel@@QAEAAVCFeedEngine@@XZ @ 20 NONAME ; class CFeedEngine & CPodcastModel::FeedEngine(void)
-	?FileName@CShowInfo@@QBEABVTDesC16@@XZ @ 21 NONAME ; class TDesC16 const & CShowInfo::FileName(void) const
-	?FixProtocolsL@PodcastUtils@@SAXAAVTDes16@@@Z @ 22 NONAME ; void PodcastUtils::FixProtocolsL(class TDes16 &)
-	?GetAllShows@CPodcastModel@@QAEXXZ @ 23 NONAME ; void CPodcastModel::GetAllShows(void)
-	?GetDownloadedStats@CFeedEngine@@QAEXAAI0@Z @ 24 NONAME ; void CFeedEngine::GetDownloadedStats(unsigned int &, unsigned int &)
-	?GetFeedInfoByUid@CFeedEngine@@QAEPAVCFeedInfo@@I@Z @ 25 NONAME ; class CFeedInfo * CFeedEngine::GetFeedInfoByUid(unsigned int)
-	?GetMimeType@CShowEngine@@QAEXABVTDesC16@@AAVTDes16@@@Z @ 26 NONAME ; void CShowEngine::GetMimeType(class TDesC16 const &, class TDes16 &)
-	?GetNewShows@CPodcastModel@@QAEXXZ @ 27 NONAME ; void CPodcastModel::GetNewShows(void)
-	?GetShowByUidL@CShowEngine@@QAEPAVCShowInfo@@I@Z @ 28 NONAME ; class CShowInfo * CShowEngine::GetShowByUidL(unsigned int)
-	?GetShowsByFeed@CPodcastModel@@QAEXI@Z @ 29 NONAME ; void CPodcastModel::GetShowsByFeed(unsigned int)
-	?GetShowsDownloaded@CPodcastModel@@QAEXXZ @ 30 NONAME ; void CPodcastModel::GetShowsDownloaded(void)
-	?GetShowsDownloading@CPodcastModel@@QAEXXZ @ 31 NONAME ; void CPodcastModel::GetShowsDownloading(void)
-	?GetSortedFeeds@CFeedEngine@@QAEABV?$RPointerArray@VCFeedInfo@@@@XZ @ 32 NONAME ; class RPointerArray<class CFeedInfo> const & CFeedEngine::GetSortedFeeds(void)
-	?IAPIds@CPodcastModel@@QAEAAV?$RArray@VTPodcastIAPItem@@@@XZ @ 33 NONAME ; class RArray<class TPodcastIAPItem> & CPodcastModel::IAPIds(void)
-	?IAPNames@CPodcastModel@@QAEPAVCDesC16ArrayFlat@@XZ @ 34 NONAME ; class CDesC16ArrayFlat * CPodcastModel::IAPNames(void)
-	?ImageFileName@CFeedInfo@@QBEABVTDesC16@@XZ @ 35 NONAME ; class TDesC16 const & CFeedInfo::ImageFileName(void) const
-	?ImageUrl@CFeedInfo@@QBEABVTDesC16@@XZ @ 36 NONAME ; class TDesC16 const & CFeedInfo::ImageUrl(void) const
-	?ImportFeedsL@CFeedEngine@@QAEXABVTDesC16@@@Z @ 37 NONAME ; void CFeedEngine::ImportFeedsL(class TDesC16 const &)
-	?Link@CFeedInfo@@QBEABVTDesC16@@XZ @ 38 NONAME ; class TDesC16 const & CFeedInfo::Link(void) const
-	?MarkSelectionPlayed@CPodcastModel@@QAEXXZ @ 39 NONAME ; void CPodcastModel::MarkSelectionPlayed(void)
-	?NewL@CFeedInfo@@SAPAV1@XZ @ 40 NONAME ; class CFeedInfo * CFeedInfo::NewL(void)
-	?NewL@CPodcastModel@@SAPAV1@XZ @ 41 NONAME ; class CPodcastModel * CPodcastModel::NewL(void)
-	?NewL@CShowInfo@@SAPAV1@I@Z @ 42 NONAME ; class CShowInfo * CShowInfo::NewL(unsigned int)
-	?NewLC@CFeedInfo@@SAPAV1@XZ @ 43 NONAME ; class CFeedInfo * CFeedInfo::NewLC(void)
-	?Pause@CSoundEngine@@QAEXH@Z @ 44 NONAME ; void CSoundEngine::Pause(int)
-	?Play@CSoundEngine@@QAEXXZ @ 45 NONAME ; void CSoundEngine::Play(void)
-	?PlayPausePodcastL@CPodcastModel@@QAEXPAVCShowInfo@@H@Z @ 46 NONAME ; void CPodcastModel::PlayPausePodcastL(class CShowInfo *, int)
-	?PlayTime@CShowInfo@@QBEIXZ @ 47 NONAME ; unsigned int CShowInfo::PlayTime(void) const
-	?PlayingPodcast@CPodcastModel@@QAEPAVCShowInfo@@XZ @ 48 NONAME ; class CShowInfo * CPodcastModel::PlayingPodcast(void)
-	?Position@CShowInfo@@QBE?AVTTimeIntervalMicroSeconds@@XZ @ 49 NONAME ; class TTimeIntervalMicroSeconds CShowInfo::Position(void) const
-	?Position@CSoundEngine@@QAE?AVTTimeIntervalMicroSeconds@@XZ @ 50 NONAME ; class TTimeIntervalMicroSeconds CSoundEngine::Position(void)
-	?PubDate@CShowInfo@@QBE?BVTTime@@XZ @ 51 NONAME ; class TTime const CShowInfo::PubDate(void) const
-	?RemoveAllDownloads@CShowEngine@@QAEXXZ @ 52 NONAME ; void CShowEngine::RemoveAllDownloads(void)
-	?RemoveDownloadL@CShowEngine@@QAEHI@Z @ 53 NONAME ; int CShowEngine::RemoveDownloadL(unsigned int)
-	?RemoveObserver@CFeedEngine@@QAEXPAVMFeedEngineObserver@@@Z @ 54 NONAME ; void CFeedEngine::RemoveObserver(class MFeedEngineObserver *)
-	?RemoveObserver@CShowEngine@@QAEXPAVMShowEngineObserver@@@Z @ 55 NONAME ; void CShowEngine::RemoveObserver(class MShowEngineObserver *)
-	?ResumeDownloadsL@CShowEngine@@QAEXXZ @ 56 NONAME ; void CShowEngine::ResumeDownloadsL(void)
-	?SaveSettingsL@CSettingsEngine@@QAEXXZ @ 57 NONAME ; void CSettingsEngine::SaveSettingsL(void)
-	?SetActiveFeedInfo@CPodcastModel@@QAEXPAVCFeedInfo@@@Z @ 58 NONAME ; void CPodcastModel::SetActiveFeedInfo(class CFeedInfo *)
-	?SetBaseDir@CSettingsEngine@@QAEXAAV?$TBuf@$0BAA@@@@Z @ 59 NONAME ; void CSettingsEngine::SetBaseDir(class TBuf<256> &)
-	?SetBuildDate@CFeedInfo@@QAEXVTTime@@@Z @ 60 NONAME ; void CFeedInfo::SetBuildDate(class TTime)
-	?SetCustomTitle@CFeedInfo@@QAEXXZ @ 61 NONAME ; void CFeedInfo::SetCustomTitle(void)
-	?SetDescriptionL@CFeedInfo@@QAEXABVTDesC16@@@Z @ 62 NONAME ; void CFeedInfo::SetDescriptionL(class TDesC16 const &)
-	?SetDescriptionL@CShowInfo@@QAEXABVTDesC16@@@Z @ 63 NONAME ; void CShowInfo::SetDescriptionL(class TDesC16 const &)
-	?SetDownloadAutomatically@CSettingsEngine@@QAEXH@Z @ 64 NONAME ; void CSettingsEngine::SetDownloadAutomatically(int)
-	?SetDownloadState@CShowInfo@@QAEXW4TDownloadState@@@Z @ 65 NONAME ; void CShowInfo::SetDownloadState(enum TDownloadState)
-	?SetFeedUid@CShowInfo@@QAEXI@Z @ 66 NONAME ; void CShowInfo::SetFeedUid(unsigned int)
-	?SetFileNameL@CShowInfo@@QAEXABVTDesC16@@@Z @ 67 NONAME ; void CShowInfo::SetFileNameL(class TDesC16 const &)
-	?SetImageFileNameL@CFeedInfo@@QAEXABVTDesC16@@@Z @ 68 NONAME ; void CFeedInfo::SetImageFileNameL(class TDesC16 const &)
-	?SetImageUrlL@CFeedInfo@@QAEXABVTDesC16@@@Z @ 69 NONAME ; void CFeedInfo::SetImageUrlL(class TDesC16 const &)
-	?SetLastUpdated@CFeedInfo@@QAEXVTTime@@@Z @ 70 NONAME ; void CFeedInfo::SetLastUpdated(class TTime)
-	?SetLinkL@CFeedInfo@@QAEXABVTDesC16@@@Z @ 71 NONAME ; void CFeedInfo::SetLinkL(class TDesC16 const &)
-	?SetPlayState@CShowInfo@@QAEXW4TPlayState@@@Z @ 72 NONAME ; void CShowInfo::SetPlayState(enum TPlayState)
-	?SetPlayTime@CShowInfo@@QAEXI@Z @ 73 NONAME ; void CShowInfo::SetPlayTime(unsigned int)
-	?SetPlayingPodcast@CPodcastModel@@QAEXPAVCShowInfo@@@Z @ 74 NONAME ; void CPodcastModel::SetPlayingPodcast(class CShowInfo *)
-	?SetPosition@CShowInfo@@QAEXVTTimeIntervalMicroSeconds@@@Z @ 75 NONAME ; void CShowInfo::SetPosition(class TTimeIntervalMicroSeconds)
-	?SetPosition@CSoundEngine@@QAEXI@Z @ 76 NONAME ; void CSoundEngine::SetPosition(unsigned int)
-	?SetPubDate@CShowInfo@@QAEXVTTime@@@Z @ 77 NONAME ; void CShowInfo::SetPubDate(class TTime)
-	?SetShowSize@CShowInfo@@QAEXI@Z @ 78 NONAME ; void CShowInfo::SetShowSize(unsigned int)
-	?SetShowType@CShowInfo@@QAEXW4TShowType@@@Z @ 79 NONAME ; void CShowInfo::SetShowType(enum TShowType)
-	?SetSpecificIAP@CSettingsEngine@@QAEXH@Z @ 80 NONAME ; void CSettingsEngine::SetSpecificIAP(int)
-	?SetTitleL@CFeedInfo@@QAEXABVTDesC16@@@Z @ 81 NONAME ; void CFeedInfo::SetTitleL(class TDesC16 const &)
-	?SetTitleL@CShowInfo@@QAEXABVTDesC16@@@Z @ 82 NONAME ; void CShowInfo::SetTitleL(class TDesC16 const &)
-	?SetTrackNo@CShowInfo@@QAEXI@Z @ 83 NONAME ; void CShowInfo::SetTrackNo(unsigned int)
-	?SetUid@CShowInfo@@QAEXI@Z @ 84 NONAME ; void CShowInfo::SetUid(unsigned int)
-	?SetUpdateAutomatically@CSettingsEngine@@QAEXW4TAutoUpdateSetting@@@Z @ 85 NONAME ; void CSettingsEngine::SetUpdateAutomatically(enum TAutoUpdateSetting)
-	?SetUpdateFeedInterval@CSettingsEngine@@QAEXH@Z @ 86 NONAME ; void CSettingsEngine::SetUpdateFeedInterval(int)
-	?SetUpdateFeedTime@CSettingsEngine@@QAEXVTTime@@@Z @ 87 NONAME ; void CSettingsEngine::SetUpdateFeedTime(class TTime)
-	?SetUrlL@CFeedInfo@@QAEXABVTDesC16@@@Z @ 88 NONAME ; void CFeedInfo::SetUrlL(class TDesC16 const &)
-	?SetUrlL@CShowInfo@@QAEXABVTDesC16@@@Z @ 89 NONAME ; void CShowInfo::SetUrlL(class TDesC16 const &)
-	?SettingsEngine@CPodcastModel@@QAEAAVCSettingsEngine@@XZ @ 90 NONAME ; class CSettingsEngine & CPodcastModel::SettingsEngine(void)
-	?ShowDownloading@CShowEngine@@QAEPAVCShowInfo@@XZ @ 91 NONAME ; class CShowInfo * CShowEngine::ShowDownloading(void)
-	?ShowEngine@CPodcastModel@@QAEAAVCShowEngine@@XZ @ 92 NONAME ; class CShowEngine & CPodcastModel::ShowEngine(void)
-	?SoundEngine@CPodcastModel@@QAEAAVCSoundEngine@@XZ @ 93 NONAME ; class CSoundEngine & CPodcastModel::SoundEngine(void)
-	?SpecificIAP@CSettingsEngine@@QAEHXZ @ 94 NONAME ; int CSettingsEngine::SpecificIAP(void)
-	?State@CSoundEngine@@QAE?AW4TSoundEngineState@@XZ @ 95 NONAME ; enum TSoundEngineState CSoundEngine::State(void)
-	?Stop@CSoundEngine@@QAEXH@Z @ 96 NONAME ; void CSoundEngine::Stop(int)
-	?Title@CFeedInfo@@QBEABVTDesC16@@XZ @ 97 NONAME ; class TDesC16 const & CFeedInfo::Title(void) const
-	?Title@CShowInfo@@QBEABVTDesC16@@XZ @ 98 NONAME ; class TDesC16 const & CShowInfo::Title(void) const
-	?TrackNo@CShowInfo@@QBEIXZ @ 99 NONAME ; unsigned int CShowInfo::TrackNo(void) const
-	?Uid@CShowInfo@@QBEIXZ @ 100 NONAME ; unsigned int CShowInfo::Uid(void) const
-	?SNAPNames@CPodcastModel@@QAEPAVCDesC16ArrayFlat@@XZ @ 101 NONAME ; class CDesC16ArrayFlat * CPodcastModel::SNAPNames(void)
-	?UpdateAutomatically@CSettingsEngine@@QAE?AW4TAutoUpdateSetting@@XZ @ 102 NONAME ; enum TAutoUpdateSetting CSettingsEngine::UpdateAutomatically(void)
-	?UpdateFeed@CFeedEngine@@QAEXPAVCFeedInfo@@@Z @ 103 NONAME ; void CFeedEngine::UpdateFeed(class CFeedInfo *)
-	?UpdateFeedInterval@CSettingsEngine@@QAEHXZ @ 104 NONAME ; int CSettingsEngine::UpdateFeedInterval(void)
-	?UpdateFeedL@CFeedEngine@@QAEHI@Z @ 105 NONAME ; int CFeedEngine::UpdateFeedL(unsigned int)
-	?UpdateFeedTime@CSettingsEngine@@QAE?AVTTime@@XZ @ 106 NONAME ; class TTime CSettingsEngine::UpdateFeedTime(void)
-	?AddDownloadL@CShowEngine@@QAEXAAVCShowInfo@@@Z @ 107 NONAME ; void CShowEngine::AddDownloadL(class CShowInfo &)
-	?Url@CFeedInfo@@QBEABVTDesC16@@XZ @ 108 NONAME ; class TDesC16 const & CFeedInfo::Url(void) const
-	?Url@CShowInfo@@QBEABVTDesC16@@XZ @ 109 NONAME ; class TDesC16 const & CShowInfo::Url(void) const
-	?RemoveFeedL@CFeedEngine@@QAEXI@Z @ 110 NONAME ; void CFeedEngine::RemoveFeedL(unsigned int)
-	??1CShowEngine@@UAE@XZ @ 111 NONAME ; CShowEngine::~CShowEngine(void)
-	?DBGetShowByFileNameL@CShowEngine@@QAEPAVCShowInfo@@V?$TBuf@$0BAA@@@@Z @ 112 NONAME ; class CShowInfo * CShowEngine::DBGetShowByFileNameL(class TBuf<256>)
-	?DeleteOldShowsByFeed@CShowEngine@@QAEXI@Z @ 113 NONAME ; void CShowEngine::DeleteOldShowsByFeed(unsigned int)
-	?GetAllShowsL@CShowEngine@@QAEXAAV?$RPointerArray@VCShowInfo@@@@@Z @ 114 NONAME ; void CShowEngine::GetAllShowsL(class RPointerArray<class CShowInfo> &)
-	?GetNewShowsL@CShowEngine@@QAEXAAV?$RPointerArray@VCShowInfo@@@@@Z @ 115 NONAME ; void CShowEngine::GetNewShowsL(class RPointerArray<class CShowInfo> &)
-	?GetNextShowByTrackL@CShowEngine@@QAEPAVCShowInfo@@PAV2@@Z @ 116 NONAME ; class CShowInfo * CShowEngine::GetNextShowByTrackL(class CShowInfo *)
-	?GetNumDownloadingShows@CShowEngine@@QAEHXZ @ 117 NONAME ; int CShowEngine::GetNumDownloadingShows(void)
-	?GetShowsByFeedL@CShowEngine@@QAEXAAV?$RPointerArray@VCShowInfo@@@@I@Z @ 118 NONAME ; void CShowEngine::GetShowsByFeedL(class RPointerArray<class CShowInfo> &, unsigned int)
-	?GetShowsDownloadedL@CShowEngine@@QAEXAAV?$RPointerArray@VCShowInfo@@@@@Z @ 119 NONAME ; void CShowEngine::GetShowsDownloadedL(class RPointerArray<class CShowInfo> &)
-	?GetShowsDownloadingL@CShowEngine@@QAEXAAV?$RPointerArray@VCShowInfo@@@@@Z @ 120 NONAME ; void CShowEngine::GetShowsDownloadingL(class RPointerArray<class CShowInfo> &)
-	?MetaDataReader@CShowEngine@@QAEAAVCMetaDataReader@@XZ @ 121 NONAME ; class CMetaDataReader & CShowEngine::MetaDataReader(void)
-	?NewL@CShowEngine@@SAPAV1@AAVCPodcastModel@@@Z @ 122 NONAME ; class CShowEngine * CShowEngine::NewL(class CPodcastModel &)
-	?NewLC@CShowInfo@@SAPAV1@I@Z @ 123 NONAME ; class CShowInfo * CShowInfo::NewLC(unsigned int)
-	?NotifyShowListUpdatedL@CShowEngine@@QAEXXZ @ 124 NONAME ; void CShowEngine::NotifyShowListUpdatedL(void)
-	?CancelUpdateAllFeeds@CFeedEngine@@QAEXXZ @ 125 NONAME ; void CFeedEngine::CancelUpdateAllFeeds(void)
-	?ConnectionEngine@CPodcastModel@@QAEAAVCConnectionEngine@@XZ @ 126 NONAME ; class CConnectionEngine & CPodcastModel::ConnectionEngine(void)
-	?SetLastError@CFeedInfo@@QAEXH@Z @ 127 NONAME ; void CFeedInfo::SetLastError(int)
-	?SetLastError@CShowInfo@@QAEXH@Z @ 128 NONAME ; void CShowInfo::SetLastError(int)
-	?LastError@CFeedInfo@@QBEHXZ @ 129 NONAME ; int CFeedInfo::LastError(void) const
-	?LastError@CShowInfo@@QBEHXZ @ 130 NONAME ; int CShowInfo::LastError(void) const
-	?AddSearchResultL@CFeedEngine@@QAEXPAVCFeedInfo@@@Z @ 131 NONAME ; void CFeedEngine::AddSearchResultL(class CFeedInfo *)
-	?GetSearchResults@CFeedEngine@@QAEABV?$RPointerArray@VCFeedInfo@@@@XZ @ 132 NONAME ; class RPointerArray<class CFeedInfo> const & CFeedEngine::GetSearchResults(void)
-	?GetStatsByFeed@CFeedEngine@@QAEXIAAI0@Z @ 133 NONAME ; void CFeedEngine::GetStatsByFeed(unsigned int, unsigned int &, unsigned int &)
-	?SearchForFeedL@CFeedEngine@@QAEXAAVTDesC16@@@Z @ 134 NONAME ; void CFeedEngine::SearchForFeedL(class TDesC16 &)
-	?AddFeedL@CFeedEngine@@QAEHABVCFeedInfo@@@Z @ 135 NONAME ; int CFeedEngine::AddFeedL(class CFeedInfo const &)
-	?BuildDate@CFeedInfo@@QBE?AVTTime@@XZ @ 136 NONAME ; class TTime CFeedInfo::BuildDate(void) const
-	?CopyL@CFeedInfo@@QBEPAV1@XZ @ 137 NONAME ; class CFeedInfo * CFeedInfo::CopyL(void) const
-	?CustomTitle@CFeedInfo@@QBEHXZ @ 138 NONAME ; int CFeedInfo::CustomTitle(void) const
-	?LastUpdated@CFeedInfo@@QBE?AVTTime@@XZ @ 139 NONAME ; class TTime CFeedInfo::LastUpdated(void) const
-	?Uid@CFeedInfo@@QBEIXZ @ 140 NONAME ; unsigned int CFeedInfo::Uid(void) const
-	?AddShowL@CShowEngine@@QAEHABVCShowInfo@@@Z @ 141 NONAME ; int CShowEngine::AddShowL(class CShowInfo const &)
-	?DownloadState@CShowInfo@@QBE?AW4TDownloadState@@XZ @ 142 NONAME ; enum TDownloadState CShowInfo::DownloadState(void) const
-	?FeedUid@CShowInfo@@QBEIXZ @ 143 NONAME ; unsigned int CShowInfo::FeedUid(void) const
-	?PlayState@CShowInfo@@QBE?AW4TPlayState@@XZ @ 144 NONAME ; enum TPlayState CShowInfo::PlayState(void) const
-	?ShowSize@CShowInfo@@QBEIXZ @ 145 NONAME ; unsigned int CShowInfo::ShowSize(void) const
-	?ShowType@CShowInfo@@QBE?AW4TShowType@@XZ @ 146 NONAME ; enum TShowType CShowInfo::ShowType(void) const
-	?UpdateShow@CShowEngine@@QAEXAAVCShowInfo@@@Z @ 147 NONAME ; void CShowEngine::UpdateShow(class CShowInfo &)
-	?UpdateIAPListL@CPodcastModel@@QAEXXZ @ 148 NONAME ; void CPodcastModel::UpdateIAPListL(void)
-	?UpdateSNAPListL@CPodcastModel@@QAEXXZ @ 149 NONAME ; void CPodcastModel::UpdateSNAPListL(void)
-	?SNAPIds@CPodcastModel@@QAEAAV?$RArray@VTPodcastIAPItem@@@@XZ @ 150 NONAME ; class RArray<class TPodcastIAPItem> & CPodcastModel::SNAPIds(void)
-	?UpdateAllFeedsL@CFeedEngine@@QAEXH@Z @ 151 NONAME ; void CFeedEngine::UpdateAllFeedsL(int)
-	?CleanHtmlL@PodcastUtils@@SAXAAVTDes16@@@Z @ 152 NONAME ; void PodcastUtils::CleanHtmlL(class TDes16 &)
-	?DownloadSuspended@CSettingsEngine@@QAEHXZ @ 153 NONAME ; int CSettingsEngine::DownloadSuspended(void)
-	?EnsureProperPathName@PodcastUtils@@SAXAAV?$TBuf@$0BAA@@@@Z @ 154 NONAME ; void PodcastUtils::EnsureProperPathName(class TBuf<256> &)
-	?FileNameFromUrl@PodcastUtils@@SAXABVTDesC16@@AAV?$TBuf@$0BAA@@@@Z @ 155 NONAME ; void PodcastUtils::FileNameFromUrl(class TDesC16 const &, class TBuf<256> &)
-	?IsFirstStartup@CPodcastModel@@QAEHXZ @ 156 NONAME ; int CPodcastModel::IsFirstStartup(void)
-	?OpmlParsingComplete@CFeedEngine@@QAEXI@Z @ 157 NONAME ; void CFeedEngine::OpmlParsingComplete(unsigned int)
-	?ReplaceChar@PodcastUtils@@SAXAAVTDes16@@II@Z @ 158 NONAME ; void PodcastUtils::ReplaceChar(class TDes16 &, unsigned int, unsigned int)
-	?ReplaceString@PodcastUtils@@SAXAAVTDes16@@ABVTDesC16@@1@Z @ 159 NONAME ; void PodcastUtils::ReplaceString(class TDes16 &, class TDesC16 const &, class TDesC16 const &)
-	?SQLEncode@PodcastUtils@@SAXAAVTDes16@@@Z @ 160 NONAME ; void PodcastUtils::SQLEncode(class TDes16 &)
-	?SetDownloadSuspended@CSettingsEngine@@QAEXH@Z @ 161 NONAME ; void CSettingsEngine::SetDownloadSuspended(int)
-	?SuspendDownloads@CShowEngine@@QAEXXZ @ 162 NONAME ; void CShowEngine::SuspendDownloads(void)
-	?XMLEncode@PodcastUtils@@SAXAAVTDes16@@@Z @ 163 NONAME ; void PodcastUtils::XMLEncode(class TDes16 &)
-	?FeedIcon@CFeedInfo@@QBEPAVCFbsBitmap@@XZ @ 164 NONAME ; class CFbsBitmap * CFeedInfo::FeedIcon(void) const
-	?SetFeedIcon@CFeedInfo@@QAEXPAVCFbsBitmap@@@Z @ 165 NONAME ; void CFeedInfo::SetFeedIcon(class CFbsBitmap *)
-	??1CImageHandler@@UAE@XZ @ 166 NONAME ; CImageHandler::~CImageHandler(void)
-	?LoadFileAndScaleL@CImageHandler@@QAEXPAVCFbsBitmap@@ABV?$TBuf@$0BAA@@@ABVTSize@@AAVMImageHandlerCallback@@H@Z @ 167 NONAME ; void CImageHandler::LoadFileAndScaleL(class CFbsBitmap *, class TBuf<256> const &, class TSize const &, class MImageHandlerCallback &, int)
-	?NewL@CImageHandler@@SAPAV1@AAVRFs@@@Z @ 168 NONAME ; class CImageHandler * CImageHandler::NewL(class RFs &)
-	?NewLC@CImageHandler@@SAPAV1@AAVRFs@@@Z @ 169 NONAME ; class CImageHandler * CImageHandler::NewLC(class RFs &)
-	?ScaledBitmap@CImageHandler@@QAEPAVCFbsBitmap@@XZ @ 170 NONAME ; class CFbsBitmap * CImageHandler::ScaledBitmap(void)
-	?ImageHandler@CPodcastModel@@QAEAAVCImageHandler@@XZ @ 171 NONAME ; class CImageHandler & CPodcastModel::ImageHandler(void)
-
diff -r 43e204e6ae2e -r e7b10d6d7ba3 engine/group/engine.mmp
--- a/engine/group/engine.mmp	Fri Mar 12 00:20:10 2010 +0000
+++ b/engine/group/engine.mmp	Fri Mar 12 09:34:08 2010 +0000
@@ -37,7 +37,6 @@
 SOURCE			FeedParser.cpp 
 SOURCE			FeedEngine.cpp 
 SOURCE			ShowInfo.cpp
-SOURCE			SoundEngine.cpp
 SOURCE			FeedInfo.cpp
 SOURCE			FeedTimer.cpp
 SOURCE			ShowEngine.cpp
diff -r 43e204e6ae2e -r e7b10d6d7ba3 engine/inc/ConnectionEngine.h
--- a/engine/inc/ConnectionEngine.h	Fri Mar 12 00:20:10 2010 +0000
+++ b/engine/inc/ConnectionEngine.h	Fri Mar 12 09:34:08 2010 +0000
@@ -90,7 +90,7 @@
 	// UI Setting
 	TBool ConnectionSettingL();
 	
-	void ReportConnection(TInt aError);
+	void ReportConnectionL(TInt aError);
 	void ReportConnectionSelectionStart();
 	void ReportConnectionSelectionEnd();
 	
diff -r 43e204e6ae2e -r e7b10d6d7ba3 engine/inc/FeedEngine.h
--- a/engine/inc/FeedEngine.h	Fri Mar 12 00:20:10 2010 +0000
+++ b/engine/inc/FeedEngine.h	Fri Mar 12 09:34:08 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);
 
 		
diff -r 43e204e6ae2e -r e7b10d6d7ba3 engine/inc/MetaDataReaderObserver.h
--- a/engine/inc/MetaDataReaderObserver.h	Fri Mar 12 00:20:10 2010 +0000
+++ b/engine/inc/MetaDataReaderObserver.h	Fri Mar 12 09:34:08 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;
 };
 
diff -r 43e204e6ae2e -r e7b10d6d7ba3 engine/inc/PodcastModel.h
--- a/engine/inc/PodcastModel.h	Fri Mar 12 00:20:10 2010 +0000
+++ b/engine/inc/PodcastModel.h	Fri Mar 12 09:34:08 2010 +0000
@@ -36,7 +36,6 @@
 //#define DONT_SORT_SQL
 class RCmManager;
 class CFeedEngine;
-class CSoundEngine;
 class CShowEngine;
 class CSettingsEngine;
 class CCommsDatabase;
@@ -60,7 +59,6 @@
 	IMPORT_C ~CPodcastModel();
 	IMPORT_C CFeedEngine& FeedEngine();
 	IMPORT_C CShowEngine& ShowEngine();
-	IMPORT_C CSoundEngine& SoundEngine();
 	IMPORT_C CSettingsEngine& SettingsEngine();
 	IMPORT_C CConnectionEngine& ConnectionEngine();
 	IMPORT_C CShowInfo* PlayingPodcast();
@@ -93,7 +91,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();
@@ -108,7 +106,6 @@
    
    CFeedEngine* iFeedEngine;
    CShowEngine* iShowEngine;
-   CSoundEngine* iSoundEngine;
    CSettingsEngine *iSettingsEngine;
    CConnectionEngine* iConnectionEngine;
    RShowInfoArray iActiveShowList;
diff -r 43e204e6ae2e -r e7b10d6d7ba3 engine/inc/ShowEngine.h
--- a/engine/inc/ShowEngine.h	Fri Mar 12 00:20:10 2010 +0000
+++ b/engine/inc/ShowEngine.h	Fri Mar 12 09:34:08 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);
diff -r 43e204e6ae2e -r e7b10d6d7ba3 engine/src/ConnectionEngine.cpp
--- a/engine/src/ConnectionEngine.cpp	Fri Mar 12 00:20:10 2010 +0000
+++ b/engine/src/ConnectionEngine.cpp	Fri Mar 12 09:34:08 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)
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;i<iObservers.Count();i++) 
 		{
 		TRAP_IGNORE(iObservers[i]->FeedDownloadFinishedL(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<iObservers.Count();i++) 
 		{
diff -r 43e204e6ae2e -r e7b10d6d7ba3 engine/src/MetaDataReader.cpp
--- a/engine/src/MetaDataReader.cpp	Fri Mar 12 00:20:10 2010 +0000
+++ b/engine/src/MetaDataReader.cpp	Fri Mar 12 09:34:08 2010 +0000
@@ -148,7 +148,7 @@
 		buf = NULL;
 	}
 
-	iObserver.ReadMetaData(*iShow);
+	TRAP_IGNORE(iObserver.ReadMetaDataL(*iShow));
 	iPlayer->Stop();
 	iShow = NULL;
 	TRAP_IGNORE(ParseNextShowL());
diff -r 43e204e6ae2e -r e7b10d6d7ba3 engine/src/OpmlParser.cpp
--- a/engine/src/OpmlParser.cpp	Fri Mar 12 00:20:10 2010 +0000
+++ b/engine/src/OpmlParser.cpp	Fri Mar 12 09:34:08 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*/)
diff -r 43e204e6ae2e -r e7b10d6d7ba3 engine/src/PodcastModel.cpp
--- a/engine/src/PodcastModel.cpp	Fri Mar 12 00:20:10 2010 +0000
+++ b/engine/src/PodcastModel.cpp	Fri Mar 12 09:34:08 2010 +0000
@@ -19,7 +19,6 @@
 #include <commdb.h>
 #include "PodcastModel.h"
 #include "FeedEngine.h"
-#include "SoundEngine.h"
 #include "SettingsEngine.h"
 #include "ShowEngine.h"
 #include "connectionengine.h"
@@ -45,7 +44,6 @@
 {
 	
 	delete iFeedEngine;
-	delete iSoundEngine;
 	delete iSettingsEngine;
 	delete iShowEngine;
 
@@ -89,7 +87,6 @@
 	iFeedEngine = CFeedEngine::NewL(*this);
 	iShowEngine = CShowEngine::NewL(*this);
 
-	iSoundEngine = CSoundEngine::NewL(*this);	
 	DP("CPodcastModel::ConstructL END");
 }
 
@@ -199,11 +196,6 @@
 	return *iShowEngine;
 }
 
-EXPORT_C CSoundEngine& CPodcastModel::SoundEngine()
-{
-	return *iSoundEngine;
-}
-
 EXPORT_C CSettingsEngine& CPodcastModel::SettingsEngine()
 {
 	return *iSettingsEngine;
@@ -216,40 +208,8 @@
 
 EXPORT_C void CPodcastModel::PlayPausePodcastL(CShowInfo* aPodcast, TBool aPlayOnInit) 
 	{
-	
-	// special treatment if this podcast is already active
-	if (iPlayingPodcast->Uid() == aPodcast->Uid() && SoundEngine().State() > ESoundEngineOpening ) {
-		if (aPodcast->PlayState() == EPlaying) {
-			SoundEngine().Pause();
-			aPodcast->SetPosition(iSoundEngine->Position());
-			aPodcast->SetPlayState(EPlayed);
-			aPodcast->SetPlayState(EPlayed);
-		} else {
-			iSoundEngine->Play();
-		}
-	} else {
-		// switching file, so save position
-		iSoundEngine->Pause();
-		if (iPlayingPodcast != NULL) {
-			iPlayingPodcast->SetPosition(iSoundEngine->Position());
-		}
-		
-		iSoundEngine->Stop(EFalse);
-
-		// we play video podcasts through the external player
-		if(aPodcast != NULL && aPodcast->ShowType() != EVideoPodcast) {
-			DP1("Starting: %S", &(aPodcast->FileName()));
-			TRAPD( error, iSoundEngine->OpenFileL(aPodcast->FileName(), aPlayOnInit) );
-			if (error != KErrNone) {
-				DP1("Error: %d", error);
-			} else {
-				iSoundEngine->SetPosition(aPodcast->Position().Int64() / 1000000);
-			}
-		}
-
-		iPlayingPodcast = aPodcast;		
+	// TODO: interact with MPX
 	}
-}
 
 EXPORT_C CFeedInfo* CPodcastModel::ActiveFeedInfo()
 {
@@ -408,12 +368,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]);
 		}
 	}
 	}
diff -r 43e204e6ae2e -r e7b10d6d7ba3 engine/src/SettingsEngine.cpp
--- a/engine/src/SettingsEngine.cpp	Fri Mar 12 00:20:10 2010 +0000
+++ b/engine/src/SettingsEngine.cpp	Fri Mar 12 09:34:08 2010 +0000
@@ -19,7 +19,6 @@
 #include <bautils.h>
 #include <s32file.h>
 #include "SettingsEngine.h"
-#include "SoundEngine.h"
 #include "FeedEngine.h"
 #include "ShowEngine.h"
 
diff -r 43e204e6ae2e -r e7b10d6d7ba3 engine/src/ShowEngine.cpp
--- a/engine/src/ShowEngine.cpp	Fri Mar 12 00:20:10 2010 +0000
+++ b/engine/src/ShowEngine.cpp	Fri Mar 12 09:34:08 2010 +0000
@@ -24,7 +24,6 @@
 #include "SettingsEngine.h"
 #include <e32hashtab.h>
 #include <httperr.h>
-#include "SoundEngine.h"
 #include "debug.h"
 #include "PodcastUtils.h"
 
@@ -115,7 +114,7 @@
 	DP("CShowEngine::ResumeDownloadsL END");
 	}
 
-EXPORT_C void CShowEngine::RemoveAllDownloads()
+EXPORT_C void CShowEngine::RemoveAllDownloadsL()
 	{
 	if (!iPodcastModel.SettingsEngine().DownloadSuspended())
 		{
@@ -145,7 +144,7 @@
 	if (info != NULL)
 		{
 		info->SetDownloadState(ENotDownloaded);
-		DBUpdateShow(*info);
+		DBUpdateShowL(*info);
 		delete info;
 		}
 	DBRemoveDownload(aUid);
@@ -231,7 +230,7 @@
 
 	if (showInfo == NULL)
 		{
-		DBAddShow(aItem);
+		DBAddShowL(aItem);
 		return ETrue;
 		}
 	else
@@ -299,7 +298,7 @@
 					}
 
 				iShowDownloading->SetDownloadState(EDownloaded);
-				DBUpdateShow(*iShowDownloading);
+				DBUpdateShowL(*iShowDownloading);
 				DBRemoveDownload(iShowDownloading->Uid());
 				AddShowToMpxCollection(*iShowDownloading);				
 				NotifyShowFinishedL(aError);
@@ -313,7 +312,7 @@
 				if(aError >= HTTPStatus::EBadRequest && aError <= HTTPStatus::EBadRequest+200)
 					{
 					iShowDownloading->SetDownloadState(EFailedDownload);
-					DBUpdateShow(*iShowDownloading);
+					DBUpdateShowL(*iShowDownloading);
 					DBRemoveDownload(iShowDownloading->Uid());
 					NotifyShowFinishedL(aError);
 
@@ -323,7 +322,7 @@
 				else // other kind of error, missing network etc, reque this show
 					{
 					iShowDownloading->SetDownloadState(EQueued);
-					DBUpdateShow(*iShowDownloading);
+					DBUpdateShowL(*iShowDownloading);
 					}
 
 				iDownloadErrors++;
@@ -343,7 +342,7 @@
 			if(iShowDownloading)
 				{
 				iShowDownloading->SetDownloadState(EQueued);
-				DBUpdateShow(*iShowDownloading);
+				DBUpdateShowL(*iShowDownloading);
 				}
 			iPodcastModel.SettingsEngine().SetDownloadSuspended(ETrue);
 			NotifyShowFinishedL(aError);
@@ -734,7 +733,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 +803,7 @@
 	sqlite3_finalize(st);
 	}
 
-TBool CShowEngine::DBUpdateShow(CShowInfo& aItem)
+TBool CShowEngine::DBUpdateShowL(CShowInfo& aItem)
 	{
 	DP1("CShowEngine::DBUpdateShow, title='%S'", &aItem.Title());
 
@@ -1058,21 +1057,16 @@
 		}
 	}
 
-EXPORT_C void CShowEngine::DeletePlayedShows(RShowInfoArray &aShowInfoArray)
+EXPORT_C void CShowEngine::DeletePlayedShowsL(RShowInfoArray &aShowInfoArray)
 	{
 	for (TInt i = 0; i < aShowInfoArray.Count(); i++)
 		{
 		if (aShowInfoArray[i]->PlayState() == EPlayed
 				&& aShowInfoArray[i]->FileName().Length() > 0)
 			{
-			if (CompareShowsByUid(*(iPodcastModel.PlayingPodcast()), *(aShowInfoArray[i]))
-					&& iPodcastModel.SoundEngine().State() != ESoundEngineNotInitialized)
-				{
-				iPodcastModel.SoundEngine().Stop();
-				}
 			BaflUtils::DeleteFile(iPodcastModel.FsSession(), aShowInfoArray[i]->FileName());
 			aShowInfoArray[i]->SetDownloadState(ENotDownloaded);
-			DBUpdateShow(*aShowInfoArray[i]);
+			DBUpdateShowL(*aShowInfoArray[i]);
 			}
 		}
 	}
@@ -1116,7 +1110,7 @@
 			}
 		
 		info->SetDownloadState(ENotDownloaded);
-		DBUpdateShow(*info);
+		DBUpdateShowL(*info);
 		delete info;
 		}
 	}
@@ -1159,7 +1153,7 @@
 EXPORT_C void CShowEngine::AddDownloadL(CShowInfo& aInfo)
 	{
 	aInfo.SetDownloadState(EQueued);
-	DBUpdateShow(aInfo);
+	DBUpdateShowL(aInfo);
 	DBAddDownload(aInfo.Uid());
 	DownloadNextShowL();
 	}
@@ -1200,7 +1194,7 @@
 				DP1("CShowEngine::DownloadNextShow\tDownloading: %S", &(info->Title()));
 				info->SetDownloadState(EDownloading);
 				info->SetLastError(KErrNone);
-				DBUpdateShow(*info);
+				DBUpdateShowL(*info);
 				iShowDownloading = info;
 				// Inform the observers
 				// important to do this after we change download state
@@ -1211,7 +1205,7 @@
 					{
 					info->SetDownloadState(EFailedDownload);
 					DBRemoveDownload(info->Uid());
-					DBUpdateShow(*info);
+					DBUpdateShowL(*info);
 					info = DBGetNextDownloadL();
 					
 					if(info == NULL)
@@ -1271,10 +1265,10 @@
 		}
 	}
 
-void CShowEngine::ReadMetaData(CShowInfo& aShowInfo)
+void CShowEngine::ReadMetaDataL(CShowInfo& aShowInfo)
 	{
 	//DP1("Read %S", &(aShowInfo->Title()));
-	DBUpdateShow(aShowInfo);
+	DBUpdateShowL(aShowInfo);
 	}
 
 void CShowEngine::ReadMetaDataCompleteL()
@@ -1283,9 +1277,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()
diff -r 43e204e6ae2e -r e7b10d6d7ba3 test.txt
--- a/test.txt	Fri Mar 12 00:20:10 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Test file
-Lars Was HERE!!
\ No newline at end of file