- fix for View mode frame;

- many unneeded spaces removed

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

6 files changed, 87 insertions, 91 deletions

diff --git a/plugins/Clist_modern/hdr/MString.h b/plugins/Clist_modern/hdr/MString.h
index 28840fd84b..497f074e5d 100644
--- a/plugins/Clist_modern/hdr/MString.h
+++ b/plugins/Clist_modern/hdr/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,11 +389,11 @@ public:
 	}

 	void SetString( PCXSTR pszSrc )

 	{

-		SetString( pszSrc, StringLength( pszSrc ) );

+		SetString( pszSrc, StringLength( pszSrc ));

 	}

 	void assign( PCXSTR pszSrc )

 	{

-		SetString( pszSrc, StringLength( pszSrc ) );

+		SetString( pszSrc, StringLength( pszSrc ));

 	}

 	void SetString( PCXSTR pszSrc, int nLength )

 	{

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

 		CMSimpleStringT s;

 

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

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

 

 		return s;

 	}

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

 		CMSimpleStringT s;

 

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

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

 

 		return s;

 	}

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

 		CMSimpleStringT s;

 

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

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

 

 		return s;

 	}

@@ -531,7 +531,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);

@@ -582,7 +582,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 );

 	}

@@ -680,19 +680,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)

 	}

 

@@ -700,7 +700,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)

 	}

 

@@ -726,7 +726,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 );

@@ -745,7 +745,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 )

@@ -772,7 +772,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)

@@ -839,13 +839,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 )

@@ -857,7 +857,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 )

@@ -883,12 +883,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 )

@@ -1072,7 +1072,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 )

@@ -1366,7 +1366,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

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

 			  iIndex = 0;

 

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

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

 				iIndex = this->GetLength();

 

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

@@ -1391,9 +1391,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;

 

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

 			  iIndex = 0;

 

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

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

 		  {

 			  iIndex = this->GetLength();

 		  }

@@ -1422,10 +1422,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 );

@@ -1444,7 +1444,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;

@@ -1492,7 +1492,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;

@@ -1509,7 +1509,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;

@@ -1518,13 +1518,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);

@@ -1575,7 +1575,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 );

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

 				  int nIncluding = StringTraits::StringSpanIncluding( pszPlace, pszTokens );

 

-				  if ( (pszPlace+nIncluding) < pszEnd )

+				  if ((pszPlace+nIncluding) < pszEnd )

 				  {

 					  pszPlace += nIncluding;

 					  int nExcluding = StringTraits::StringSpanExcluding( pszPlace, pszTokens );

@@ -1711,7 +1711,7 @@ public:
 

 		  while( *psz != 0 )

 		  {

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

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

 			  {

 				  if ( pszLast == NULL )

 					  pszLast = psz;

@@ -1726,7 +1726,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 );

 		  }

@@ -1741,20 +1741,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 );

 		  }

 

@@ -1809,7 +1809,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 );

 		  }

 

@@ -1820,7 +1820,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;

 		  }

@@ -1850,7 +1850,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 );

 		  }

 

@@ -1868,15 +1868,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 );

 		  }

 

@@ -1887,26 +1887,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 );

 		  }

 

@@ -1950,14 +1950,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 );

@@ -2034,13 +2034,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;

 	  }

 

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

 		  CMStringT strResult;

 

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

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

 

 		  return strResult;

 	  }

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

 		  CMStringT strResult;

 

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

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

 

 		  return strResult;

 	  }

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

 		  CMStringT strResult;

 

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

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

 

 		  return strResult;

 	  }

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

 		  XCHAR chTemp = XCHAR( ch1 );

 

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

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

 

 		  return strResult;

 	  }

@@ -2137,7 +2137,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/plugins/Clist_modern/hdr/modern_callproc.h b/plugins/Clist_modern/hdr/modern_callproc.h
index e3c1df900d..19cfb883b6 100644
--- a/plugins/Clist_modern/hdr/modern_callproc.h
+++ b/plugins/Clist_modern/hdr/modern_callproc.h
@@ -17,7 +17,7 @@ template< class R > class _callParams0 : public __baseCall
 {

 public:

     R(*_proc)();

-    _callParams0( R (*proc)() ) : _proc(proc){};

+    _callParams0( R (*proc)()) : _proc(proc){};

     int __DoCallStorageProc() { return (int)_proc(); }

 };

 

@@ -25,7 +25,7 @@ template<> class _callParams0<void> : public __baseCall
 {

 public:

     void(*_proc)();

-    _callParams0( void (*proc)() ) : _proc(proc){};

+    _callParams0( void (*proc)()) : _proc(proc){};

     int __DoCallStorageProc() { _proc(); return 0; }

 };

 

