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

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

Revision: 3130
          http://sourceforge.net/p/modplug/code/3130
Author:   manxorist
Date:     2013-11-08 15:23:16 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
[Ref] Use MPT_DEPRECATED_PATH to deprecate path related conversion functions instead of the global MPT_DEPRECATED. This allows these warnings to be shut off easily.

Modified Paths:
--------------
    trunk/OpenMPT/common/mptString.h
    trunk/OpenMPT/mptrack/Mptrack.h
    trunk/OpenMPT/mptrack/TrackerSettings.h

Modified: trunk/OpenMPT/common/mptString.h
===================================================================
--- trunk/OpenMPT/common/mptString.h	2013-11-08 15:15:50 UTC (rev 3129)
+++ trunk/OpenMPT/common/mptString.h	2013-11-08 15:23:16 UTC (rev 3130)
@@ -161,6 +161,9 @@
 
 
 
+//#define MPT_DEPRECATED_PATH
+#define MPT_DEPRECATED_PATH MPT_DEPRECATED
+
 #if defined(WIN32)
 typedef std::wstring RawPathString;
 #else // !WIN32
@@ -236,17 +239,17 @@
 #if defined(WIN32)
 
 	// conversions
-	MPT_DEPRECATED std::string ToLocale() const { return mpt::String::Encode(path, mpt::CharsetLocale); }
+	MPT_DEPRECATED_PATH std::string ToLocale() const { return mpt::String::Encode(path, mpt::CharsetLocale); }
 	std::string ToUTF8() const { return mpt::String::Encode(path, mpt::CharsetUTF8); }
 	std::wstring ToWide() const { return path; }
-	MPT_DEPRECATED static PathString FromLocale(const std::string &path) { return PathString(mpt::String::Decode(path, mpt::CharsetLocale)); }
+	MPT_DEPRECATED_PATH static PathString FromLocale(const std::string &path) { return PathString(mpt::String::Decode(path, mpt::CharsetLocale)); }
 	static PathString FromUTF8(const std::string &path) { return PathString(mpt::String::Decode(path, mpt::CharsetUTF8)); }
 	static PathString FromWide(const std::wstring &path) { return PathString(path); }
 	RawPathString AsNative() const { return path; }
 	static PathString FromNative(const RawPathString &path) { return PathString(path); }
 #if defined(_MFC_VER)
 	// CString TCHAR, so this is CHAR or WCHAR, depending on UNICODE
-	MPT_DEPRECATED CString ToCString() const
+	MPT_DEPRECATED_PATH CString ToCString() const
 	{
 		#ifdef UNICODE
 			return path;
@@ -254,7 +257,7 @@
 			return mpt::String::Encode(path, mpt::CharsetLocale).c_str();
 		#endif
 	}
