fix ambiguous ?: types

This commit is contained in:
Glenn Maynard
2004-08-06 21:01:28 +00:00
parent 6c56149963
commit 0c4f092fd3
19 changed files with 29 additions and 28 deletions
+6 -6
View File
@@ -85,12 +85,12 @@ void TextBanner::LoadFromSong( const Song* pSong )
{
Init();
CString sDisplayTitle = pSong ? pSong->GetDisplayMainTitle() : "";
CString sTranslitTitle = pSong ? pSong->GetTranslitMainTitle() : "";
CString sDisplaySubTitle = pSong ? pSong->GetDisplaySubTitle() : "";
CString sTranslitSubTitle = pSong ? pSong->GetTranslitSubTitle() : "";
CString sDisplayArtist = pSong ? (CString)ARTIST_PREPEND_STRING + pSong->GetDisplayArtist() : "";
CString sTranslitArtist = pSong ? (CString)ARTIST_PREPEND_STRING + pSong->GetTranslitArtist() : "";
CString sDisplayTitle = pSong ? pSong->GetDisplayMainTitle() : CString("");
CString sTranslitTitle = pSong ? pSong->GetTranslitMainTitle() : CString("");
CString sDisplaySubTitle = pSong ? pSong->GetDisplaySubTitle() : CString("");
CString sTranslitSubTitle = pSong ? pSong->GetTranslitSubTitle() : CString("");
CString sDisplayArtist = pSong ? (CString)ARTIST_PREPEND_STRING + pSong->GetDisplayArtist() : CString("");
CString sTranslitArtist = pSong ? (CString)ARTIST_PREPEND_STRING + pSong->GetTranslitArtist() : CString("");
LoadFromString(
sDisplayTitle, sTranslitTitle,