- direct call of MS_SKIN_ADDNEWSOUND replaced with Skin_AddSound() call;

- obsolete structure SKINSOUNDDESC removed 
- dynamically translated hot keys;
- checked correct LPGEN'ing of the sounds creation;
- code cleaning

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

13 files changed, 194 insertions, 194 deletions

diff --git a/protocols/IRCG/MString.h b/protocols/IRCG/MString.h
index 6f90b7741b..7cc16ff4a3 100644
--- a/protocols/IRCG/MString.h
+++ b/protocols/IRCG/MString.h
@@ -115,7 +115,7 @@ public:
 	CMSimpleStringT(PCXSTR pszSrc)

 	{

 		int nLength = StringLength( pszSrc );

-		CMStringData* pData = Allocate( nLength, sizeof( XCHAR ) );

+		CMStringData* pData = Allocate( nLength, sizeof( XCHAR ));

 		if (pData != NULL)

 		{

 			Attach( pData );

@@ -125,7 +125,7 @@ public:
 	}

 	CMSimpleStringT(const XCHAR* pchSrc, int nLength)

 	{

-		CMStringData* pData = Allocate( nLength, sizeof( XCHAR ) );

+		CMStringData* pData = Allocate( nLength, sizeof( XCHAR ));

 		if ( pData != NULL )

 		{

 			Attach( pData );

@@ -150,8 +150,8 @@ public:
 		CMStringData* pOldData = GetData();

 		if ( pSrcData != pOldData)

 		{

-			if ( pOldData->IsLocked() )

-				SetString( strSrc.GetString(), strSrc.GetLength() );

+			if ( pOldData->IsLocked())

+				SetString( strSrc.GetString(), strSrc.GetLength());

 			else

 			{

 				CMStringData* pNewData = CloneData( pSrcData );

@@ -218,7 +218,7 @@ public:
 

 	void Append( PCXSTR pszSrc )

 	{

-		Append( pszSrc, StringLength( pszSrc ) );

+		Append( pszSrc, StringLength( pszSrc ));

 	}

 	void Append( PCXSTR pszSrc, int nLength )

 	{

@@ -257,7 +257,7 @@ public:
 	}

 	void Append( const CMSimpleStringT& strSrc )

 	{

-		Append( strSrc.GetString(), strSrc.GetLength() );

+		Append( strSrc.GetString(), strSrc.GetLength());

 	}

 	void Empty()

 	{

@@ -265,7 +265,7 @@ public:
 		if ( pOldData->nDataLength == 0 )

 			return;

 

-		if ( pOldData->IsLocked() )

+		if ( pOldData->IsLocked())

 		{

 			// Don't reallocate a locked buffer that's shrinking

 			SetLength( 0 );

@@ -284,15 +284,15 @@ public:
 		if ( pOldData->nAllocLength == nLength )

 			return;

 

-		if ( !pOldData->IsLocked() )  // Don't reallocate a locked buffer that's shrinking

+		if ( !pOldData->IsLocked())  // Don't reallocate a locked buffer that's shrinking

 		{

-			CMStringData* pNewData = Allocate( nLength, sizeof( XCHAR ) );

+			CMStringData* pNewData = Allocate( nLength, sizeof( XCHAR ));

 			if ( pNewData == NULL ) {

 				SetLength( nLength );

 				return;

 			}

 

-			CopyChars( PXSTR( pNewData->data() ), nLength, PCXSTR( pOldData->data() ), nLength );

+			CopyChars( PXSTR( pNewData->data()), nLength, PCXSTR( pOldData->data()), nLength );

 

 			pOldData->Release();

 			Attach( pNewData );

@@ -311,7 +311,7 @@ public:
 	PXSTR GetBuffer()

 	{

 		CMStringData* pData = GetData();

-		if ( pData->IsShared() )

+		if ( pData->IsShared())

 			Fork( pData->nDataLength );

 

 		return m_pszData;

@@ -343,7 +343,7 @@ public:
 	PXSTR LockBuffer()

 	{

 		CMStringData* pData = GetData();

-		if ( pData->IsShared() )

+		if ( pData->IsShared())

 		{

 			Fork( pData->nDataLength );

 			pData = GetData();  // Do it again, because the fork might have changed it

@@ -389,7 +389,7 @@ public:
 	}

 	void SetString( PCXSTR pszSrc )

 	{

-		SetString( pszSrc, StringLength( pszSrc ) );

+		SetString( pszSrc, StringLength( pszSrc ));

 	}

 	void SetString( PCXSTR pszSrc, int nLength )

 	{

@@ -421,7 +421,7 @@ public:
 	{

 		CMSimpleStringT s;

 

-		Concatenate( s, str1, str1.GetLength(), str2, str2.GetLength() );

+		Concatenate( s, str1, str1.GetLength(), str2, str2.GetLength());

 

 		return s;

 	}

@@ -430,7 +430,7 @@ public:
 	{

 		CMSimpleStringT s;

 

-		Concatenate( s, str1, str1.GetLength(), psz2, StringLength( psz2 ) );

+		Concatenate( s, str1, str1.GetLength(), psz2, StringLength( psz2 ));

 

 		return s;

 	}

@@ -439,7 +439,7 @@ public:
 	{

 		CMSimpleStringT s;

 

-		Concatenate( s, psz1, StringLength( psz1 ), str2, str2.GetLength() );

+		Concatenate( s, psz1, StringLength( psz1 ), str2, str2.GetLength());

 

 		return s;

 	}

@@ -527,7 +527,7 @@ private:
 		if (pNewData != NULL)

 		{

 			int nCharsToCopy = ((nOldLength < nLength) ? nOldLength : nLength)+1;  // Copy '\0'

-			CopyChars( PXSTR( pNewData->data() ), nCharsToCopy, PCXSTR( pOldData->data() ), nCharsToCopy );

+			CopyChars( PXSTR( pNewData->data()), nCharsToCopy, PCXSTR( pOldData->data()), nCharsToCopy );

 			pNewData->nDataLength = nOldLength;

 			pOldData->Release();

 			Attach(pNewData);

@@ -578,7 +578,7 @@ private:
 		if ( pOldData->nAllocLength >= nLength || nLength <= 0)

 			return;

 

-		CMStringData* pNewData = Realloc( pOldData, nLength, sizeof( XCHAR ) );

+		CMStringData* pNewData = Realloc( pOldData, nLength, sizeof( XCHAR ));

 		if ( pNewData != NULL )

 			Attach( pNewData );

 	}

@@ -676,19 +676,19 @@ public:
 

 	static int __stdcall StringSpanIncluding( LPCSTR pszBlock, LPCSTR pszSet )

 	{

-		return (int)_mbsspn( reinterpret_cast< const unsigned char* >( pszBlock ), reinterpret_cast< const unsigned char* >( pszSet ) );

+		return (int)_mbsspn( reinterpret_cast< const unsigned char* >( pszBlock ), reinterpret_cast< const unsigned char* >( pszSet ));

 	}

 

 	static int __stdcall StringSpanExcluding( LPCSTR pszBlock, LPCSTR pszSet )

 	{

-		return (int)_mbscspn( reinterpret_cast< const unsigned char* >( pszBlock ), reinterpret_cast< const unsigned char* >( pszSet ) );

+		return (int)_mbscspn( reinterpret_cast< const unsigned char* >( pszBlock ), reinterpret_cast< const unsigned char* >( pszSet ));

 	}

 

 	static LPSTR __stdcall StringUppercase( LPSTR psz )

 	{

 #pragma warning (push)

 #pragma warning(disable : 4996)

-		return reinterpret_cast< LPSTR >( _mbsupr( reinterpret_cast< unsigned char* >( psz ) ) );

+		return reinterpret_cast< LPSTR >( _mbsupr( reinterpret_cast< unsigned char* >( psz )) );

 #pragma warning (pop)

 	}

 

@@ -696,7 +696,7 @@ public:
 	{

 #pragma warning (push)

 #pragma warning(disable : 4996)

-		return reinterpret_cast< LPSTR >( _mbslwr( reinterpret_cast< unsigned char* >( psz ) ) );

+		return reinterpret_cast< LPSTR >( _mbslwr( reinterpret_cast< unsigned char* >( psz )) );

 #pragma warning (pop)

 	}

 

@@ -722,7 +722,7 @@ public:
 

 	static LPSTR __stdcall StringReverse( LPSTR psz )

 	{

-		return reinterpret_cast< LPSTR >( _mbsrev( reinterpret_cast< unsigned char* >( psz ) ) );

+		return reinterpret_cast< LPSTR >( _mbsrev( reinterpret_cast< unsigned char* >( psz )) );

 	}

 

 	static int __stdcall GetFormattedLength( LPCSTR pszFormat, va_list args );

@@ -741,7 +741,7 @@ public:
 	static int __stdcall GetBaseTypeLength( LPCSTR pszSrc )

 	{

 		// Returns required buffer length in XCHARs

-		return int( strlen( pszSrc ) );

+		return int( strlen( pszSrc ));

 	}

 

 	static int __stdcall GetBaseTypeLength( LPCSTR pszSrc, int nLength )

@@ -768,7 +768,7 @@ public:
 		if (nSrcLength == -1) { nSrcLength=1 + GetBaseTypeLength(pszSrc); }

 		// nLen is in XCHARs

 		memcpy_s( pszDest, nDestLength*sizeof( char ), 

-			pszSrc, nSrcLength*sizeof( char ) );

+			pszSrc, nSrcLength*sizeof( char ));

 	}

 

 	static void __stdcall ConvertToBaseType( LPSTR pszDest, int nDestLength, LPCWSTR pszSrc, int nSrcLength = -1)

@@ -835,13 +835,13 @@ public:
 	static int __stdcall SafeStringLen( LPCSTR psz )

 	{

 		// returns length in bytes

-		return (psz != NULL) ? int( strlen( psz ) ) : 0;

+		return (psz != NULL) ? int( strlen( psz )) : 0;

 	}

 

 	static int __stdcall SafeStringLen( LPCWSTR psz )

 	{

 		// returns length in wchar_ts

-		return (psz != NULL) ? int( wcslen( psz ) ) : 0;

+		return (psz != NULL) ? int( wcslen( psz )) : 0;

 	}

 

 	static int __stdcall GetCharLen( const wchar_t* pch )

@@ -853,7 +853,7 @@ public:
 	static int __stdcall GetCharLen( const char* pch )

 	{

 		// returns char length

-		return int( _mbclen( reinterpret_cast< const unsigned char* >( pch ) ) );

+		return int( _mbclen( reinterpret_cast< const unsigned char* >( pch )) );

 	}

 

 	static DWORD __stdcall GetEnvironmentVariable( LPCSTR pszVar, LPSTR pszBuffer, DWORD dwSize )

@@ -879,12 +879,12 @@ public:
 

 	static int __stdcall IsDigit( wchar_t ch )

 	{

-		return iswdigit( static_cast<unsigned short>(ch) );

+		return iswdigit( static_cast<unsigned short>(ch));

 	}

 

 	static int __stdcall IsSpace( wchar_t ch )

 	{

-		return iswspace( static_cast<unsigned short>(ch) );

+		return iswspace( static_cast<unsigned short>(ch));

 	}

 

 	static int __stdcall StringCompare( LPCWSTR pszA, LPCWSTR pszB )

@@ -1068,7 +1068,7 @@ public:
 	static int __stdcall GetCharLen( const char* pch )

 	{

 		// returns char length

-		return (int)( _mbclen( reinterpret_cast< const unsigned char* >( pch ) ) );

+		return (int)( _mbclen( reinterpret_cast< const unsigned char* >( pch )) );

 	}

 

 	static DWORD __stdcall GetEnvironmentVariable( LPCWSTR pszVar, LPWSTR pszBuffer, DWORD dwSize )

@@ -1362,7 +1362,7 @@ public:
 			  int nXCHARsToCopy = nLength-(iIndex+nCount)+1;

 			  PXSTR pszBuffer = this->GetBuffer();

 				#if _MSC_VER >= 1400

-				  memmove_s( pszBuffer+iIndex, nXCHARsToCopy*sizeof( XCHAR ), pszBuffer+iIndex+nCount, nXCHARsToCopy*sizeof( XCHAR ) );

+				  memmove_s( pszBuffer+iIndex, nXCHARsToCopy*sizeof( XCHAR ), pszBuffer+iIndex+nCount, nXCHARsToCopy*sizeof( XCHAR ));

 				#else

 				  memmove( pszBuffer+iIndex, pszBuffer+iIndex+nCount, nXCHARsToCopy*sizeof( XCHAR ));

 				#endif

@@ -1378,7 +1378,7 @@ public:
 		  if ( iIndex < 0 )

 			  iIndex = 0;

 

-			if ( iIndex > this->GetLength() )

+			if ( iIndex > this->GetLength())

 				iIndex = this->GetLength();

 

 			int nNewLength = this->GetLength()+1;

@@ -1387,9 +1387,9 @@ public:
 

 		  // move existing bytes down 

 			#if _MSC_VER >= 1400

-				memmove_s( pszBuffer+iIndex+1, (nNewLength-iIndex)*sizeof( XCHAR ), pszBuffer+iIndex, (nNewLength-iIndex)*sizeof( XCHAR ) );

+				memmove_s( pszBuffer+iIndex+1, (nNewLength-iIndex)*sizeof( XCHAR ), pszBuffer+iIndex, (nNewLength-iIndex)*sizeof( XCHAR ));

 			#else

-				memmove( pszBuffer+iIndex+1, pszBuffer+iIndex, (nNewLength-iIndex)*sizeof( XCHAR ) );

+				memmove( pszBuffer+iIndex+1, pszBuffer+iIndex, (nNewLength-iIndex)*sizeof( XCHAR ));

 			#endif

 			pszBuffer[iIndex] = ch;

 

@@ -1403,7 +1403,7 @@ public:
 		  if ( iIndex < 0 )

 			  iIndex = 0;

 

-		  if ( iIndex > this->GetLength() )

+		  if ( iIndex > this->GetLength())

 		  {

 			  iIndex = this->GetLength();

 		  }

@@ -1418,10 +1418,10 @@ public:
 			  PXSTR pszBuffer = this->GetBuffer( nNewLength );

 			  // move existing bytes down 

 				#if _MSC_VER >= 1400

-					memmove_s( pszBuffer+iIndex+nInsertLength, (nNewLength-iIndex-nInsertLength+1)*sizeof( XCHAR ), pszBuffer+iIndex, (nNewLength-iIndex-nInsertLength+1)*sizeof( XCHAR ) );

+					memmove_s( pszBuffer+iIndex+nInsertLength, (nNewLength-iIndex-nInsertLength+1)*sizeof( XCHAR ), pszBuffer+iIndex, (nNewLength-iIndex-nInsertLength+1)*sizeof( XCHAR ));

 					memcpy_s( pszBuffer+iIndex, nInsertLength*sizeof( XCHAR ), psz, nInsertLength*sizeof( XCHAR ));

 				#else

-					memmove( pszBuffer+iIndex+nInsertLength, pszBuffer+iIndex, (nNewLength-iIndex-nInsertLength+1)*sizeof( XCHAR ) );

+					memmove( pszBuffer+iIndex+nInsertLength, pszBuffer+iIndex, (nNewLength-iIndex-nInsertLength+1)*sizeof( XCHAR ));

 					memcpy( pszBuffer+iIndex, psz, nInsertLength*sizeof( XCHAR ));

 				#endif

 			  this->ReleaseBufferSetLength( nNewLength );

@@ -1440,7 +1440,7 @@ public:
 		  {

 			  // otherwise modify each character that matches in the string

 			  bool bCopied = false;

-			  PXSTR pszBuffer = const_cast< PXSTR >( this->GetString() );  // We don't actually write to pszBuffer until we've called GetBuffer().

+			  PXSTR pszBuffer = const_cast< PXSTR >( this->GetString());  // We don't actually write to pszBuffer until we've called GetBuffer().

 

 			  int nLength = this->GetLength();

 			  int iChar = 0;

@@ -1488,7 +1488,7 @@ public:
 			  while( pszStart < pszEnd )

 			  {

 				  PCXSTR pszTarget;

-				  while( (pszTarget = StringTraits::StringFindString( pszStart, pszOld ) ) != NULL)

+				  while( (pszTarget = StringTraits::StringFindString( pszStart, pszOld )) != NULL)

 				  {

 					  nCount++;

 					  pszStart = pszTarget+nSourceLen;

@@ -1505,7 +1505,7 @@ public:
 			  int nOldLength = this->GetLength();

 			  int nNewLength = nOldLength+(nReplacementLen-nSourceLen)*nCount;

 

-			  PXSTR pszBuffer = this->GetBuffer( __max( nNewLength, nOldLength ) );

+			  PXSTR pszBuffer = this->GetBuffer( __max( nNewLength, nOldLength ));

 

 			  PXSTR pszStart = pszBuffer;

 			  PXSTR pszEnd = pszStart+nOldLength;

@@ -1514,13 +1514,13 @@ public:
 			  while( pszStart < pszEnd )

 			  {

 				  PXSTR pszTarget;

-				  while( (pszTarget = StringTraits::StringFindString( pszStart, pszOld ) ) != NULL )

+				  while( (pszTarget = StringTraits::StringFindString( pszStart, pszOld )) != NULL )

 				  {

 					  int nBalance = nOldLength-int(pszTarget-pszBuffer+nSourceLen);

 					  memmove_s( pszTarget+nReplacementLen, nBalance*sizeof( XCHAR ), 

-						  pszTarget+nSourceLen, nBalance*sizeof( XCHAR ) );

+						  pszTarget+nSourceLen, nBalance*sizeof( XCHAR ));

 					  memcpy_s( pszTarget, nReplacementLen*sizeof( XCHAR ), 

-						  pszNew, nReplacementLen*sizeof( XCHAR ) );

+						  pszNew, nReplacementLen*sizeof( XCHAR ));

 					  pszStart = pszTarget+nReplacementLen;

 					  pszTarget[nReplacementLen+nBalance] = 0;

 					  nOldLength += (nReplacementLen-nSourceLen);

@@ -1571,7 +1571,7 @@ public:
 

 	  CMStringT Tokenize( PCXSTR pszTokens, int& iStart ) const

 	  {

-		  if ( (pszTokens == NULL) || (*pszTokens == (XCHAR)0) )

+		  if ( (pszTokens == NULL) || (*pszTokens == (XCHAR)0))

 		  {

 			  if (iStart < this->GetLength())

 				  return CMStringT( this->GetString()+iStart );

@@ -1707,7 +1707,7 @@ public:
 

 		  while( *psz != 0 )

 		  {

-			  if ( StringTraits::IsSpace( *psz ) )

+			  if ( StringTraits::IsSpace( *psz ))

 			  {

 				  if ( pszLast == NULL )

 					  pszLast = psz;

@@ -1722,7 +1722,7 @@ public:
 		  if ( pszLast != NULL )

 		  {

 			  // truncate at trailing space start

-			  int iLast = int( pszLast-this->GetString() );

+			  int iLast = int( pszLast-this->GetString());

 

 			  this->Truncate( iLast );

 		  }

@@ -1737,20 +1737,20 @@ public:
 

 		  PCXSTR psz = this->GetString();

 

-		  while( StringTraits::IsSpace( *psz ) )

+		  while( StringTraits::IsSpace( *psz ))

 		  {

 			  psz = StringTraits::CharNext( psz );

 		  }

 

-		  if ( psz != this->GetString() )

+		  if ( psz != this->GetString())

 		  {

 			  // fix up data and length

-			  int iFirst = int( psz-this->GetString() );

-			  PXSTR pszBuffer = this->GetBuffer( this->GetLength() );

+			  int iFirst = int( psz-this->GetString());

+			  PXSTR pszBuffer = this->GetBuffer( this->GetLength());

 			  psz = pszBuffer+iFirst;

 			  int nDataLength = this->GetLength()-iFirst;

 			  memmove_s( pszBuffer, (this->GetLength()+1)*sizeof( XCHAR ), 

-				  psz, (nDataLength+1)*sizeof( XCHAR ) );

+				  psz, (nDataLength+1)*sizeof( XCHAR ));

 			  this->ReleaseBufferSetLength( nDataLength );

 		  }

 

@@ -1805,7 +1805,7 @@ public:
 		  if ( pszLast != NULL )

 		  {

 			  // truncate at left-most matching character  

-			  int iLast = int( pszLast-this->GetString() );

+			  int iLast = int( pszLast-this->GetString());

 			  this->Truncate( iLast );

 		  }

 

@@ -1816,7 +1816,7 @@ public:
 	  CMStringT& TrimRight( PCXSTR pszTargets )

 	  {

 		  // if we're not trimming anything, we're not doing any work

-		  if ( (pszTargets == NULL) || (*pszTargets == 0) )

+		  if ( (pszTargets == NULL) || (*pszTargets == 0))

 		  {

 			  return *this;

 		  }

@@ -1846,7 +1846,7 @@ public:
 		  if ( pszLast != NULL )

 		  {

 			  // truncate at left-most matching character  

-			  int iLast = int( pszLast-this->GetString() );

+			  int iLast = int( pszLast-this->GetString());

 			  this->Truncate( iLast );

 		  }

 

@@ -1864,15 +1864,15 @@ public:
 			  psz = StringTraits::CharNext( psz );

 		  }

 

-		  if ( psz != this->GetString() )

+		  if ( psz != this->GetString())

 		  {

 			  // fix up data and length

-			  int iFirst = int( psz-this->GetString() );

-			  PXSTR pszBuffer = this->GetBuffer( this->GetLength() );

+			  int iFirst = int( psz-this->GetString());

+			  PXSTR pszBuffer = this->GetBuffer( this->GetLength());

 			  psz = pszBuffer+iFirst;

 			  int nDataLength = this->GetLength()-iFirst;

 			  memmove_s( pszBuffer, (this->GetLength()+1)*sizeof( XCHAR ), 

-				  psz, (nDataLength+1)*sizeof( XCHAR ) );

+				  psz, (nDataLength+1)*sizeof( XCHAR ));

 			  this->ReleaseBufferSetLength( nDataLength );

 		  }

 

@@ -1883,26 +1883,26 @@ public:
 	  CMStringT& TrimLeft( PCXSTR pszTargets )

 	  {

 		  // if we're not trimming anything, we're not doing any work

-		  if ( (pszTargets == NULL) || (*pszTargets == 0) )

+		  if ( (pszTargets == NULL) || (*pszTargets == 0))

 		  {

 			  return *this;

 		  }

 

 		  PCXSTR psz = this->GetString();

-		  while( (*psz != 0) && (StringTraits::StringFindChar( pszTargets, *psz ) != NULL) )

+		  while( (*psz != 0) && (StringTraits::StringFindChar( pszTargets, *psz ) != NULL))

 		  {

 			  psz = StringTraits::CharNext( psz );

 		  }

 

-		  if ( psz != this->GetString() )

+		  if ( psz != this->GetString())

 		  {

 			  // fix up data and length

-			  int iFirst = int( psz-this->GetString() );

-			  PXSTR pszBuffer = this->GetBuffer( this->GetLength() );

+			  int iFirst = int( psz-this->GetString());

+			  PXSTR pszBuffer = this->GetBuffer( this->GetLength());

 			  psz = pszBuffer+iFirst;

 			  int nDataLength = this->GetLength()-iFirst;

 			  memmove_s( pszBuffer, (this->GetLength()+1)*sizeof( XCHAR ), 

-				  psz, (nDataLength+1)*sizeof( XCHAR ) );

+				  psz, (nDataLength+1)*sizeof( XCHAR ));

 			  this->ReleaseBufferSetLength( nDataLength );

 		  }

 

@@ -1946,14 +1946,14 @@ public:
 		  if (nCount < 0)

 			  nCount = 0;

 

-		  if ( (iFirst + nCount) > this->GetLength() )

+		  if ( (iFirst + nCount) > this->GetLength())

 			  nCount = this->GetLength()-iFirst;

 

-		  if ( iFirst > this->GetLength() )

+		  if ( iFirst > this->GetLength())

 			  nCount = 0;

 

 		  // optimize case of returning entire string

-		  if ( (iFirst == 0) && ((iFirst+nCount) == this->GetLength()) )

+		  if ( (iFirst == 0) && ((iFirst+nCount) == this->GetLength()))

 			  return *this;

 

 		  return CMStringT( this->GetString()+iFirst, nCount );

@@ -2030,13 +2030,13 @@ public:
 	  // Allocate a BSTR containing a copy of the string

 	  BSTR AllocSysString() const

 	  {

-		  BSTR bstrResult = StringTraits::AllocSysString( this->GetString(), this->GetLength() );

+		  BSTR bstrResult = StringTraits::AllocSysString( this->GetString(), this->GetLength());

 		  return bstrResult;

 	  }

 

 	  BSTR SetSysString( BSTR* pbstr ) const

 	  {

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

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

 		  return *pbstr;

 	  }

 

@@ -2075,7 +2075,7 @@ public:
 	  {

 		  CMStringT strResult;

 

-		  Concatenate( strResult, str1, str1.GetLength(), str2, str2.GetLength() );

+		  Concatenate( strResult, str1, str1.GetLength(), str2, str2.GetLength());

 

 		  return strResult;

 	  }

@@ -2084,7 +2084,7 @@ public:
 	  {

 		  CMStringT strResult;

 

-		  Concatenate( strResult, str1, str1.GetLength(), psz2, StringLength( psz2 ) );

+		  Concatenate( strResult, str1, str1.GetLength(), psz2, StringLength( psz2 ));

 

 		  return strResult;

 	  }

@@ -2093,7 +2093,7 @@ public:
 	  {

 		  CMStringT strResult;

 

-		  Concatenate( strResult, psz1, StringLength( psz1 ), str2, str2.GetLength() );

+		  Concatenate( strResult, psz1, StringLength( psz1 ), str2, str2.GetLength());

 

 		  return strResult;

 	  }

@@ -2123,7 +2123,7 @@ public:
 		  CMStringT strResult;

 		  XCHAR chTemp = XCHAR( ch1 );

 

-		  Concatenate( strResult, &chTemp, 1, str2, str2.GetLength() );

+		  Concatenate( strResult, &chTemp, 1, str2, str2.GetLength());

 

 		  return strResult;

 	  }

@@ -2133,7 +2133,7 @@ public:
 		  CMStringT strResult;

 		  XCHAR chTemp = XCHAR( ch1 );

 

-		  Concatenate( strResult, &chTemp, 1, str2, str2.GetLength() );

+		  Concatenate( strResult, &chTemp, 1, str2, str2.GetLength());

 

 		  return strResult;

 	  }

diff --git a/protocols/IRCG/clist.cpp b/protocols/IRCG/clist.cpp
index 8dc683caa6..31c81db884 100644
--- a/protocols/IRCG/clist.cpp
+++ b/protocols/IRCG/clist.cpp
@@ -114,7 +114,7 @@ HANDLE CIrcProto::CList_AddContact(CONTACT * user, bool InList, bool SetOnline)
 		setTString(hContact, "Nick", user->name);

 		setTString(hContact, "Default", user->name);

 		setWord(hContact, "Status", SetOnline ? ID_STATUS_ONLINE:ID_STATUS_OFFLINE);

-		if ( !InList && getByte( "MirVerAutoRequestTemp", 0) )

+		if ( !InList && getByte( "MirVerAutoRequestTemp", 0))

 			PostIrcMessage( _T("/PRIVMSG %s \001VERSION\001"), user->name);

 		return hContact;

 	}

diff --git a/protocols/IRCG/commandmonitor.cpp b/protocols/IRCG/commandmonitor.cpp
index 57e9aa3517..dac26d1349 100644
--- a/protocols/IRCG/commandmonitor.cpp
+++ b/protocols/IRCG/commandmonitor.cpp
@@ -53,7 +53,7 @@ VOID CALLBACK TimerProc( HWND, UINT, UINT_PTR idEvent, DWORD )
 	if ( ppro->m_forceVisible )

 		ppro->PostIrcMessage( _T("/MODE %s -i"), ppro->m_info.sNick.c_str());

 

-	if ( lstrlenA( ppro->m_myHost ) == 0 && ppro->IsConnected() )

+	if ( lstrlenA( ppro->m_myHost ) == 0 && ppro->IsConnected())

 		ppro->DoUserhostWithReason(2, (_T("S") + ppro->m_info.sNick).c_str(), true, _T("%s"), ppro->m_info.sNick.c_str());

 }

 

@@ -243,7 +243,7 @@ void __cdecl CIrcProto::ResolveIPThread(LPVOID di)
 	EnterCriticalSection( &m_resolve);

 

 	if ( ipr != NULL && (ipr->iType == IP_AUTO && lstrlenA(m_myHost) == 0 || ipr->iType == IP_MANUAL )) {

-		hostent* myhost = gethostbyname( ipr->sAddr.c_str() );

+		hostent* myhost = gethostbyname( ipr->sAddr.c_str());

 		if ( myhost ) {

 			IN_ADDR in;

 			memcpy( &in, myhost->h_addr, 4 );

@@ -422,7 +422,7 @@ bool CIrcProto::OnIrc_KICK( const CIrcMessage* pmsg )
 		GCDEST gcd = {0};

 		GCEVENT gce = {0};

 

-		CMString S = MakeWndID( pmsg->parameters[0].c_str() );

+		CMString S = MakeWndID( pmsg->parameters[0].c_str());

 		gce.cbSize = sizeof(GCEVENT);

 		gce.dwFlags = GC_TCHAR;

 		gcd.ptszID = ( TCHAR* )S.c_str();

@@ -513,7 +513,7 @@ bool CIrcProto::OnIrc_MODE( const CIrcMessage* pmsg )
 				if ( strchr( sUserModes.c_str(), (char)*p1 )) {

 					CMString sStatus = ModeToStatus( *p1 );

 					if (( int )pmsg->parameters.getCount() > iParametercount ) {	

-						if ( !_tcscmp(pmsg->parameters[2].c_str(), m_info.sNick.c_str() )) {

+						if ( !_tcscmp(pmsg->parameters[2].c_str(), m_info.sNick.c_str())) {

 							char cModeBit = -1;

 							CHANNELINFO* wi = (CHANNELINFO *)DoEvent( GC_EVENT_GETITEMDATA, pmsg->parameters[0].c_str(), NULL, NULL, NULL, NULL, NULL, false, false, 0 );

 							switch (*p1) {

@@ -907,12 +907,12 @@ bool CIrcProto::IsCTCP( const CIrcMessage* pmsg )
 					}	}	}

 				}

 				// ... or try another method of separating the dcc command

-				else if ( !GetWord(mess.c_str(), (bIsChat) ? 4 : 5 ).IsEmpty() ) {

+				else if ( !GetWord(mess.c_str(), (bIsChat) ? 4 : 5 ).IsEmpty()) {

 					int index = (bIsChat) ? 4 : 5;

 					bool bFlag = false;

 

 					// look for the part of the ctcp command that contains adress, port and size

-					while ( !bFlag && !GetWord(mess.c_str(), index).IsEmpty() ) {

+					while ( !bFlag && !GetWord(mess.c_str(), index).IsEmpty()) {

 						CMString sTemp;

 						

 						if ( type == _T("chat"))

@@ -928,7 +928,7 @@ bool CIrcProto::IsCTCP( const CIrcMessage* pmsg )
 							ind++;

 						}

 						

-						if ( sTemp[ind] == '\0' && GetWord( mess.c_str(), index + ((bIsChat) ? 1 : 2 )).IsEmpty() )

+						if ( sTemp[ind] == '\0' && GetWord( mess.c_str(), index + ((bIsChat) ? 1 : 2 )).IsEmpty())

 							bFlag = true;

 						index++;

 					}

@@ -976,12 +976,12 @@ bool CIrcProto::IsCTCP( const CIrcMessage* pmsg )
 					}	}	}

 				}

 				// ... or try another method of separating the dcc command

-				else if ( !GetWord(mess.c_str(), 4).IsEmpty() ) {

+				else if ( !GetWord(mess.c_str(), 4).IsEmpty()) {

 					int index = 4;

 					bool bFlag = false;

 

 					// look for the part of the ctcp command that contains adress, port and size

-					while ( !bFlag && !GetWord(mess.c_str(), index).IsEmpty() ) {

+					while ( !bFlag && !GetWord(mess.c_str(), index).IsEmpty()) {

 						CMString sTemp = GetWord(mess.c_str(), index-1) + GetWord(mess.c_str(), index);

 						

 						// if all characters are number it indicates we have found the adress, port and size parameters

@@ -993,7 +993,7 @@ bool CIrcProto::IsCTCP( const CIrcMessage* pmsg )
 							ind++;

 						}

 						

-						if ( sTemp[ind] == '\0' && GetWord(mess.c_str(), index + 2).IsEmpty() )

+						if ( sTemp[ind] == '\0' && GetWord(mess.c_str(), index + 2).IsEmpty())

 							bFlag = true;

 						index++;

 					}

@@ -1165,7 +1165,7 @@ bool CIrcProto::IsCTCP( const CIrcMessage* pmsg )
 						di->bSender = false;

 						di->bTurbo = bTurbo;

 						di->bSSL = false;

-						di->bReverse = (iPort == 0 && !sToken.IsEmpty() ) ? true : false;

+						di->bReverse = (iPort == 0 && !sToken.IsEmpty()) ? true : false;

 						if ( di->bReverse )

 							di->sToken = sTokenBackup;

 

@@ -1210,16 +1210,16 @@ bool CIrcProto::IsCTCP( const CIrcMessage* pmsg )
 			}

 

 		// if the whois window is visible and the ctcp reply belongs to the user in it, then show the reply in the whois window

-		if ( m_whoisDlg && IsWindowVisible( m_whoisDlg->GetHwnd() )) {

+		if ( m_whoisDlg && IsWindowVisible( m_whoisDlg->GetHwnd())) {

 			m_whoisDlg->m_InfoNick.GetText( szTemp, SIZEOF(szTemp));

 			if ( lstrcmpi(szTemp, pmsg->prefix.sNick.c_str()) == 0 ) {

 				if ( pmsg->m_bIncoming && (command == _T("version") || command == _T("userinfo") || command == _T("time"))) {

-					SetActiveWindow( m_whoisDlg->GetHwnd() );

+					SetActiveWindow( m_whoisDlg->GetHwnd());

 					m_whoisDlg->m_Reply.SetText( DoColorCodes(GetWordAddress(mess.c_str(), 1), TRUE, FALSE));

 					return true;

 				}

 				if (pmsg->m_bIncoming && command == _T("ping")) {

-					SetActiveWindow( m_whoisDlg->GetHwnd() );

+					SetActiveWindow( m_whoisDlg->GetHwnd());

 					int s = (int)time(0) - (int)_ttol(GetWordAddress(mess.c_str(), 1));

 					TCHAR szTemp[30];

 					if ( s == 1 )

@@ -1261,10 +1261,10 @@ bool CIrcProto::OnIrc_ENDNAMES( const CIrcMessage* pmsg )
 		BOOL bFlag = false;

 

 		// Is the user on the names list?

-		while ( !name.IsEmpty() ) {

+		while ( !name.IsEmpty()) {

 			name = GetWord( sNamesList.c_str(), i );

 			i++;

-			if ( !name.IsEmpty() ) {

+			if ( !name.IsEmpty()) {

 				int index = 0;

 				while ( _tcschr( sUserModePrefixes.c_str(), name[index] ))

 					index++;

@@ -1325,7 +1325,7 @@ bool CIrcProto::OnIrc_ENDNAMES( const CIrcMessage* pmsg )
 				sTemp = GetWord(sNamesList.c_str(), i);

 

 				// Fill the nicklist

-				while ( !sTemp.IsEmpty() ) {

+				while ( !sTemp.IsEmpty()) {

 					CMString sStat;

 					CMString sTemp2 = sTemp;

 					sStat = PrefixToStatus(sTemp[0]);

@@ -1412,10 +1412,10 @@ bool CIrcProto::OnIrc_ENDNAMES( const CIrcMessage* pmsg )
 					CMString save = _T("");

 					int i = 0;

 

-					while ( !command.IsEmpty() ) {

+					while ( !command.IsEmpty()) {

 						command = GetWord( dbv.ptszVal, i );

 						i++;

-						if ( !command.IsEmpty() ) {

+						if ( !command.IsEmpty()) {

 							CMString S = command.Mid(1, command.GetLength());

 							if ( !lstrcmpi( sChanName, S.c_str()))

 								break;

@@ -1423,7 +1423,7 @@ bool CIrcProto::OnIrc_ENDNAMES( const CIrcMessage* pmsg )
 							save += command + _T(" ");

 					}	}

 

-					if ( !command.IsEmpty() ) {

+					if ( !command.IsEmpty()) {

 						save += GetWordAddress( dbv.ptszVal, i );

 						switch ( command[0] ) {

 						case 'M':

@@ -1788,7 +1788,7 @@ bool CIrcProto::OnIrc_WHOIS_NO_USER( const CIrcMessage* pmsg )
 		CONTACT user = { (TCHAR*)pmsg->parameters[1].c_str(), NULL, NULL, false, false, false};

 		HANDLE hContact = CList_FindContact( &user );

 		if ( hContact ) {

-			AddOutgoingMessageToDB( hContact, (TCHAR*)((CMString)_T("> ") + pmsg->parameters[2] + (CMString)_T(": ") + pmsg->parameters[1]).c_str() );

+			AddOutgoingMessageToDB( hContact, (TCHAR*)((CMString)_T("> ") + pmsg->parameters[2] + (CMString)_T(": ") + pmsg->parameters[1]).c_str());

 

 			DBVARIANT dbv;

 			if ( !getTString( hContact, "Default", &dbv )) {

@@ -1832,10 +1832,10 @@ static void __stdcall sttShowNickWnd( void* param )
 bool CIrcProto::OnIrc_NICK_ERR( const CIrcMessage* pmsg )

 {

 	if ( pmsg->m_bIncoming ) {

-		if ( nickflag && ((m_alternativeNick[0] != 0)) && (pmsg->parameters.getCount() > 2  && _tcscmp(pmsg->parameters[1].c_str(), m_alternativeNick)) ) {

+		if ( nickflag && ((m_alternativeNick[0] != 0)) && (pmsg->parameters.getCount() > 2  && _tcscmp(pmsg->parameters[1].c_str(), m_alternativeNick))) {

 			TCHAR m[200];

 			mir_sntprintf( m, SIZEOF(m), _T("NICK %s"), m_alternativeNick );

-			if ( IsConnected() )

+			if ( IsConnected())

 				SendIrcMessage( m );

 		}

 		else {

@@ -1856,7 +1856,7 @@ bool CIrcProto::OnIrc_JOINERROR( const CIrcMessage* pmsg )
 			CMString save = _T("");

 			int i = 0;

 

-			while ( !command.IsEmpty() ) {

+			while ( !command.IsEmpty()) {

 				command = GetWord( dbv.ptszVal, i );

 				i++;

 

@@ -1960,7 +1960,7 @@ bool CIrcProto::OnIrc_WHO_END( const CIrcMessage* pmsg )
 			}

 

 			/// if it is not a channel

-			TCHAR* UserList = mir_tstrdup( m_whoReply.c_str() );

+			TCHAR* UserList = mir_tstrdup( m_whoReply.c_str());

 			const TCHAR* p1= UserList;

 			m_whoReply = _T("");

 			CONTACT user = { (TCHAR*)pmsg->parameters[1].c_str(), NULL, NULL, false, true, false};

@@ -2108,8 +2108,8 @@ bool CIrcProto::OnIrc_USERHOST_REPLY( const CIrcMessage* pmsg )
 			// Cycle through results

 			j = 0;

 			sTemp = GetWord( pmsg->parameters[1].c_str(), j );

-			while ( !sTemp.IsEmpty() ) {

-				p1 = mir_tstrdup( sTemp.c_str() );

+			while ( !sTemp.IsEmpty()) {

+				p1 = mir_tstrdup( sTemp.c_str());

 				p2 = p1;

 

 				// Pull out host, user and nick

@@ -2132,7 +2132,7 @@ bool CIrcProto::OnIrc_USERHOST_REPLY( const CIrcMessage* pmsg )
 				}

 				mess = _T("");

 				mask = nick + _T("!") + user + _T("@") + host;

-				if ( host.IsEmpty() || user.IsEmpty() || nick.IsEmpty() ) {

+				if ( host.IsEmpty() || user.IsEmpty() || nick.IsEmpty()) {

 					mir_free( p1 );

 					continue;

 				}

@@ -2154,7 +2154,7 @@ bool CIrcProto::OnIrc_USERHOST_REPLY( const CIrcMessage* pmsg )
 

 						// If user found, remove from checklist

 						for ( i = 0; i < checklist.getCount(); i++ )

-							if ( !lstrcmpi(checklist[i].c_str(), nick.c_str() ))

+							if ( !lstrcmpi(checklist[i].c_str(), nick.c_str()))

 								checklist.remove( i );

 					}

 					break;

@@ -2237,7 +2237,7 @@ bool CIrcProto::OnIrc_SUPPORT( const CIrcMessage* pmsg )
 	if ( pmsg->m_bIncoming && pmsg->parameters.getCount() > 0 ) {

 		CMString S;

 		for ( int i = 0; i < pmsg->parameters.getCount(); i++ ) {

-			TCHAR* temp = mir_tstrdup( pmsg->parameters[i].c_str() );

+			TCHAR* temp = mir_tstrdup( pmsg->parameters[i].c_str());

 			if ( _tcsstr( temp, _T("CHANTYPES="))) {

 				TCHAR* p1 = _tcschr( temp, '=' );

 				p1++;

@@ -2332,7 +2332,7 @@ void CIrcProto::OnIrcDisconnected()
 		CallChatEvent( SESSION_OFFLINE, (LPARAM)&gce);

 	}

 

-	if ( !Miranda_Terminated() )

+	if ( !Miranda_Terminated())

 		CList_SetAllOffline( m_disconnectDCCChats );

 	

 	// restore the original nick, cause it might be changed

@@ -2386,7 +2386,7 @@ bool CIrcProto::DoOnConnect( const CIrcMessage* )
 	

 	if ( m_perform ) {

 		DoPerform( "ALL NETWORKS" );

-		if ( IsConnected() ) {

+		if ( IsConnected()) {

 			DoPerform( _T2A( m_info.sNetwork.c_str()));

 			switch( m_iStatus ) {

 				case ID_STATUS_FREECHAT:   DoPerform( "Event: Free for chat" );   break;

@@ -2473,7 +2473,7 @@ int CIrcProto::IsIgnored( CMString user, char type )
 			if ( !_tcschr( C.flags.c_str(), type ))

 				continue;

 

-			if ( C.network.IsEmpty() )

+			if ( C.network.IsEmpty())

 				return i+1;

 

 			if ( IsConnected() && !lstrcmpi( C.network.c_str(), m_info.sNetwork.c_str()))

diff --git a/protocols/IRCG/input.cpp b/protocols/IRCG/input.cpp
index bdcedaae82..88c980149d 100644
--- a/protocols/IRCG/input.cpp
+++ b/protocols/IRCG/input.cpp
@@ -249,11 +249,11 @@ BOOL CIrcProto::DoHardcodedCommand( CMString text, TCHAR* window, HANDLE hContac
 

 	if (command == _T("/clear")) {

 		CMString S;

-		if ( !one.IsEmpty() ) {

+		if ( !one.IsEmpty()) {

 			if ( one == _T("server"))

 				S = SERVERWINDOW;

 			else

-				S = MakeWndID( one.c_str() );

+				S = MakeWndID( one.c_str());

 		}

 		else if ( lstrcmpi( window, SERVERWINDOW) == 0 )

 			S = window;

@@ -273,10 +273,10 @@ BOOL CIrcProto::DoHardcodedCommand( CMString text, TCHAR* window, HANDLE hContac
 	}

 

 	if ( command == _T("/ignore")) {

-		if ( IsConnected() ) {

+		if ( IsConnected()) {

 			CMString IgnoreFlags;

 			TCHAR temp[500];

-			if ( one.IsEmpty() ) {

+			if ( one.IsEmpty()) {

 				if ( m_ignore )

 					DoEvent( GC_EVENT_INFORMATION, NULL, m_info.sNick.c_str(), TranslateT("Ignore system is enabled"), NULL, NULL, NULL, true, false);

 				else

@@ -313,12 +313,12 @@ BOOL CIrcProto::DoHardcodedCommand( CMString text, TCHAR* window, HANDLE hContac
 			else IgnoreFlags = _T("qnidc");

 

 			CMString m_network;

-			if ( three.IsEmpty() )

+			if ( three.IsEmpty())

 				m_network = m_info.sNetwork;

 			else

 				m_network = three;

 

-			AddIgnore( one.c_str(), IgnoreFlags.c_str(), m_network.c_str() );

+			AddIgnore( one.c_str(), IgnoreFlags.c_str(), m_network.c_str());

 

 			mir_sntprintf(temp, SIZEOF(temp), TranslateT("%s on %s is now ignored (+%s)"), one.c_str(), m_network.c_str(), IgnoreFlags.c_str());

 			DoEvent( GC_EVENT_INFORMATION, NULL, m_info.sNick.c_str(), temp, NULL, NULL, NULL, true, false);

@@ -450,9 +450,9 @@ BOOL CIrcProto::DoHardcodedCommand( CMString text, TCHAR* window, HANDLE hContac
 

 	if ( command == _T("/channelmanager")) {

 		if ( window && !hContact && IsChannel( window )) {

-			if ( IsConnected() ) {

+			if ( IsConnected()) {

 				if ( m_managerDlg != NULL ) {

-					SetActiveWindow( m_managerDlg->GetHwnd() );

+					SetActiveWindow( m_managerDlg->GetHwnd());

 					m_managerDlg->Close();

 				}

 				else {

@@ -507,7 +507,7 @@ BOOL CIrcProto::DoHardcodedCommand( CMString text, TCHAR* window, HANDLE hContac
 			m_listDlg = new CListDlg( this );

 			m_listDlg->Show();

 		}

-		SetActiveWindow( m_listDlg->GetHwnd() );

+		SetActiveWindow( m_listDlg->GetHwnd());

 		int minutes = ( int )m_noOfChannels/4000;

 		int minutes2 = ( int )m_noOfChannels/9000;

 

@@ -841,7 +841,7 @@ bool CIrcProto::PostIrcMessageWnd( TCHAR* window, HANDLE hContact, const TCHAR*
 	CMString Message = szBuf;

 	AddCR( Message );

 	RemoveLinebreaks( Message );

-	if ( !hContact && IsConnected() ) {

+	if ( !hContact && IsConnected()) {

 		Message = DoAlias( Message.c_str(), windowname );

 

 		if ( Message.Find( _T("%question")) != -1 ) {

@@ -887,10 +887,10 @@ bool CIrcProto::PostIrcMessageWnd( TCHAR* window, HANDLE hContact, const TCHAR*
 

 		// Do this if the message is not a command

 		if (  (GetWord( DoThis.c_str(), 0)[0] != '/') ||													// not a command

-			  ( (GetWord( DoThis.c_str(), 0)[0] == '/') && (GetWord( DoThis.c_str(), 0)[1] == '/') ) ||		// or double backslash at the beginning

+			  ( (GetWord( DoThis.c_str(), 0)[0] == '/') && (GetWord( DoThis.c_str(), 0)[1] == '/')) ||		// or double backslash at the beginning

 			  hContact ) {

 			CMString S = _T("/PRIVMSG ");

-			if ( lstrcmpi(window, SERVERWINDOW) == 0 && !m_info.sServerName.IsEmpty() )

+			if ( lstrcmpi(window, SERVERWINDOW) == 0 && !m_info.sServerName.IsEmpty())

 				S += m_info.sServerName + _T(" ") + DoThis;

 			else

 				S += CMString(windowname) + _T(" ") + DoThis;

@@ -906,7 +906,7 @@ bool CIrcProto::PostIrcMessageWnd( TCHAR* window, HANDLE hContact, const TCHAR*
 		if ( !IsConnected() && !bDCC )

 			continue;

 

-		if ( !flag && IsConnected() )

+		if ( !flag && IsConnected())

 			DoThis = DoIdentifiers(DoThis, windowname);

 

 		if ( hContact ) {

@@ -921,7 +921,7 @@ bool CIrcProto::PostIrcMessageWnd( TCHAR* window, HANDLE hContact, const TCHAR*
 					dcc->SendStuff( mess.c_str());

 				}

 			}

-			else if ( IsConnected() ) {

+			else if ( IsConnected()) {

 				FormatMsg( DoThis );

 				SendIrcMessage( DoThis.c_str(), false, codepage );

 			}

diff --git a/protocols/IRCG/irclib.cpp b/protocols/IRCG/irclib.cpp
index 78d33f11dc..c018b57a02 100644
--- a/protocols/IRCG/irclib.cpp
+++ b/protocols/IRCG/irclib.cpp
@@ -52,7 +52,7 @@ CIrcMessage::CIrcMessage(const CIrcMessage& m) :
 	m_bNotify( m.m_bNotify ),

 	m_codePage( m.m_codePage ),

 	m_proto( m.m_proto ),

-	parameters( m.parameters.getCount() )

+	parameters( m.parameters.getCount())

 {

 	prefix.sNick = m.prefix.sNick;

 	prefix.sUser = m.prefix.sUser;

@@ -213,7 +213,7 @@ bool CIrcProto::Connect(const CIrcSessionInfo& info)
 			return false;

 	}	}

 

-	if ( Miranda_Terminated() ) {

+	if ( Miranda_Terminated()) {

 		Disconnect();

 		return false;

 	}

@@ -223,7 +223,7 @@ bool CIrcProto::Connect(const CIrcSessionInfo& info)
 	// start receiving messages from host

 	ircFork( &CIrcProto::ThreadProc, NULL );

 	Sleep( 100 );

-	if ( info.sPassword.GetLength() )

+	if ( info.sPassword.GetLength())

 		NLSend( "PASS %s\r\n", info.sPassword.c_str());

 	NLSend( _T("NICK %s\r\n"), info.sNick.c_str());

 

@@ -232,7 +232,7 @@ bool CIrcProto::Connect(const CIrcSessionInfo& info)
 	DWORD cbHostName = SIZEOF( szHostName );

 	GetComputerName(szHostName, &cbHostName);

 	CMString HostName = GetWord(szHostName, 0);

-	if ( m_userID.IsEmpty() )

+	if ( m_userID.IsEmpty())

 		m_userID = _T("Miranda");

 	if ( HostName.IsEmpty())

 		HostName= _T("host");

@@ -691,7 +691,7 @@ void CIrcSessionInfo::Reset()
 void CIrcProto::OnIrcMessage(const CIrcMessage* pmsg)

 {

 	if ( pmsg != NULL ) {

-		PfnIrcMessageHandler pfn = FindMethod( pmsg->sCommand.c_str() );

+		PfnIrcMessageHandler pfn = FindMethod( pmsg->sCommand.c_str());

 		if ( pfn ) {

 			// call member function. if it returns 'false',

 			// call the default handling

@@ -702,7 +702,7 @@ void CIrcProto::OnIrcMessage(const CIrcMessage* pmsg)
 			}

 			__except( EXCEPTION_EXECUTE_HANDLER ) // dedicated to Sava :)

 			{

-				DoNetlibLog( "IRC handler feels sick: %S", pmsg->sCommand.c_str() );

+				DoNetlibLog( "IRC handler feels sick: %S", pmsg->sCommand.c_str());

 			}

 		}

 		else // handler not found. call default handler

@@ -853,7 +853,7 @@ int CDccSession::NLReceive(const unsigned char* buf, int cbBuf)
 

 int CDccSession::SendStuff(const TCHAR* fmt)

 {

-	String buf = _T2A( fmt, m_proto->getCodepage() );

+	String buf = _T2A( fmt, m_proto->getCodepage());

 	return NLSend(( const unsigned char* )buf.c_str(), buf.GetLength());

 }

 

diff --git a/protocols/IRCG/ircproto.cpp b/protocols/IRCG/ircproto.cpp
index 3fd32d1f68..6afe5328e7 100644
--- a/protocols/IRCG/ircproto.cpp
+++ b/protocols/IRCG/ircproto.cpp
@@ -435,7 +435,7 @@ HANDLE __cdecl CIrcProto::FileAllow( HANDLE, HANDLE hTransfer, const TCHAR* szPa
 {

 	DCCINFO* di = ( DCCINFO* )hTransfer;

 

-	if ( !IsConnected() ) {

+	if ( !IsConnected()) {

 		delete di;

 		return (HANDLE)szPath;

 	}

diff --git a/protocols/IRCG/options.cpp b/protocols/IRCG/options.cpp
index 61684cbae1..2152e340c9 100644
--- a/protocols/IRCG/options.cpp
+++ b/protocols/IRCG/options.cpp
@@ -352,7 +352,7 @@ struct CServerDlg : public CProtoDlgBase<CIrcProto>
 	CCtrlCombo m_groupCombo;

 

 	CServerDlg( CIrcProto* _pro, CConnectPrefsDlg* _owner, int _action ) :

-		CProtoDlgBase<CIrcProto>( _pro, IDD_ADDSERVER, _owner->GetHwnd() ),

+		CProtoDlgBase<CIrcProto>( _pro, IDD_ADDSERVER, _owner->GetHwnd()),

 		m_owner( _owner ),

 		m_action( _action ),

 		m_OK( this, IDOK ),

@@ -1228,7 +1228,7 @@ void COtherPrefsDlg::OnApply()
 

 	int curSel = m_codepage.GetCurSel();

 	m_proto->m_codepage = m_codepage.GetItemData( curSel );

-	if ( m_proto->IsConnected() )

+	if ( m_proto->IsConnected())

 		m_proto->setCodepage( m_proto->m_codepage );

 

 	m_proto->m_utfAutodetect = m_autodetect.GetState();

@@ -1271,7 +1271,7 @@ void COtherPrefsDlg::addPerformComboValue( int idx, const char* szValueName )
 // 'add ignore' preferences dialog

 

 CAddIgnoreDlg::CAddIgnoreDlg( CIrcProto* _pro, const TCHAR* mask, CIgnorePrefsDlg* _owner ) :

-	CProtoDlgBase<CIrcProto>( _pro, IDD_ADDIGNORE, _owner->GetHwnd() ),

+	CProtoDlgBase<CIrcProto>( _pro, IDD_ADDIGNORE, _owner->GetHwnd()),

 	m_Ok( this, IDOK ),

 	m_owner( _owner )

 {

@@ -1315,7 +1315,7 @@ void CAddIgnoreDlg::OnOk( CCtrlButton* )
 		if ( !_tcschr(Mask.c_str(), '!') && !_tcschr(Mask.c_str(), '@'))

 			Mask += _T("!*@*");

 

-		if ( !flags.IsEmpty() ) {

+		if ( !flags.IsEmpty()) {

 			if ( *szOldMask )

 				m_proto->RemoveIgnore( szOldMask );

 			m_proto->AddIgnore(Mask.c_str(), flags.c_str(), szNetwork);

@@ -1341,7 +1341,7 @@ static TDbSetting IgnoreSettings[] =
 static int CALLBACK IgnoreListSort(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)

 {

 	CIgnorePrefsDlg* hwndDlg = ( CIgnorePrefsDlg* )lParamSort;

-	if ( !hwndDlg->GetHwnd() )

+	if ( !hwndDlg->GetHwnd())

 		return 1;

 

 	TCHAR temp1[512];

@@ -1418,7 +1418,7 @@ void CIrcProto::InitIgnore( void )
 			String mask = GetWord(p1, 0);

 			String flags = GetWord(p1, 1);

 			String network = GetWord(p1, 2);

-			if ( !mask.IsEmpty() )

+			if ( !mask.IsEmpty())

 				m_ignoreItems.insert( new CIrcIgnoreItem( getCodepage(), mask.c_str(), flags.c_str(), network.c_str()));

 

 			p1 = p2;

@@ -1912,7 +1912,7 @@ INT_PTR CIrcProto::SvcCreateAccMgrUI(WPARAM, LPARAM lParam)
 

 static void sttImportIni( const TCHAR* szIniFile )

 {

-	FILE* serverFile = _tfopen( szIniFile, _T("r") );

+	FILE* serverFile = _tfopen( szIniFile, _T("r"));

 	if ( serverFile == NULL )

 		return;

 

@@ -1946,7 +1946,7 @@ void InitServers()
 

 	if ( g_servers.getCount() == 0 ) {

 		TCHAR *szIniFile = Utils_ReplaceVarsT(_T("%temp%\\default_servers.ini"));

-		FILE *serverFile = _tfopen( szIniFile, _T("a") );

+		FILE *serverFile = _tfopen( szIniFile, _T("a"));

 		if (serverFile) {

 			char* pszSvrs = ( char* )LockResource(LoadResource(hInst,FindResource(hInst,MAKEINTRESOURCE(IDR_SERVERS),_T("TEXT"))));

 			if (pszSvrs)

diff --git a/protocols/IRCG/output.cpp b/protocols/IRCG/output.cpp
index 3f64810a68..6a97f45baf 100644
--- a/protocols/IRCG/output.cpp
+++ b/protocols/IRCG/output.cpp
@@ -50,7 +50,7 @@ static CMString FormatOutput (const CIrcMessage* pmsg)
 			goto THE_END;

 		}

 		

-		int index = StrToInt( pmsg->sCommand.c_str() );

+		int index = StrToInt( pmsg->sCommand.c_str());

 		if ( index == 301 && pmsg->parameters.getCount() > 0 ) {

 			TCHAR temp[500]; *temp = '\0';

 			mir_sntprintf(temp, SIZEOF(temp), TranslateT("%s is away"), pmsg->parameters[1].c_str());

@@ -117,7 +117,7 @@ static CMString FormatOutput (const CIrcMessage* pmsg)
 				sMessage += pmsg->parameters[i] + _T(" ");

 	}

 	else {

-		if ( pmsg->prefix.sNick.GetLength() )

+		if ( pmsg->prefix.sNick.GetLength())

 			sMessage = pmsg->prefix.sNick + _T(" ");

 		sMessage += pmsg->sCommand + _T(" ");

 		for ( int i=0; i < (int)pmsg->parameters.getCount(); i++ )

@@ -135,13 +135,13 @@ BOOL CIrcProto::ShowMessage (const CIrcMessage* pmsg)
 	if ( !pmsg->m_bIncoming )

 		ReplaceString( mess, _T("%%"), _T("%"));

 

-	int iTemp = StrToInt( pmsg->sCommand.c_str() );

+	int iTemp = StrToInt( pmsg->sCommand.c_str());

 

 	//To active window

 	if (( iTemp > 400 || iTemp < 500 ) && pmsg->sCommand[0] == '4' //all error messages	

 		|| pmsg->sCommand == _T("303")		//ISON command

 		|| pmsg->sCommand == _T("INVITE")

-		|| ( (pmsg->sCommand == _T("NOTICE")) && ( (pmsg->parameters.getCount() > 2) ? (_tcsstr(pmsg->parameters[1].c_str(), _T("\001"))==NULL) : false) ) // CTCP answers should go to m_network Log window!

+		|| ( (pmsg->sCommand == _T("NOTICE")) && ( (pmsg->parameters.getCount() > 2) ? (_tcsstr(pmsg->parameters[1].c_str(), _T("\001"))==NULL) : false)) // CTCP answers should go to m_network Log window!

 		|| pmsg->sCommand == _T("515"))		//chanserv error

 	{

 		DoEvent(GC_EVENT_INFORMATION, NULL, pmsg->m_bIncoming?pmsg->prefix.sNick.c_str():m_info.sNick.c_str(), mess.c_str(), NULL, NULL, NULL, true, pmsg->m_bIncoming?false:true); 

diff --git a/protocols/IRCG/scripting.cpp b/protocols/IRCG/scripting.cpp
index ed75934643..26c6bc2a55 100644
--- a/protocols/IRCG/scripting.cpp
+++ b/protocols/IRCG/scripting.cpp
@@ -25,7 +25,7 @@ INT_PTR __cdecl CIrcProto::Scripting_InsertRawIn(WPARAM, LPARAM lParam)
 {

 	char* pszRaw = ( char* ) lParam;

 

-	if ( m_bMbotInstalled && m_scriptingEnabled && pszRaw && IsConnected() ) {

+	if ( m_bMbotInstalled && m_scriptingEnabled && pszRaw && IsConnected()) {

 		TCHAR* p = mir_a2t( pszRaw );

 		InsertIncomingEvent( p );

 		mir_free( p );

@@ -38,7 +38,7 @@ INT_PTR __cdecl CIrcProto::Scripting_InsertRawIn(WPARAM, LPARAM lParam)
 INT_PTR __cdecl CIrcProto::Scripting_InsertRawOut( WPARAM, LPARAM lParam )

 {

 	char* pszRaw = ( char* ) lParam;

-	if ( m_bMbotInstalled && m_scriptingEnabled && pszRaw && IsConnected() ) {	

+	if ( m_bMbotInstalled && m_scriptingEnabled && pszRaw && IsConnected()) {	

 		String S = pszRaw;

 		ReplaceString( S, "%", "%%%%");

 		NLSendNoScript((const unsigned char *)S.c_str(), lstrlenA(S.c_str()));

@@ -254,12 +254,12 @@ INT_PTR __cdecl CIrcProto::Scripting_GetIrcData(WPARAM, LPARAM lparam)
 					j++;

 			}	}

 			

-			if ( !S.IsEmpty() )

+			if ( !S.IsEmpty())

 				sOutput = ( TCHAR* )S.c_str();

 		}

 		// send it to mbot

 		if ( !sOutput.IsEmpty())

-			return ( INT_PTR )mir_t2a( sOutput.c_str() );

+			return ( INT_PTR )mir_t2a( sOutput.c_str());

 	}

 	return 0;

 }

diff --git a/protocols/IRCG/services.cpp b/protocols/IRCG/services.cpp
index 63fd495b7a..e3b363ac15 100644
--- a/protocols/IRCG/services.cpp
+++ b/protocols/IRCG/services.cpp
@@ -395,7 +395,7 @@ INT_PTR __cdecl CIrcProto::OnQuickConnectMenuCommand(WPARAM, LPARAM)
 	}

 

 	ShowWindow( m_quickDlg->GetHwnd(), SW_SHOW );

-	SetActiveWindow( m_quickDlg->GetHwnd() );

+	SetActiveWindow( m_quickDlg->GetHwnd());

 	return 0;

 }

 

@@ -624,11 +624,11 @@ int __cdecl CIrcProto::GCEventHook(WPARAM wParam,LPARAM lParam)
 						break;

 /*					case 5:		// nickserv register nick

 						PostIrcMessage( _T("/nickserv REGISTER %%question=\"%s\",\"%s\""),

-							TranslateT("Please enter your authentification code"), TranslateT("Authentificate nick") );

+							TranslateT("Please enter your authentification code"), TranslateT("Authentificate nick"));

 						break;

 */					case 6:		// nickserv Identify

 						PostIrcMessage( _T("/nickserv AUTH %%question=\"%s\",\"%s\""),

-							TranslateT("Please enter your authentification code"), TranslateT("Authentificate nick") );

+							TranslateT("Please enter your authentification code"), TranslateT("Authentificate nick"));

 						break;

 					case 7:		// nickserv drop nick

 						if (MessageBox(0, TranslateT("Are you sure you want to unregister your current nick?"), TranslateT("Delete nick"),

@@ -642,7 +642,7 @@ int __cdecl CIrcProto::GCEventHook(WPARAM wParam,LPARAM lParam)
 							HWND question_hWnd = dlg->GetHwnd();

 							HWND hEditCtrl = GetDlgItem( question_hWnd, IDC_EDIT);

 							SetDlgItemText( question_hWnd, IDC_CAPTION, TranslateT("Identify nick"));

-							SetWindowText( GetDlgItem( question_hWnd, IDC_TEXT), TranslateT("Please enter your password") );

+							SetWindowText( GetDlgItem( question_hWnd, IDC_TEXT), TranslateT("Please enter your password"));

 							SetDlgItemText( question_hWnd, IDC_HIDDENEDIT, _T("/nickserv IDENTIFY %question=\"%s\",\"%s\""));

 							SetWindowLongPtr(GetDlgItem( question_hWnd, IDC_EDIT), GWL_STYLE,

 								(LONG)GetWindowLongPtr(GetDlgItem( question_hWnd, IDC_EDIT), GWL_STYLE) | ES_PASSWORD);

@@ -661,23 +661,23 @@ int __cdecl CIrcProto::GCEventHook(WPARAM wParam,LPARAM lParam)
 						break;

 					case 10:		// nickserv set new password

 						PostIrcMessage( _T("/nickserv SET PASSWORD %%question=\"%s\",\"%s\""),

-							TranslateT("Please enter your new password"), TranslateT("Set new password") );

+							TranslateT("Please enter your new password"), TranslateT("Set new password"));

 						break;

 					case 11:		// nickserv set language

 						PostIrcMessage( _T("/nickserv SET LANGUAGE %%question=\"%s\",\"%s\""),

-							TranslateT("Please enter desired languageID (numeric value, depends on server)"), TranslateT("Change language of NickServ messages") );

+							TranslateT("Please enter desired languageID (numeric value, depends on server)"), TranslateT("Change language of NickServ messages"));

 						break;

 					case 12:		// nickserv set homepage

 						PostIrcMessage( _T("/nickserv SET URL %%question=\"%s\",\"%s\""),

-						TranslateT("Please enter URL that will be linked to your nick"), TranslateT("Set URL, linked to nick") );

+						TranslateT("Please enter URL that will be linked to your nick"), TranslateT("Set URL, linked to nick"));

 						break;

 					case 13:		// nickserv set email

 						PostIrcMessage( _T("/nickserv SET EMAIL %%question=\"%s\",\"%s\""),

-							TranslateT("Please enter your e-mail, that will be linked to your nick"), TranslateT("Set e-mail, linked to nick") );

+							TranslateT("Please enter your e-mail, that will be linked to your nick"), TranslateT("Set e-mail, linked to nick"));

 						break;

 					case 14:		// nickserv set info

 						PostIrcMessage( _T("/nickserv SET INFO %%question=\"%s\",\"%s\""),

-							TranslateT("Please enter some information about your nick"), TranslateT("Set information for nick") );

+							TranslateT("Please enter some information about your nick"), TranslateT("Set information for nick"));

 						break;

 					case 15:		// nickserv kill unauth off

 						PostIrcMessage( _T("/nickserv SET KILL OFF"));

@@ -708,15 +708,15 @@ int __cdecl CIrcProto::GCEventHook(WPARAM wParam,LPARAM lParam)
 							break;

 					case 24:		// nickserv Link nick to current

 						PostIrcMessage( _T("/nickserv LINK %%question=\"%s\",\"%s\""),

-							TranslateT("Please enter nick you want to link to your current nick"), TranslateT("Link another nick to current nick") );

+							TranslateT("Please enter nick you want to link to your current nick"), TranslateT("Link another nick to current nick"));

 						break;

 					case 25:		// nickserv Unlink nick from current

 						PostIrcMessage( _T("/nickserv LINK %%question=\"%s\",\"%s\""),

-							TranslateT("Please enter nick you want to unlink from your current nick"), TranslateT("Unlink another nick from current nick") );

+							TranslateT("Please enter nick you want to unlink from your current nick"), TranslateT("Unlink another nick from current nick"));

 						break;

 					case 26:		// nickserv Set main nick

 						PostIrcMessage( _T("/nickserv LINK %%question=\"%s\",\"%s\""),

-							TranslateT("Please enter nick you want to set as your main nick"), TranslateT("Set main nick") );

+							TranslateT("Please enter nick you want to set as your main nick"), TranslateT("Set main nick"));

 						break;

 					case 27:		// nickserv list all linked nicks

 						PostIrcMessage( _T("/nickserv LISTLINKS"));

@@ -746,7 +746,7 @@ int __cdecl CIrcProto::GCEventHook(WPARAM wParam,LPARAM lParam)
 						break;

 					case 6:

 						PostIrcMessage( _T("/KICK %s %s %%question=\"%s\",\"%s\",\"%s\""),

-							p1, gch->ptszUID, TranslateT("Please enter the reason"), TranslateT("Kick"), TranslateT("Jerk") );

+							p1, gch->ptszUID, TranslateT("Please enter the reason"), TranslateT("Kick"), TranslateT("Jerk"));

 						break;

 					case 7:

 						DoUserhostWithReason(1, _T("B") + (CMString)p1, true, _T("%s"), gch->ptszUID );

@@ -795,11 +795,11 @@ int __cdecl CIrcProto::GCEventHook(WPARAM wParam,LPARAM lParam)
 						break;

 					case 22:

 						PostIrcMessage( _T("/NOTICE %s %%question=\"%s\",\"%s\""),

-							gch->ptszUID, TranslateT("Please enter the notice text"), TranslateT("Send notice") );

+							gch->ptszUID, TranslateT("Please enter the notice text"), TranslateT("Send notice"));

 						break;

 					case 23:

 						PostIrcMessage( _T("/INVITE %s %%question=\"%s\",\"%s\""),

-							gch->ptszUID, TranslateT("Please enter the channel name to invite to"), TranslateT("Invite to channel") );

+							gch->ptszUID, TranslateT("Please enter the channel name to invite to"), TranslateT("Invite to channel"));

 						break;

 					case 30:

 						{

@@ -988,13 +988,13 @@ int __cdecl CIrcProto::OnPreShutdown(WPARAM, LPARAM)
 {

 	EnterCriticalSection(&cs);

 

-	if ( m_perform && IsConnected() )

+	if ( m_perform && IsConnected())

 		if ( DoPerform( "Event: Disconnect" ))

 			Sleep( 200 );

 

 	DisconnectAllDCCSessions( true );

 

-	if ( IsConnected() )

+	if ( IsConnected())

 		Disconnect();

 	if ( m_listDlg )

 		m_listDlg->Close();

@@ -1042,13 +1042,13 @@ int __cdecl CIrcProto::OnMenuPreBuild(WPARAM wParam, LPARAM)
 			else {

 				// for normal contact

 				clmi.flags = CMIM_FLAGS | CMIF_NOTOFFLINE;

-				if ( !IsConnected() )

+				if ( !IsConnected())

 					clmi.flags = CMIM_FLAGS | CMIF_HIDDEN;

 				CallService( MS_CLIST_MODIFYMENUITEM, ( WPARAM )hUMenuWhois, ( LPARAM )&clmi );

 

 				if (bIsOnline) {

 					DBVARIANT dbv3;

-					if ( !getString( hContact, "Host", &dbv3) ) {

+					if ( !getString( hContact, "Host", &dbv3)) {

 						if (dbv3.pszVal[0] == 0)

 							clmi.flags = CMIM_FLAGS | CMIF_HIDDEN;

 						DBFreeVariant( &dbv3 );

@@ -1065,7 +1065,7 @@ int __cdecl CIrcProto::OnMenuPreBuild(WPARAM wParam, LPARAM)
 int __cdecl CIrcProto::OnDbSettingChanged(WPARAM wParam, LPARAM lParam)

 {

 	HANDLE hContact = ( HANDLE ) wParam;

-	if ( hContact == NULL || !IsConnected() )

+	if ( hContact == NULL || !IsConnected())

 		return 0;

 

 	DBCONTACTWRITESETTING* cws = ( DBCONTACTWRITESETTING* )lParam;

@@ -1075,10 +1075,10 @@ int __cdecl CIrcProto::OnDbSettingChanged(WPARAM wParam, LPARAM lParam)
 	if ( cws->value.type != DBVT_DELETED && !( cws->value.type==DBVT_BYTE && cws->value.bVal==0 ))

 		return 0;

 

-	if ( !strcmp( cws->szSetting, "NotOnList" ) ) {

+	if ( !strcmp( cws->szSetting, "NotOnList" )) {

 		DBVARIANT dbv;

 		if ( !getTString( hContact, "Nick", &dbv )) {

-			if ( getByte( "MirVerAutoRequest", 1) )

+			if ( getByte( "MirVerAutoRequest", 1))

 				PostIrcMessage( _T("/PRIVMSG %s \001VERSION\001"), dbv.ptszVal );

 			DBFreeVariant( &dbv );

 	}	}

@@ -1128,7 +1128,7 @@ void __cdecl CIrcProto::DisconnectServerThread( void* )
 {

 	EnterCriticalSection( &cs );

 	KillChatTimer( RetryTimer );

-	if ( IsConnected() )

+	if ( IsConnected())

 		Disconnect();

 	LeaveCriticalSection( &cs );

 	return;

@@ -1184,7 +1184,7 @@ void CIrcProto::DisconnectFromServer(void)
 	GCEVENT gce = {0};

 	GCDEST gcd = {0};

 

-	if ( m_perform && IsConnected() )

+	if ( m_perform && IsConnected())

 		DoPerform( "Event: Disconnect" );

 

 	gcd.iType = GC_EVENT_CONTROL;

@@ -1241,7 +1241,7 @@ VOID CALLBACK RetryTimerProc( HWND, UINT, UINT_PTR idEvent, DWORD )
 	else ppro->KillChatTimer( ppro->RetryTimer );

 }

 

-// logs text into NetLib (stolen from Jabber ;) )

+// logs text into NetLib (stolen from Jabber ;))

 void CIrcProto::DoNetlibLog( const char* fmt, ... )

 {

 	va_list vararg;

diff --git a/protocols/IRCG/tools.cpp b/protocols/IRCG/tools.cpp
index 5044c12715..d9218b2b42 100644
--- a/protocols/IRCG/tools.cpp
+++ b/protocols/IRCG/tools.cpp
@@ -117,7 +117,7 @@ void CIrcProto::AddToJTemp(TCHAR op, CMString& sCommand)
 			break;

 

 		tmp = op + tmp;

-		if ( res.IsEmpty() )

+		if ( res.IsEmpty())

 			res = tmp;

 		else

 			res += _T(" ") + tmp;

@@ -227,7 +227,7 @@ void __stdcall RemoveLinebreaks( CMString& Message )
 	if (Message.Find( _T("\r\n"), 0) == 0)

 		Message.Delete(0,2);

 

-	if ( (Message.GetLength() > 1) && (Message.Find(_T("\r\n"), Message.GetLength()-2) == 0) )

+	if ( (Message.GetLength() > 1) && (Message.Find(_T("\r\n"), Message.GetLength()-2) == 0))

 		Message.Delete(Message.GetLength()-2, 2);

 }

 

@@ -542,7 +542,7 @@ INT_PTR CIrcProto::CallChatEvent(WPARAM wParam, LPARAM lParam)
 			//MBOT CORRECTIONS

 			//if ( gcetemp && gcetemp->pDest && gcetemp->pDest->ptszID ) {

 			if ( gcetemp && gcetemp->pDest && gcetemp->pDest->ptszID && 

-				!my_strstri(gcetemp->pDest->ptszID, (IsConnected()) ? m_info.sNetwork.c_str() : TranslateT("Offline")) ) {

+				!my_strstri(gcetemp->pDest->ptszID, (IsConnected()) ? m_info.sNetwork.c_str() : TranslateT("Offline"))) {

 

 				CMString sTempId = MakeWndID( gcetemp->pDest->ptszID );

 				mir_realloc( gcetemp->pDest->ptszID, sizeof(TCHAR)*(sTempId.GetLength() + 1));

@@ -611,7 +611,7 @@ INT_PTR CIrcProto::DoEvent(int iEvent, const TCHAR* pszWindow, const TCHAR* pszN
 	else

 	  gce.ptszUserInfo = m_showAddresses ? pszUserInfo : NULL;

 

-	if ( !sText.IsEmpty() )

+	if ( !sText.IsEmpty())

 		gce.ptszText = sText.c_str();

 

 	gce.dwItemData = dwItemData;

diff --git a/protocols/IRCG/ui_utils.cpp b/protocols/IRCG/ui_utils.cpp
index 3f8cb48029..d7c8e4b6b6 100644
--- a/protocols/IRCG/ui_utils.cpp
+++ b/protocols/IRCG/ui_utils.cpp
@@ -551,7 +551,7 @@ CCtrlMButton::CCtrlMButton( CDlgBase* dlg, int ctrlId, HICON hIcon, const char*
 

 CCtrlMButton::CCtrlMButton( CDlgBase* dlg, int ctrlId, int iCoreIcon, const char* tooltip ) :

 	CCtrlButton( dlg, ctrlId ),

-	m_hIcon( LoadSkinnedIcon(iCoreIcon) ),

+	m_hIcon( LoadSkinnedIcon(iCoreIcon)),

 	m_toolTip( tooltip )

 {

 }

diff --git a/protocols/IRCG/windows.cpp b/protocols/IRCG/windows.cpp
index 6eef163d34..313e99353c 100644
--- a/protocols/IRCG/windows.cpp
+++ b/protocols/IRCG/windows.cpp
@@ -169,12 +169,12 @@ void CWhoisDlg::ShowMessage( const CIrcMessage* pmsg )
 	m_InfoName.SetText( pmsg->parameters[5].c_str());	

 	m_InfoAddress.SetText( pmsg->parameters[3].c_str());

 	m_InfoId.SetText( pmsg->parameters[2].c_str());

-	m_InfoChannels.SetText( _T("") );

-	m_InfoServer.SetText( _T("") );

-	m_InfoAway2.SetText( _T("") );

-	m_InfoAuth.SetText( _T("") );

-	m_InfoOther.SetText( _T("") );

-	m_Reply.SetText( _T("") );

+	m_InfoChannels.SetText( _T(""));

+	m_InfoServer.SetText( _T(""));

+	m_InfoAway2.SetText( _T(""));

+	m_InfoAuth.SetText( _T(""));

+	m_InfoOther.SetText( _T(""));

+	m_Reply.SetText( _T(""));

 	SetWindowText( m_hwnd, TranslateT("User information"));

 	EnableWindow( GetDlgItem( m_hwnd, ID_INFO_QUERY), true );

 	ShowWindow( m_hwnd, SW_SHOW);

@@ -189,13 +189,13 @@ void CWhoisDlg::ShowMessageNoUser( const CIrcMessage* pmsg )
 	m_InfoNick.SetText( pmsg->parameters[2].c_str());

 	m_InfoNick.SendMsg( CB_SETEDITSEL, 0,MAKELPARAM(0,-1));

 	m_Caption.SetText( pmsg->parameters[2].c_str());	

-	m_InfoName.SetText(  _T("") );

-	m_InfoAddress.SetText(  _T("") );

-	m_InfoId.SetText(  _T("") );

-	m_InfoChannels.SetText( _T("") );

-	m_InfoServer.SetText( _T("") );

-	m_InfoAway2.SetText( _T("") );

-	m_InfoAuth.SetText( _T("") );

+	m_InfoName.SetText(  _T(""));

+	m_InfoAddress.SetText(  _T(""));

+	m_InfoId.SetText(  _T(""));

+	m_InfoChannels.SetText( _T(""));

+	m_InfoServer.SetText( _T(""));

+	m_InfoAway2.SetText( _T(""));

+	m_InfoAuth.SetText( _T(""));

 	m_Reply.SetText( _T(""));

 	EnableWindow(GetDlgItem(m_hwnd, ID_INFO_QUERY), false);

 }

@@ -422,7 +422,7 @@ struct ListViewSortParam
 static int CALLBACK ListViewSort(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)

 {

 	ListViewSortParam* param = ( ListViewSortParam* )lParamSort;

-	if ( !param->pList->GetHwnd() )

+	if ( !param->pList->GetHwnd())

 		return 0;

 

 	TCHAR temp1[512];

@@ -926,7 +926,7 @@ void CManagerDlg::OnClose()
 			S += _T(" ") + S1;

 	}	}

 

-	if ( !S.IsEmpty() && m_proto->IsConnected() ) {

+	if ( !S.IsEmpty() && m_proto->IsConnected()) {

 		mir_sntprintf( temp, SIZEOF(temp), _T("Topic%s%s"), window, m_proto->m_info.sNetwork.c_str());

 		char* p = mir_t2a(temp);

 		m_proto->setTString(p, S.c_str());

@@ -1228,7 +1228,7 @@ void CManagerDlg::OnCheck5( CCtrlData* )
 

 void CManagerDlg::OnCheck6( CCtrlData* )

 {

-	m_limit.Enable( m_check6.GetState() );				

+	m_limit.Enable( m_check6.GetState());				

 	m_applyModes.Enable();

 }

 

@@ -1272,7 +1272,7 @@ void CManagerDlg::InitManager( int mode, const TCHAR* window )
 

 	CHANNELINFO* wi = (CHANNELINFO *)m_proto->DoEvent(GC_EVENT_GETITEMDATA, window, NULL, NULL, NULL, NULL, NULL, FALSE, FALSE, 0);

 	if ( wi ) {

-		if ( m_proto->IsConnected() ) {

+		if ( m_proto->IsConnected()) {

 			TCHAR temp[1000];

 			mir_sntprintf(temp, SIZEOF(temp), _T("Topic%s%s"), window, m_proto->m_info.sNetwork.c_str());