--- a/radioapp/radiouiengine/src/radiohistorymodel.cpp	Fri Jun 11 16:24:13 2010 +0100
+++ b/radioapp/radiouiengine/src/radiohistorymodel.cpp	Thu Jul 22 16:33:45 2010 +0100
@@ -35,9 +35,9 @@
     QAbstractListModel( &uiEngine ),
     d_ptr( new RadioHistoryModelPrivate( this, uiEngine ) )
 {
-    connectAndTest( &uiEngine,  SIGNAL(tunedToFrequency(uint,int)),
+    Radio::connect( &uiEngine,  SIGNAL(tunedToFrequency(uint,int)),
                     this,       SLOT(resetCurrentSong()) );
-    connectAndTest( &uiEngine,  SIGNAL(seekingStarted(int)),
+    Radio::connect( &uiEngine,  SIGNAL(seekingStarted(int)),
                     this,       SLOT(resetCurrentSong()) );
 
     Q_D( RadioHistoryModel );
@@ -49,8 +49,6 @@
  */
 RadioHistoryModel::~RadioHistoryModel()
 {
-    Q_D( RadioHistoryModel );
-    delete d_ptr;
 }
 
 /*!
@@ -87,15 +85,6 @@
 }
 
 /*!
- * Public slot
- */
-void RadioHistoryModel::removeAll()
-{
-    Q_D( RadioHistoryModel );
-    d->removeAll();
-}
-
-/*!
  * Sets the icons to be used in the list
  */
 void RadioHistoryModel::setIcons( const QIcon& nonTaggedIcon, const QIcon& taggedIcon )
@@ -131,6 +120,7 @@
 {
     Q_D( RadioHistoryModel );
     d->setViewMode( showTagged ? RadioHistoryModelPrivate::ShowTagged : RadioHistoryModelPrivate::ShowAll );
+    reset();
 }
 
 /*!
@@ -154,6 +144,15 @@
 /*!
  *
  */
+void RadioHistoryModel::removeAll( bool removeTagged )
+{
+    Q_D( RadioHistoryModel );
+    d->removeAll( removeTagged );
+}
+
+/*!
+ *
+ */
 void RadioHistoryModel::addItem( const QString& artist, const QString& title, const RadioStation& station )
 {
     Q_D( RadioHistoryModel );