[OMPT-svn-commit] SF.net SVN: modplug:[3180] trunk/OpenMPT

[<man...@us...>]

Revision: 3180
          http://sourceforge.net/p/modplug/code/3180
Author:   manxorist
Date:     2013-11-10 17:47:59 +0000 (Sun, 10 Nov 2013)
Log Message:
-----------
[Ref] Convert credits string to ascii-escaped utf8. Fixes clang 3.3 warnings.

Modified Paths:
--------------
    trunk/OpenMPT/common/version.cpp
    trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
    trunk/OpenMPT/mptrack/Mptrack.cpp

Modified: trunk/OpenMPT/common/version.cpp
===================================================================
--- trunk/OpenMPT/common/version.cpp	2013-11-10 17:16:19 UTC (rev 3179)
+++ trunk/OpenMPT/common/version.cpp	2013-11-10 17:47:59 UTC (rev 3180)
@@ -283,12 +283,12 @@
 #else
 		"libopenmpt (based on OpenMPT / ModPlug Tracker)\n"
 #endif
-		"Copyright \xA9 2004-2013 Contributors\n"
-		"Copyright \xA9 1997-2003 Olivier Lapicque\n"
+		"Copyright \xC2\xA9 2004-2013 Contributors\n"
+		"Copyright \xC2\xA9 1997-2003 Olivier Lapicque\n"
 		"\n"
 		"Contributors:\n"
 		"Johannes Schultz (2008-2013)\n"
-		"Ahti Lepp\xE4nen (2005-2011, 2013)\n"
+		"Ahti Lepp\xC3\xA4nen (2005-2011, 2013)\n"
 		"Joern Heusipp (2012-2013)\n"
 		"Robin Fernandes (2004-2007)\n"
 		"Sergiy Pylypenko (2007)\n"

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp	2013-11-10 17:16:19 UTC (rev 3179)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp	2013-11-10 17:47:59 UTC (rev 3180)
@@ -70,11 +70,11 @@
 }
 
 static std::string get_credits_string() {
-	return mpt::String::Convert( MptVersion::GetFullCreditsString(), mpt::CharsetISO8859_1, mpt::CharsetUTF8 );
+	return MptVersion::GetFullCreditsString();
 }
 
 static std::string get_contact_string() {
-	return mpt::String::Convert( MptVersion::GetContactString(), mpt::CharsetISO8859_1, mpt::CharsetUTF8 );
+	return MptVersion::GetContactString();
 }
 
 std::string get_string( const std::string & key ) {

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2013-11-10 17:16:19 UTC (rev 3179)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2013-11-10 17:47:59 UTC (rev 3180)
@@ -1489,7 +1489,7 @@
 	SetDlgItemText(IDC_EDIT2, CString("Build Date: ") + MptVersion::GetBuildDateString().c_str());
 	SetDlgItemText(IDC_EDIT3, CString("OpenMPT ") + MptVersion::GetVersionStringExtended().c_str());
 	m_static.SubclassDlgItem(IDC_CREDITS,this);
-	m_static.SetCredits((mpt::String::Replace(MptVersion::GetFullCreditsString(), "\n", "|") + "|" + mpt::String::Replace(MptVersion::GetContactString(), "\n", "|" ) + "||||||").c_str());
+	m_static.SetCredits((mpt::String::Replace(mpt::String::Convert(MptVersion::GetFullCreditsString(), mpt::CharsetUTF8, mpt::CharsetLocale), "\n", "|") + "|" + mpt::String::Replace(MptVersion::GetContactString(), "\n", "|" ) + "||||||").c_str());
 	m_static.SetSpeed(DISPLAY_SLOW);
 	m_static.SetColor(BACKGROUND_COLOR, RGB(138, 165, 219)); // Background Colour
 	m_static.SetTransparent(); // Set parts of bitmaps with RGB(192,192,192) transparent
@@ -2149,4 +2149,4 @@
 {
 	if (m_pRecentFileList && nItem >= 0 && nItem < m_pRecentFileList->GetSize())
 		m_pRecentFileList->Remove(nItem);
-}
\ No newline at end of file
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.