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

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

Revision: 3246
          http://sourceforge.net/p/modplug/code/3246
Author:   manxorist
Date:     2013-11-16 21:26:22 +0000 (Sat, 16 Nov 2013)
Log Message:
-----------
[Ref] Make silenced PathString conversions more explicit by using mpt::PathString::FromCStringSilent instead of cascades through ToWide.

Modified Paths:
--------------
    trunk/OpenMPT/common/mptPathString.h
    trunk/OpenMPT/mptrack/AutoSaver.cpp
    trunk/OpenMPT/mptrack/ExceptionHandler.cpp
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/mptrack/View_tre.cpp

Modified: trunk/OpenMPT/common/mptPathString.h
===================================================================
--- trunk/OpenMPT/common/mptPathString.h	2013-11-16 21:23:47 UTC (rev 3245)
+++ trunk/OpenMPT/common/mptPathString.h	2013-11-16 21:26:22 UTC (rev 3246)
@@ -139,6 +139,9 @@
 	// CString TCHAR, so this is CHAR or WCHAR, depending on UNICODE
 	MPT_DEPRECATED_PATH CString ToCString() const { return mpt::ToCString(path); }
 	MPT_DEPRECATED_PATH static PathString FromCString(const CString &path) { return PathString(mpt::ToWide(path)); }
+	// Non-warning-generating versions of the above. Use with extra care.
+	CString ToCStringSilent() const { return mpt::ToCString(path); }
+	static PathString FromCStringSilent(const CString &path) { return PathString(mpt::ToWide(path)); }
 	// really special purpose, if !UNICODE, encode unicode in CString as UTF8:
 	static mpt::PathString TunnelOutofCString(const CString &path);
 	static CString TunnelIntoCString(const mpt::PathString &path);

Modified: trunk/OpenMPT/mptrack/AutoSaver.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AutoSaver.cpp	2013-11-16 21:23:47 UTC (rev 3245)
+++ trunk/OpenMPT/mptrack/AutoSaver.cpp	2013-11-16 21:26:22 UTC (rev 3246)
@@ -218,11 +218,11 @@
 		} else
 		{
 			// if it doesnt, put it in settings dir
-			name = theApp.GetConfigPath() + mpt::PathString::FromWide(mpt::ToWide(modDoc.GetTitle())).SanitizeComponent();
+			name = theApp.GetConfigPath() + mpt::PathString::FromCStringSilent(modDoc.GetTitle()).SanitizeComponent();
 		}
 	} else
 	{
-		name = m_csPath + mpt::PathString::FromWide(mpt::ToWide(modDoc.GetTitle())).SanitizeComponent();
+		name = m_csPath + mpt::PathString::FromCStringSilent(modDoc.GetTitle()).SanitizeComponent();
 	}
 	
 	name += MPT_PATHSTRING(".AutoSave.");					//append backup tag
@@ -304,7 +304,7 @@
 	}
 
 	std::vector<mpt::PathString> foundfiles;
-	mpt::PathString searchPattern = path + mpt::PathString::FromWide(mpt::ToWide(modDoc.GetTitle())).SanitizeComponent() + MPT_PATHSTRING(".AutoSave.*");
+	mpt::PathString searchPattern = path + mpt::PathString::FromCStringSilent(modDoc.GetTitle()).SanitizeComponent() + MPT_PATHSTRING(".AutoSave.*");
 
 	WIN32_FIND_DATAW findData;
 	MemsetZero(findData);

Modified: trunk/OpenMPT/mptrack/ExceptionHandler.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ExceptionHandler.cpp	2013-11-16 21:23:47 UTC (rev 3245)
+++ trunk/OpenMPT/mptrack/ExceptionHandler.cpp	2013-11-16 21:26:22 UTC (rev 3246)
@@ -39,7 +39,7 @@
 {
 	CMainFrame* pMainFrame = CMainFrame::GetMainFrame();
 
-	const mpt::PathString timestampDir = mpt::PathString::FromWide(mpt::ToWide((CTime::GetCurrentTime()).Format("%Y-%m-%d %H.%M.%S\\")));
+	const mpt::PathString timestampDir = mpt::PathString::FromCStringSilent((CTime::GetCurrentTime()).Format("%Y-%m-%d %H.%M.%S\\"));
 	mpt::PathString baseRescuePath;
 	{
 		// Create a crash directory
@@ -114,7 +114,7 @@
 			filename += baseRescuePath;
 			filename += mpt::PathString::FromWide(mpt::ToWString(++numFiles));
 			filename += MPT_PATHSTRING("_");
-			filename += mpt::PathString::FromWide(mpt::ToWide(pModDoc->GetTitle())).SanitizeComponent();
+			filename += mpt::PathString::FromCStringSilent(pModDoc->GetTitle()).SanitizeComponent();
 			filename += MPT_PATHSTRING(".");
 			filename += mpt::PathString::FromUTF8(pModDoc->GetSoundFile()->GetModSpecifications().fileExtension);
 

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2013-11-16 21:23:47 UTC (rev 3245)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2013-11-16 21:26:22 UTC (rev 3246)
@@ -600,7 +600,7 @@
 		mpt::PathString fileName = docFileName.GetFileName();
 		if(fileName.empty())
 		{
-			fileName = mpt::PathString::FromWide(mpt::ToWide(GetTitle())).SanitizeComponent();
+			fileName = mpt::PathString::FromCStringSilent(GetTitle()).SanitizeComponent();
 		}
 		mpt::PathString defaultSaveName = drive + dir + fileName + ext;
 		
@@ -2617,7 +2617,7 @@
 		//Catch case where we don't have a filename yet.
 		if(fname.empty())
 		{
-			newPath += mpt::PathString::FromWide(mpt::ToWide(GetTitle())).SanitizeComponent();
+			newPath += mpt::PathString::FromCStringSilent(GetTitle()).SanitizeComponent();
 		} else
 		{
 			newPath += fname;

Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp	2013-11-16 21:23:47 UTC (rev 3245)
+++ trunk/OpenMPT/mptrack/View_tre.cpp	2013-11-16 21:26:22 UTC (rev 3246)
@@ -696,7 +696,7 @@
 	{
 		// Module folder + sub folders
 		std::wstring name = pDoc->GetPathNameMpt().GetFileName().ToWide();
-		if(name.empty()) name = mpt::PathString::FromWide(mpt::ToWide(pInfo->pModDoc->GetTitle())).SanitizeComponent().ToWide();
+		if(name.empty()) name = mpt::PathString::FromCStringSilent(pInfo->pModDoc->GetTitle()).SanitizeComponent().ToWide();
 
 		if(!pInfo->hSong)
 		{

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