diff -r 04837bf3a628 -r 21be958eb3ce radioapp/radiouiengine/src/radiohistorymodel_p.cpp --- a/radioapp/radiouiengine/src/radiohistorymodel_p.cpp Tue Oct 12 11:25:14 2010 +0300 +++ b/radioapp/radiouiengine/src/radiohistorymodel_p.cpp Fri Oct 15 16:26:27 2010 +0300 @@ -33,7 +33,7 @@ #include "radiostation.h" #include "radiologger.h" -static const QLatin1String DATABASE_NAME ( "c:\\radioplayhistory.db" ); +static const QLatin1String DATABASE_NAME ( "radioplayhistory.db" ); static const QLatin1String DATABASE_DRIVER ( "QSQLITE" ); static const QLatin1String HISTORY_TABLE ( "history" ); static const QLatin1String SQL_CREATE_TABLE ( "CREATE TABLE history (" @@ -65,6 +65,7 @@ static const QLatin1String OR_ID_IS_FORMAT_STR (" OR id = %1"); static const int MAX_ID_COUNT_IN_QUERY = 5; +const int THOUSAND_HERTZ = 1000; #ifdef LOGGING_ENABLED # define GET_ERR( param ) GETSTRING( param.lastError().text() ) @@ -87,7 +88,6 @@ RadioUiEngine& uiEngine ) : q_ptr( model ), mUiEngine( uiEngine ), - mRtItemClass( -1 ), mTopItemIsPlaying( false ), mShowDetails( true ), mViewMode( ShowAll ) @@ -153,7 +153,7 @@ { LOG_FORMAT( "RadioHistoryModelPrivate::addItem. Artist: %s, Title: %s", GETSTRING( artist ), GETSTRING( title ) ); - if ( !mQueryModel ) { + if ( !mQueryModel || title.isEmpty() ) { return; } @@ -165,7 +165,7 @@ query.addBindValue( artist ); query.addBindValue( title ); query.addBindValue( station.name() ); - query.addBindValue( static_cast( station.frequency() / 1000 ) ); + query.addBindValue( static_cast( station.frequency() / THOUSAND_HERTZ ) ); query.addBindValue( fromRds ); query.addBindValue( QDateTime::currentDateTime().toTime_t() ); @@ -200,7 +200,7 @@ const QString title = record.value( RadioHistoryValue::Title ).toString(); const QString station = record.value( RadioHistoryValue::Station ).toString(); - const uint frequency = record.value( RadioHistoryValue::Frequency ).toUInt() * 1000; + const uint frequency = record.value( RadioHistoryValue::Frequency ).toUInt() * THOUSAND_HERTZ; QStringList list; if ( mShowDetails ) {