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

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

Revision: 5332
          http://sourceforge.net/p/modplug/code/5332
Author:   manxorist
Date:     2015-06-18 07:45:52 +0000 (Thu, 18 Jun 2015)
Log Message:
-----------
[Ref] More mpt::ustring.

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

Modified: trunk/OpenMPT/common/version.cpp
===================================================================
--- trunk/OpenMPT/common/version.cpp	2015-06-17 18:13:55 UTC (rev 5331)
+++ trunk/OpenMPT/common/version.cpp	2015-06-18 07:45:52 UTC (rev 5332)
@@ -417,20 +417,20 @@
 	return url + "@" + mpt::ToString(GetRevision()) + GetStateString();
 }
 
-std::string GetContactString()
+mpt::ustring GetContactString()
 {
-	return
+	return MPT_UTF8(
 		"Contact / Discussion:\n"
 		"http://forum.openmpt.org/\n"
 		"\n"
 		"Updates:\n"
 		"http://openmpt.org/download\n"
-		;
+		);
 }
 
-std::string GetFullCreditsString()
+mpt::ustring GetFullCreditsString()
 {
-	return
+	return mpt::ToUnicode(mpt::CharsetUTF8,
 #ifdef MODPLUG_TRACKER
 		"OpenMPT / ModPlug Tracker\n"
 #else
@@ -553,12 +553,12 @@
 		"ASIO Technology by Steinberg Media Technologies GmbH\n"
 		"\n"
 #endif
-		;
+		);
 }
 
-std::string GetLicenseString()
+mpt::ustring GetLicenseString()
 {
-	return
+	return MPT_UTF8(
 		"The OpenMPT code is licensed under the BSD license." "\n"
 		"" "\n"
 		"Copyright (c) 2004-2015, OpenMPT contributors" "\n"
@@ -586,7 +586,7 @@
 		"ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT" "\n"
 		"(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS" "\n"
 		"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." "\n"
-		;
+		);
 }
 
 } // namespace MptVersion

Modified: trunk/OpenMPT/common/version.h
===================================================================
--- trunk/OpenMPT/common/version.h	2015-06-17 18:13:55 UTC (rev 5331)
+++ trunk/OpenMPT/common/version.h	2015-06-18 07:45:52 UTC (rev 5332)
@@ -94,13 +94,13 @@
 	std::string GetVersionUrlString(); // e.g. "https://svn.code.sf.net/p/modplug/code/trunk/OpenMPT@1234+dirty"
 
 	// Returns a multi-line string containing the full credits for the code base
-	std::string GetFullCreditsString();
+	mpt::ustring GetFullCreditsString();
 
 	// Returns a multi-line string containing developer contact and community addresses
-	std::string GetContactString();
+	mpt::ustring GetContactString();
 
 	// Returns the OpenMPT license text
-	std::string GetLicenseString();
+	mpt::ustring GetLicenseString();
 
 } //namespace MptVersion
 

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp	2015-06-17 18:13:55 UTC (rev 5331)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp	2015-06-18 07:45:52 UTC (rev 5332)
@@ -89,15 +89,15 @@
 }
 
 static std::string get_credits_string() {
-	return MptVersion::GetFullCreditsString();
+	return mpt::ToCharset(mpt::CharsetUTF8, MptVersion::GetFullCreditsString());
 }
 
 static std::string get_contact_string() {
-	return MptVersion::GetContactString();
+	return mpt::ToCharset(mpt::CharsetUTF8, MptVersion::GetContactString());
 }
 
 static std::string get_license_string() {
-	return MptVersion::GetLicenseString();
+	return mpt::ToCharset(mpt::CharsetUTF8, MptVersion::GetLicenseString());
 }
 
 std::string get_string( const std::string & key ) {

Modified: trunk/OpenMPT/mptrack/AboutDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AboutDialog.cpp	2015-06-17 18:13:55 UTC (rev 5331)
+++ trunk/OpenMPT/mptrack/AboutDialog.cpp	2015-06-18 07:45:52 UTC (rev 5332)
@@ -478,13 +478,13 @@
 			}
 			break;
 		case 2:
-			text += mpt::ToUnicode(mpt::CharsetUTF8, MptVersion::GetFullCreditsString());
+			text += MptVersion::GetFullCreditsString();
 			break;
 		case 3:
-			text += mpt::ToUnicode(mpt::CharsetUTF8, MptVersion::GetLicenseString());
+			text += MptVersion::GetLicenseString();
 			break;
 		case 4:
-			text += mpt::ToUnicode(mpt::CharsetUTF8, MptVersion::GetContactString());
+			text += MptVersion::GetContactString();
 			break;
 	}
 	return text;

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