-	MPT_DEPRECATED static PathString FromCString(const CString &path)
+	MPT_DEPRECATED_PATH static PathString FromCString(const CString &path)
 	{
 		#ifdef UNICODE
 			return PathString(path.GetString());
@@ -287,30 +290,30 @@
 // Sanitize a filename (remove special chars)
 void SanitizeFilename(mpt::PathString &filename);
 
-MPT_DEPRECATED void SanitizeFilename(char *beg, char *end);
-MPT_DEPRECATED void SanitizeFilename(wchar_t *beg, wchar_t *end);
+MPT_DEPRECATED_PATH void SanitizeFilename(char *beg, char *end);
+MPT_DEPRECATED_PATH void SanitizeFilename(wchar_t *beg, wchar_t *end);
 
-MPT_DEPRECATED void SanitizeFilename(std::string &str);
-MPT_DEPRECATED void SanitizeFilename(std::wstring &str);
+MPT_DEPRECATED_PATH void SanitizeFilename(std::string &str);
+MPT_DEPRECATED_PATH void SanitizeFilename(std::wstring &str);
 
 template <std::size_t size>
-MPT_DEPRECATED void SanitizeFilename(char (&buffer)[size])
-//--------------------------------------------------------
+MPT_DEPRECATED_PATH void SanitizeFilename(char (&buffer)[size])
+//-------------------------------------------------------------
 {
 	STATIC_ASSERT(size > 0);
 	SanitizeFilename(buffer, buffer + size);
 }
 
 template <std::size_t size>
-MPT_DEPRECATED void SanitizeFilename(wchar_t (&buffer)[size])
-//-----------------------------------------------------------
+MPT_DEPRECATED_PATH void SanitizeFilename(wchar_t (&buffer)[size])
+//----------------------------------------------------------------
 {
 	STATIC_ASSERT(size > 0);
 	SanitizeFilename(buffer, buffer + size);
 }
 
 #if defined(_MFC_VER)
-MPT_DEPRECATED void SanitizeFilename(CString &str);
+MPT_DEPRECATED_PATH void SanitizeFilename(CString &str);
 #endif
 
 #endif // MODPLUG_TRACKER

Modified: trunk/OpenMPT/mptrack/Mptrack.h
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.h	2013-11-08 15:15:50 UTC (rev 3129)
+++ trunk/OpenMPT/mptrack/Mptrack.h	2013-11-08 15:23:16 UTC (rev 3130)
@@ -194,11 +194,11 @@
 	mpt::PathString AbsolutePathToRelative(const mpt::PathString &path);
 	mpt::PathString RelativePathToAbsolute(const mpt::PathString &path);
 	template <size_t nLength>
-	MPT_DEPRECATED void AbsolutePathToRelative(TCHAR (&szPath)[nLength]);
-	MPT_DEPRECATED CString AbsolutePathToRelative(const CString &path);
+	MPT_DEPRECATED_PATH void AbsolutePathToRelative(TCHAR (&szPath)[nLength]);
+	MPT_DEPRECATED_PATH CString AbsolutePathToRelative(const CString &path);
 	template <size_t nLength>
-	MPT_DEPRECATED void RelativePathToAbsolute(TCHAR (&szPath)[nLength]);
-	MPT_DEPRECATED CString RelativePathToAbsolute(const CString &path);
+	MPT_DEPRECATED_PATH void RelativePathToAbsolute(TCHAR (&szPath)[nLength]);
+	MPT_DEPRECATED_PATH CString RelativePathToAbsolute(const CString &path);
 
 	/// Removes item from MRU-list; most recent item has index zero.
 	void RemoveMruItem(const int nItem);

Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h	2013-11-08 15:15:50 UTC (rev 3129)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h	2013-11-08 15:23:16 UTC (rev 3130)
@@ -397,8 +397,8 @@
 
 	// Cache is necessary because users might expect long lifetimes of pointers returned from Get*Directory.
 	// Cache can be removed when all users are converted to PathString.
-	MPT_DEPRECATED TCHAR m_szDefaultDirectoryCache[NUM_DIRS][MAX_PATH];
-	MPT_DEPRECATED TCHAR m_szWorkingDirectoryCache[NUM_DIRS][MAX_PATH];
+	MPT_DEPRECATED_PATH TCHAR m_szDefaultDirectoryCache[NUM_DIRS][MAX_PATH];
+	MPT_DEPRECATED_PATH TCHAR m_szWorkingDirectoryCache[NUM_DIRS][MAX_PATH];
 
 public:
 
@@ -413,8 +413,8 @@
 
 	void SetWorkingDirectory(LPCTSTR szFilenameFrom, Directory dir, bool bStripFilename = false);
 	void SetDefaultDirectory(LPCTSTR szFilenameFrom, Directory dir, bool bStripFilename = false);
-	MPT_DEPRECATED LPCTSTR GetWorkingDirectory(Directory dir) const;
-	MPT_DEPRECATED LPCTSTR GetDefaultDirectory(Directory dir) const;
+	MPT_DEPRECATED_PATH LPCTSTR GetWorkingDirectory(Directory dir) const;
+	MPT_DEPRECATED_PATH LPCTSTR GetDefaultDirectory(Directory dir) const;
 
 	static TrackerDirectories &Instance();
 

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