diff -r 6df133bd92e1 -r 075425b8d9a4 radioapp/radiouiengine/src/radiohistorymodel.cpp --- a/radioapp/radiouiengine/src/radiohistorymodel.cpp Fri Jun 04 10:21:36 2010 +0100 +++ b/radioapp/radiouiengine/src/radiohistorymodel.cpp Fri Jun 11 13:38:32 2010 +0300 @@ -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,7 +49,6 @@ */ RadioHistoryModel::~RadioHistoryModel() { - Q_D( RadioHistoryModel ); delete d_ptr; } @@ -87,15 +86,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 ) @@ -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 );