- MS_UTILS_GETBITMAPFILTERSTRINGS - end of story, replaced with BmpFilterGetStrings();

- parasite mir_strncat's removed from bitmap filter creation;
- CMString::AllocSysString/SetSysString removed due to complete uselessness;
- CMString::Detouch - typo fixed.

git-svn-id: http://svn.miranda-ng.org/main/trunk@13881 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 1 insertions, 37 deletions

diff --git a/include/m_string.h b/include/m_string.h
index a97038a1ca..4619222fe9 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -458,26 +458,6 @@ public:
 		memset(pch, ch, nLength);

 	}

 

-	static BSTR __stdcall AllocSysString(const char* pchData, int nDataLength)

-	{

-		int nLen = ::MultiByteToWideChar(Langpack_GetDefaultCodePage(), 0, pchData, nDataLength, NULL, NULL);

-		BSTR bstr = ::SysAllocStringLen(NULL, nLen);

-		if (bstr != NULL)

-			::MultiByteToWideChar(Langpack_GetDefaultCodePage(), 0, pchData, nDataLength, bstr, nLen);

-

-		return bstr;

-	}

-

-	static BOOL __stdcall ReAllocSysString(const char* pchData, BSTR* pbstr, int nDataLength)

-	{

-		int nLen = ::MultiByteToWideChar(Langpack_GetDefaultCodePage(), 0, pchData, nDataLength, NULL, NULL);

-		BOOL bSuccess = ::SysReAllocStringLen(pbstr, NULL, nLen);

-		if (bSuccess)

-			::MultiByteToWideChar(Langpack_GetDefaultCodePage(), 0, pchData, nDataLength, *pbstr, nLen);

-

-		return bSuccess;

-	}

-

 	static int __stdcall SafeStringLen(LPCSTR psz)

 	{

 		// returns length in bytes

@@ -691,16 +671,6 @@ public:
 		}

 	}

 

-	static BSTR __stdcall AllocSysString(const wchar_t* pchData, int nDataLength)

-	{

-		return ::SysAllocStringLen(pchData, nDataLength);

-	}

-

-	static BOOL __stdcall ReAllocSysString(const wchar_t* pchData, BSTR* pbstr, int nDataLength)

-	{

-		return ::SysReAllocStringLen(pbstr, pchData, nDataLength);

-	}

-

 	static int __stdcall SafeStringLen(LPCSTR psz)

 	{

 		// returns length in bytes

@@ -924,13 +894,7 @@ public:
 	void   AppendFormatV(PCXSTR pszFormat, va_list args);

 

 	// return a copy of string to be freed by mir_free()

-	PXSTR Detouch() const;

-

-	// OLE BSTR support

-

-	// allocate a BSTR containing a copy of the string

-	BSTR AllocSysString() const;

-	BSTR SetSysString(BSTR* pbstr) const;

+	PXSTR Detach() const;

 

 	// Set the string to the value of environment variable 'pszVar'

 	BOOL GetEnvironmentVariable(PCXSTR pszVar);