--- a/radioapp/radiowidgets/inc/radiostationsview.h	Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/inc/radiostationsview.h	Fri Jun 11 13:38:32 2010 +0300
@@ -21,25 +21,25 @@
 // System includes
 #include <HbIcon>
 #include <QScopedPointer>
+#include <QPointer>
 
 // User includes
 #include "radioviewbase.h"
-#include "radiowidgetsexport.h"
 
 // Forward declarations
 class RadioWindow;
 class RadioStationModel;
 class HbListView;
 class HbPushButton;
-class RadioBannerLabel;
 class HbAbstractViewItem;
 class RadioUiLoader;
 class RadioStation;
 class RadioStationFilterModel;
 class RadioFrequencyScanner;
+class QSortFilterProxyModel;
 
 // Class declaration
-class WIDGETS_DLL_EXPORT RadioStationsView : public RadioViewBase
+class RadioStationsView : public RadioViewBase
 {
     Q_OBJECT
     Q_PROPERTY(HbIcon nowPlayingIcon READ nowPlayingIcon WRITE setNowPlayingIcon)
@@ -58,14 +58,13 @@
 
 private slots:
 
-    void listItemClicked( const QModelIndex& index );
-    void listItemLongPressed( HbAbstractViewItem* item, const QPointF& coords );
+    void handleClick( const QModelIndex& index );
+    void handleLongPress( HbAbstractViewItem* item, const QPointF& coords );
     void updateAntennaStatus( bool connected );
-    void updateCurrentStation();
-    void deckButtonPressed();
+    void updateViewMode();
     void startScanning();
     void finishScanning();
-    void updateControlVisibilities();
+    void updateVisibilities();
     void clearList();
     void rename();          // Called from context menu
     void toggleFavorite();  // Called from context menu
@@ -79,10 +78,6 @@
     void init();
     void userAccepted();
 
-// from base class QGraphicsWidget
-
-    void showEvent( QShowEvent* event );
-
 // New functions
 
     void initListView();
@@ -91,15 +86,13 @@
 
     RadioStationModel*                      mModel;
 
-    RadioStationFilterModel*                mFilterModel;
+    QPointer<QSortFilterProxyModel>         mFilterModel;
 
     HbAction*                               mScanStationsAction;
     HbAction*                               mClearListAction;
 
     HbListView*                             mStationsList;
 
-    RadioBannerLabel*                       mHeadingBanner;
-
     HbAction*                               mFavoritesButton;
     HbAction*                               mLocalStationsButton;