--- a/radioapp/radiowidgets/inc/radiostationsview.h	Fri Apr 16 14:58:55 2010 +0300
+++ b/radioapp/radiowidgets/inc/radiostationsview.h	Mon May 03 12:31:41 2010 +0300
@@ -20,6 +20,7 @@
 
 // System includes
 #include <HbIcon>
+#include <QScopedPointer>
 
 // User includes
 #include "radioviewbase.h"
@@ -45,7 +46,8 @@
 
 public:
 
-    explicit RadioStationsView( RadioXmlUiLoader* uiLoader );
+    explicit RadioStationsView();
+    ~RadioStationsView();
 
     void setNowPlayingIcon( const HbIcon& nowPlayingIcon );
     HbIcon nowPlayingIcon() const;
@@ -57,17 +59,20 @@
 
     void listItemClicked( const QModelIndex& index );
     void listItemLongPressed( HbAbstractViewItem* item, const QPointF& coords );
-    void updateHeadsetStatus( bool connected );
+    void updateAntennaStatus( bool connected );
     void updateCurrentStation();
     void deckButtonPressed();
-    void startScanAndSavePresets();
+    void startScanning();
     void updateControlVisibilities();
+    void rename();          //contextmenu
+    void toggleFavorite();  //contextmenu
+    void deleteStation();   //contextmenu
 
 private:
 
 // from base class RadioViewBase
 
-    void init( RadioMainWindow* aMainWindow, RadioStationModel* aModel );
+    void init( RadioXmlUiLoader* uiLoader, RadioMainWindow* mainWindow );
 
 // from base class QGraphicsWidget
 
@@ -77,25 +82,26 @@
 
     void initListView();
 
-    void updateHeading();
-
 private: //data
 
-    RadioStationFilterModel*    mFilterModel;
+    RadioStationModel*              mModel;
+
+    RadioStationFilterModel*        mFilterModel;
 
-    HbAction*                   mScanStationsAction;
-    HbAction*                   mRemoveAllPresetsAction;
+    HbAction*                       mScanStationsAction;
+    HbAction*                       mClearListAction;
 
-    HbListView*                 mStationsList;
+    HbListView*                     mStationsList;
 
-    RadioBannerLabel*           mHeadingBanner;
+    RadioBannerLabel*               mHeadingBanner;
+
+    HbAction*                       mFavoritesButton;
+    HbAction*                       mLocalStationsButton;
 
-    HbAction*                   mFavoritesButton;
-    HbAction*                   mLocalStationsButton;
+    HbIcon                          mFavoriteIcon;
+    HbIcon                          mNowPlayingIcon;
 
-    HbIcon                      mFavoriteIcon;
-
-    HbIcon                      mNowPlayingIcon;
+    QScopedPointer<RadioStation>    mSelectedStation;
 
 };