@@ -108,7 +108,7 @@ template < class R, class A, class B, class C > R __DoCall( R(*__proc)( A, B, C
 };

 

 

-template < class R > R sync( R(*_proc)() )

+template < class R > R sync( R(*_proc)())

 { return __DoCall(_proc, SYNC); };

 template < class R, class A > R sync( R(*_proc)( A ), A a )

 { return __DoCall(_proc, a, SYNC); };

@@ -116,7 +116,7 @@ template < class R, class A, class B > R sync( R(*_proc)( A,B), A a, B b )
 { return __DoCall(_proc, a, b, SYNC); };

 template < class R, class A, class B, class C > R sync( R(*_proc)( A,B,C ), A a, B b, C c)

 { return __DoCall(_proc, a, b, c, SYNC); };

-template < class R > int async( R(*_proc)() )

+template < class R > int async( R(*_proc)())

 { return __DoCall(_proc, ASYNC); };

 template < class R, class A > R async( R(*_proc)( A ), A a )

 { return __DoCall(_proc, a, ASYNC); };

diff --git a/plugins/Clist_modern/hdr/modern_clui.h b/plugins/Clist_modern/hdr/modern_clui.h
index 8f9c82797e..eb353f4609 100644
--- a/plugins/Clist_modern/hdr/modern_clui.h
+++ b/plugins/Clist_modern/hdr/modern_clui.h
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "windowsX.h"

 #define HANDLE_MESSAGE( _message, _fn)    \

-	case (_message): return This->_fn( (_message), (wParam), (lParam) )

+	case (_message): return This->_fn((_message), (wParam), (lParam))

 

 class CLUI

 {

diff --git a/plugins/Clist_modern/hdr/modern_commonheaders.h b/plugins/Clist_modern/hdr/modern_commonheaders.h
index efb7b572a9..922e0b0d90 100644
--- a/plugins/Clist_modern/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/hdr/modern_commonheaders.h
@@ -289,12 +289,8 @@ enum
 #define MirandaLoading() ((g_CluiData.bSTATE<STATE_NORMAL))

 #define MirandaExiting() ((g_CluiData.bSTATE>STATE_NORMAL))

 

-

-

 char * strdupn(const char * src, int len);

 

-#define SKINBUTTONCLASS _T("MirandaSkinButtonClass")

-

 #define SORTBY_NAME	   0

 #define SORTBY_STATUS  1

 #define SORTBY_LASTMSG 2

diff --git a/plugins/Clist_modern/hdr/modern_sync.h b/plugins/Clist_modern/hdr/modern_sync.h
index 34686470e5..334d4696a7 100644
--- a/plugins/Clist_modern/hdr/modern_sync.h
+++ b/plugins/Clist_modern/hdr/modern_sync.h
@@ -40,7 +40,7 @@ public:
 template< class RET, class Ap, class Bp, class Cp, class A, class B, class C> RET Sync( RET(*proc)(Ap, Bp, Cp), A a, B b, C c )

 {

 	PARAMS3<RET, Ap, Bp, Cp> params( proc, a, b, c );

-	DoCall( (PSYNCCALLBACKPROC) PARAMS3<RET, Ap, Bp, Cp>::DoSyncCall, 0, (LPARAM) &params );

+	DoCall((PSYNCCALLBACKPROC) PARAMS3<RET, Ap, Bp, Cp>::DoSyncCall, 0, (LPARAM) &params );

 	return params.GetResult();

 };

 

@@ -66,7 +66,7 @@ public:
 template< class RET, class Ap, class Bp, class A, class B> RET Sync( RET(*proc)(Ap, Bp), A a, B b )

 {

 	PARAMS2<RET, Ap, Bp> params( proc, a, b );

-	DoCall( (PSYNCCALLBACKPROC) PARAMS2<RET, Ap, Bp>::DoSyncCall, 0, (LPARAM) &params );

+	DoCall((PSYNCCALLBACKPROC) PARAMS2<RET, Ap, Bp>::DoSyncCall, 0, (LPARAM) &params );

 	return params.GetResult();

 };

 

@@ -91,7 +91,7 @@ public:
 template< class RET, class Ap, class A> RET Sync( RET(*proc)(Ap), A a )

 {

 	PARAMS1<RET, Ap> params( proc, a );

-	DoCall( (PSYNCCALLBACKPROC) PARAMS1<RET, Ap>::DoSyncCall, 0, (LPARAM) &params );

+	DoCall((PSYNCCALLBACKPROC) PARAMS1<RET, Ap>::DoSyncCall, 0, (LPARAM) &params );

 	return params.GetResult();

 };

 

diff --git a/plugins/Clist_modern/hdr/modern_tstring.h b/plugins/Clist_modern/hdr/modern_tstring.h
index 5bd558c54d..17fc9cf50c 100644
--- a/plugins/Clist_modern/hdr/modern_tstring.h
+++ b/plugins/Clist_modern/hdr/modern_tstring.h
@@ -21,7 +21,7 @@ public:
 

 		

 	mbstring( const wstring&  tStr )	{ *this = tStr.c_str(); }

-	mbstring& operator=( const wstring&  tStr  )	{ this->operator =( tStr.c_str() ); return *this; }

+	mbstring& operator=( const wstring&  tStr  )	{ this->operator =( tStr.c_str()); return *this; }

 

 	mbstring( const wchar_t * wChar );

 	mbstring& operator=( const astring&  aStr  );

@@ -46,7 +46,7 @@ public:
 	tstring& operator=( const astring& aStr );

 	tstring& operator=( const mbstring& uStr );

 	operator astring();

-	operator mbstring()					{  return mbstring( this->c_str() ); }

+	operator mbstring()					{  return mbstring( this->c_str()); }

 };

 

 #else