diff -r 896e9dbc5f19 -r 065198191975 qtinternetradio/ui/inc/irstationsview.h --- a/qtinternetradio/ui/inc/irstationsview.h Wed Aug 18 09:40:26 2010 +0300 +++ b/qtinternetradio/ui/inc/irstationsview.h Thu Sep 02 20:17:46 2010 +0300 @@ -22,7 +22,7 @@ #include "irqevent.h" class IRQPreset; -class IrChannelModel; +class IRChannelDataProvider; class QTimer; class IRStationsView : public IrAbstractListViewBase @@ -46,11 +46,7 @@ private slots: void presetResponse(IRQPreset *aPreset); - - void presetLogoDownload(IRQPreset* aPreset); - - void presetLogoDownloadError(); - + void networkRequestNotified(IRQNetworkEvent aEvent); void dataChanged(); @@ -58,9 +54,6 @@ //used for connect signal from isds client void operationException(IRQError aError); - //to start the convertion - void convertAnother(); - void connectTimeOut(); void cancelRequest(); @@ -70,22 +63,15 @@ void storeCurrentItem(); void handleItemSelected(); - void startConvert(int aIndex); - - void cleanupResource(); - void connectToIsdsClient(); void disconnectIsdsClient(); private: - IRQPreset *iLogoPreset; IRQPreset *iPreset; //the object is created by IsdsClient, but application is responsible for free int iLastSelectitem; - //the following are used to support the img - QList iIconIndexArray; - IrChannelModel *iChannelModel; + IRChannelDataProvider *iDataProvider; QTimer *iConnectTimer; friend class IRViewManager;