--- a/radioapp/radiouiengine/src/radiostation.cpp Fri Apr 16 14:58:55 2010 +0300
+++ b/radioapp/radiouiengine/src/radiostation.cpp Mon May 03 12:31:41 2010 +0300
@@ -67,7 +67,7 @@
QString RadioStation::parseFrequency( uint frequency )
{
QString freqString;
- freqString.sprintf( "%.2f", qreal( frequency ) / KFrequencyMultiplier );
+ freqString.sprintf( "%.1f", qreal( frequency ) / KFrequencyMultiplier );
return freqString;
}
@@ -169,7 +169,7 @@
{
// Name emptiness is checked because this name setter is used by incoming RDS PS name
// and empty names should be ignored
- if ( !name.isEmpty() && mData->mName.compare( name ) != 0 ) {
+ if ( !name.isEmpty() && !mData->mRenamedByUser && mData->mName.compare( name ) != 0 ) {
detach();
mData->mName = name.trimmed();
mData->mChangeFlags |= RadioStation::PersistentDataChanged | RadioStation::NameChanged;
@@ -347,7 +347,7 @@
*/
QString RadioStation::name() const
{
- return mData->mName;
+ return mData->mName.isEmpty() ? "" : mData->mName;
}
/*!