- 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, 17 deletions

diff --git a/include/m_string.inl b/include/m_string.inl
index 4615319416..5167a15028 100644
--- a/include/m_string.inl
+++ b/include/m_string.inl
@@ -1376,22 +1376,6 @@ typename CMStringT<BaseType, StringTraits>::PCXSTR CMStringT<BaseType, StringTra
 	return GetString();

 }

 

-// OLE BSTR support

-

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

-template< typename BaseType, class StringTraits >

-BSTR CMStringT<BaseType, StringTraits>::AllocSysString() const

-{

-	return StringTraits::AllocSysString(this->GetString(), this->GetLength());

-}

-

-template< typename BaseType, class StringTraits >

-BSTR CMStringT<BaseType, StringTraits>::SetSysString(BSTR* pbstr) const

-{

-	StringTraits::ReAllocSysString(this->GetString(), pbstr, this->GetLength());

-	return *pbstr;

-}

-

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

 template< typename BaseType, class StringTraits >

 BOOL CMStringT<BaseType, StringTraits>::GetEnvironmentVariable(PCXSTR pszVar)

@@ -1413,7 +1397,7 @@ BOOL CMStringT<BaseType, StringTraits>::GetEnvironmentVariable(PCXSTR pszVar)
 

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

 template< typename BaseType, class StringTraits >

-typename CMStringT<BaseType, StringTraits>::PXSTR CMStringT<BaseType, StringTraits>::Detouch() const

+typename CMStringT<BaseType, StringTraits>::PXSTR CMStringT<BaseType, StringTraits>::Detach() const

 {

 	return StringTraits::MirCopy(CMStringT<BaseType, StringTraits>::GetString(), GetLength());

 }