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

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

Revision: 3153
          http://sourceforge.net/p/modplug/code/3153
Author:   manxorist
Date:     2013-11-09 18:18:04 +0000 (Sat, 09 Nov 2013)
Log Message:
-----------
[Ref] Silence some warnings in test.cpp.
[Ref] SanitizeFilename works totally fine on standard non-path strings, un-deprecate it.

Modified Paths:
--------------
    trunk/OpenMPT/common/mptString.cpp
    trunk/OpenMPT/common/mptString.h
    trunk/OpenMPT/test/test.cpp

Modified: trunk/OpenMPT/common/mptString.cpp
===================================================================
--- trunk/OpenMPT/common/mptString.cpp	2013-11-09 18:05:00 UTC (rev 3152)
+++ trunk/OpenMPT/common/mptString.cpp	2013-11-09 18:18:04 UTC (rev 3153)
@@ -339,7 +339,7 @@
 }
 
 void SanitizeFilename(mpt::PathString &filename)
-//-----------------------------------------------
+//----------------------------------------------
 {
 	mpt::RawPathString tmp = filename.AsNative();
 	for(mpt::RawPathString::iterator it = tmp.begin(); it != tmp.end(); ++it)

Modified: trunk/OpenMPT/common/mptString.h
===================================================================
--- trunk/OpenMPT/common/mptString.h	2013-11-09 18:05:00 UTC (rev 3152)
+++ trunk/OpenMPT/common/mptString.h	2013-11-09 18:18:04 UTC (rev 3153)
@@ -319,23 +319,23 @@
 // Sanitize a filename (remove special chars)
 void SanitizeFilename(mpt::PathString &filename);
 
-MPT_DEPRECATED_PATH void SanitizeFilename(char *beg, char *end);
-MPT_DEPRECATED_PATH void SanitizeFilename(wchar_t *beg, wchar_t *end);
+void SanitizeFilename(char *beg, char *end);
+void SanitizeFilename(wchar_t *beg, wchar_t *end);
 
-MPT_DEPRECATED_PATH void SanitizeFilename(std::string &str);
-MPT_DEPRECATED_PATH void SanitizeFilename(std::wstring &str);
+void SanitizeFilename(std::string &str);
+void SanitizeFilename(std::wstring &str);
 
 template <std::size_t size>
-MPT_DEPRECATED_PATH void SanitizeFilename(char (&buffer)[size])
-//-------------------------------------------------------------
+void SanitizeFilename(char (&buffer)[size])
+//-----------------------------------------
 {
 	STATIC_ASSERT(size > 0);
 	SanitizeFilename(buffer, buffer + size);
 }
 
 template <std::size_t size>
-MPT_DEPRECATED_PATH void SanitizeFilename(wchar_t (&buffer)[size])
-//----------------------------------------------------------------
+void SanitizeFilename(wchar_t (&buffer)[size])
+//--------------------------------------------
 {
 	STATIC_ASSERT(size > 0);
 	SanitizeFilename(buffer, buffer + size);

Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/test/test.cpp	2013-11-09 18:05:00 UTC (rev 3152)
+++ trunk/OpenMPT/test/test.cpp	2013-11-09 18:18:04 UTC (rev 3153)
@@ -586,16 +586,16 @@
 	// Path conversions
 #ifdef MODPLUG_TRACKER
 	const mpt::PathString realExePath = theApp.GetAppDirPath();
-	const CString exePath = "C:\\OpenMPT\\";
-	theApp.SetAppDirPath(mpt::PathString::FromCString(exePath));
-	VERIFY_EQUAL(theApp.AbsolutePathToRelative("C:\\OpenMPT\\"), ".\\");
-	VERIFY_EQUAL(theApp.AbsolutePathToRelative("c:\\OpenMPT\\foo"), ".\\foo");
-	VERIFY_EQUAL(theApp.AbsolutePathToRelative("C:\\foo"), "\\foo");
-	VERIFY_EQUAL(theApp.RelativePathToAbsolute(".\\"), "C:\\OpenMPT\\");
-	VERIFY_EQUAL(theApp.RelativePathToAbsolute(".\\foo"), "C:\\OpenMPT\\foo");
-	VERIFY_EQUAL(theApp.RelativePathToAbsolute("\\foo"), "C:\\foo");
-	VERIFY_EQUAL(theApp.AbsolutePathToRelative("\\\\server\\path\\file"), "\\\\server\\path\\file");
-	VERIFY_EQUAL(theApp.RelativePathToAbsolute("\\\\server\\path\\file"), "\\\\server\\path\\file");
+	const mpt::PathString exePath = MPT_PATHSTRING("C:\\OpenMPT\\");
+	theApp.SetAppDirPath(exePath);
+	VERIFY_EQUAL(theApp.AbsolutePathToRelative(MPT_PATHSTRING("C:\\OpenMPT\\")), MPT_PATHSTRING(".\\"));
+	VERIFY_EQUAL(theApp.AbsolutePathToRelative(MPT_PATHSTRING("c:\\OpenMPT\\foo")), MPT_PATHSTRING(".\\foo"));
+	VERIFY_EQUAL(theApp.AbsolutePathToRelative(MPT_PATHSTRING("C:\\foo")), MPT_PATHSTRING("\\foo"));
+	VERIFY_EQUAL(theApp.RelativePathToAbsolute(MPT_PATHSTRING(".\\")), MPT_PATHSTRING("C:\\OpenMPT\\"));
+	VERIFY_EQUAL(theApp.RelativePathToAbsolute(MPT_PATHSTRING(".\\foo")), MPT_PATHSTRING("C:\\OpenMPT\\foo"));
+	VERIFY_EQUAL(theApp.RelativePathToAbsolute(MPT_PATHSTRING("\\foo")), MPT_PATHSTRING("C:\\foo"));
+	VERIFY_EQUAL(theApp.AbsolutePathToRelative(MPT_PATHSTRING("\\\\server\\path\\file")), MPT_PATHSTRING("\\\\server\\path\\file"));
+	VERIFY_EQUAL(theApp.RelativePathToAbsolute(MPT_PATHSTRING("\\\\server\\path\\file")), MPT_PATHSTRING("\\\\server\\path\\file"));
 	theApp.SetAppDirPath(realExePath);
 #endif
 

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