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

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

Revision: 3205
          http://sourceforge.net/p/modplug/code/3205
Author:   manxorist
Date:     2013-11-13 17:45:06 +0000 (Wed, 13 Nov 2013)
Log Message:
-----------
[Ref] Replace the second-last occurence of mpt::string.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/PatternClipboard.cpp
    trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp
    trunk/OpenMPT/soundlib/pattern.h

Modified: trunk/OpenMPT/mptrack/PatternClipboard.cpp
===================================================================
--- trunk/OpenMPT/mptrack/PatternClipboard.cpp	2013-11-12 23:13:18 UTC (rev 3204)
+++ trunk/OpenMPT/mptrack/PatternClipboard.cpp	2013-11-13 17:45:06 UTC (rev 3205)
@@ -88,7 +88,7 @@
 				patList[pattern] = insertedPats++;
 
 				patternData.AppendFormat("Rows: %u\r\n", sndFile.Patterns[pattern].GetNumRows());
-				CString name = sndFile.Patterns[pattern].GetName();
+				CString name = sndFile.Patterns[pattern].GetName().c_str();
 				if(!name.IsEmpty())
 				{
 					patternData.Append("Name: " + name + "\r\n");

Modified: trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp	2013-11-12 23:13:18 UTC (rev 3204)
+++ trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp	2013-11-13 17:45:06 UTC (rev 3205)
@@ -479,7 +479,7 @@
 		SetDlgItemText(IDC_TEXT1, s);
 
 		// Window title
-		const CString patternName = sndFile.Patterns[m_nPattern].GetName();
+		const CString patternName = sndFile.Patterns[m_nPattern].GetName().c_str();
 		wsprintf(s, "Pattern Properties for Pattern #%d", m_nPattern);
 		if(!patternName.IsEmpty())
 		{

Modified: trunk/OpenMPT/soundlib/pattern.h
===================================================================
--- trunk/OpenMPT/soundlib/pattern.h	2013-11-12 23:13:18 UTC (rev 3204)
+++ trunk/OpenMPT/soundlib/pattern.h	2013-11-13 17:45:06 UTC (rev 3205)
@@ -103,7 +103,7 @@
 		return GetName(buffer, bufferSize);
 	}
 	bool GetName(char *buffer, size_t maxChars) const;
-	mpt::string GetName() const { return m_PatternName; };
+	std::string GetName() const { return m_PatternName; };
 
 	// Double number of rows
 	bool Expand();

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