--- a/radioapp/radiowidgets/inc/radioviewbase.h	Fri Mar 19 09:29:04 2010 +0200
+++ b/radioapp/radiowidgets/inc/radioviewbase.h	Fri Apr 16 14:58:55 2010 +0300
@@ -19,10 +19,10 @@
 #define _RADIOVIEWBASE_H_
 
 // System includes
-#include <hbview.h>
+#include <HbView>
 
 //#define QT_SHAREDPOINTER_TRACK_POINTERS // Debugging support for QSharedPointer
-#include <qsharedpointer>
+#include <QSharedPointer>
 
 // User includes
 
@@ -56,9 +56,6 @@
 
     bool isTransient() const;
 
-    virtual void initSecondarySoftkey();
-    HbAction* secondarySoftkey() const;
-
     void updateOrientation( Qt::Orientation orientation, bool forceUpdate = false );
 
 protected slots:
@@ -71,6 +68,8 @@
 
 // New functinos
 
+    void initBackAction();
+    
     HbAction* addMenuItem( const QString& aTitle, QObject* aRecipient, const char* aSlot );
 
     void connectCommonMenuItem( int menuItem );
@@ -115,11 +114,6 @@
     HbAction*                       	mUseLoudspeakerAction;
 
     /**
-     * Action for the secondary softkey. Used for "back" and "done" buttons
-     */
-    HbAction*                       	mSecondarySoftkeyction;
-
-    /**
      * View orientation.
      */
     Qt::Orientation                 	mOrientation;