diff -r f42c9de433f2 -r cc1be3797632 engine/inc/FeedEngine.h --- a/engine/inc/FeedEngine.h Wed Jul 07 23:27:49 2010 +0100 +++ b/engine/inc/FeedEngine.h Fri Jul 09 11:34:00 2010 +0100 @@ -47,11 +47,13 @@ const TInt KMaxLineLength = 4096; const TInt KMaxSearchString = 30; -enum TClientState { +enum TFeedEngineState { EIdle, - EUpdatingFeed, - EUpdatingImage, - ESearching + EDownloadingFeed, + EParsingFeed, + EDownloadingImage, + ESearching, + EParsingOpml }; class CFeedEngine : public CBase, public MHttpClientObserver, public MFeedParserObserver @@ -81,7 +83,7 @@ /** * Returns the current internal state of the feed engine4 */ - IMPORT_C TClientState ClientState(); + IMPORT_C TFeedEngineState ClientState(); /** * Returns the current updating client UID if clientstate is != ENotUpdateing @@ -118,7 +120,6 @@ void UpdateNextFeedL(); void NotifyOpmlParsingCompleteL(TInt aError, TUint aNumFeedsAdded); - private: void DBLoadFeedsL(); @@ -132,7 +133,7 @@ private: CHttpClient* iFeedClient; - TClientState iClientState; + TFeedEngineState iEngineState; CFeedTimer iFeedTimer; CPodcastModel& iPodcastModel; @@ -152,8 +153,8 @@ RArray iObservers; // new feeds only add one show to download list when auto downloading - TBool newFeed; - TUint showsAdded; + TBool iNewFeed; + TUint iShowsAdded; sqlite3& iDB;