diff -r af3740e3753f -r c5b304f4d89b mpdata/src/mpsongdata_p.cpp --- a/mpdata/src/mpsongdata_p.cpp Wed Aug 18 09:46:20 2010 +0300 +++ b/mpdata/src/mpsongdata_p.cpp Thu Sep 02 20:24:03 2010 +0300 @@ -146,79 +146,7 @@ QString MpSongDataPrivate::genre() const { TX_LOG - QString localizedString(mGenre); - - if ( mGenre == "Acoustic" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_acoustic" ); - } - else if ( mGenre == "Alternative" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_alternative" ); - } - else if ( mGenre == "Blues" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_blues" ); - } - else if ( mGenre == "Classical" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_classical" ); - } - else if ( mGenre == "Country" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_country" ); - } - else if ( mGenre == "Dance" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_dance" ); - } - else if ( mGenre == "Easy Listening" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_easy_listening" ); - } - else if ( mGenre == "Electronic" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_electronic" ); - } - else if ( mGenre == "Folk" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_folk" ); - } - else if ( mGenre == "Hip-Hop" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_hiphop" ); - } - else if ( mGenre == "Jazz" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_jazz" ); - } - else if ( mGenre == "Latin" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_latin" ); - } - else if ( mGenre == "Metal" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_metal" ); - } - else if ( mGenre == "New Age" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_new_age" ); - } - else if ( mGenre == "Other" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_other" ); - } - else if ( mGenre == "Pop" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_pop" ); - } - else if ( mGenre == "R&B" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_rb" ); - } - else if ( mGenre == "Rap" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_rap" ); - } - else if ( mGenre == "Reggae" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_reggae" ); - } - else if ( mGenre == "Rock" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_rock" ); - } - else if ( mGenre == "Soundtrack" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_soundtrack" ); - } - else if ( mGenre == "Spoken" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_spoken" ); - } - else if ( mGenre == "World" ) { - localizedString = hbTrId( "txt_mus_dblist_genre_val_world" ); - } - TX_EXIT_ARGS( "Logical String = " << localizedString ); - return localizedString; + return mGenre; } /*!