r18

GetEnvy · Jan 31, 2017 · bca2a67 · bca2a67
1 parent b1a083d
commit bca2a67
Show file tree

Hide file tree

Showing 52 changed files with 441 additions and 641 deletions.
diff --git a/Envy/AlbumFolder.cpp b/Envy/AlbumFolder.cpp
@@ -1,7 +1,7 @@
 //
 // AlbumFolder.cpp
 //
-// This file is part of Envy (getenvy.com) © 2016
+// This file is part of Envy (getenvy.com) © 2016-2017
 // Portions copyright PeerProject 2008-2014 and Shareaza 2002-2007
 //
 // Envy is free software. You may redistribute and/or modify it
@@ -1347,7 +1347,7 @@ void CAlbumFolder::Serialize(CArchive& ar, int nVersion)
 
 		while ( nCount-- > 0 )
 		{
-			auto_ptr< CAlbumFolder > pFolder( new CAlbumFolder( this, NULL, (LPCTSTR)1 ) );
+			unique_ptr< CAlbumFolder > pFolder( new CAlbumFolder( this, NULL, (LPCTSTR)1 ) );
 			pFolder->Serialize( ar, nVersion );
 			m_pFolders.AddTail( pFolder.release() );
 		}

diff --git a/Envy/Augment/Augment.hpp b/Envy/Augment/Augment.hpp
diff --git a/Envy/Augment/auto_ptr.hpp b/Envy/Augment/auto_ptr.hpp
diff --git a/Envy/BENode.cpp b/Envy/BENode.cpp
@@ -1,7 +1,7 @@
 //
 // BENode.cpp
 //
-// This file is part of Envy (getenvy.com) © 2016
+// This file is part of Envy (getenvy.com) © 2016-2017
 // Portions copyright PeerProject 2008-2015 and Shareaza 2002-2008
 //
 // Envy is free software. You may redistribute and/or modify it
@@ -114,7 +114,7 @@ CBENode* CBENode::Add(LPCBYTE pKey, size_t nKey)
 		break;
 	}
 
-//	auto_ptr< CBENode > pNew( new CBENode );
+//	unique_ptr< CBENode > pNew( new CBENode );
 //	CBENode* pNew_ = pNew.get();
 
 	CAutoPtr< CBENode > pNew( new CBENode );

diff --git a/Envy/BTInfo.cpp b/Envy/BTInfo.cpp
@@ -1,7 +1,7 @@
 //
 // BTInfo.cpp
 //
-// This file is part of Envy (getenvy.com) © 2016
+// This file is part of Envy (getenvy.com) © 2016-2017
 // Portions copyright PeerProject 2008-2015 and Shareaza 2002-2008
 //
 // Envy is free software. You may redistribute and/or modify it
@@ -685,7 +685,7 @@ BOOL CBTInfo::CheckInfoData()
 
 	if ( ! m_pSource.m_nLength ) return FALSE;
 
-	auto_ptr< CBENode > pNode ( CBENode::Decode( &m_pSource ) );
+	unique_ptr< CBENode > pNode ( CBENode::Decode( &m_pSource ) );
 	if ( ! pNode.get() )
 		return FALSE;
 
@@ -717,7 +717,7 @@ BOOL CBTInfo::CheckInfoData()
 
 BOOL CBTInfo::LoadTorrentBuffer(const CBuffer* pBuffer)
 {
-	auto_ptr< CBENode > pNode ( CBENode::Decode( pBuffer ) );
+	unique_ptr< CBENode > pNode ( CBENode::Decode( pBuffer ) );
 	if ( ! pNode.get() )
 	{
 		theApp.Message( MSG_ERROR, L"[BT] Failed to decode torrent data: %s", pBuffer->ReadString( (size_t)-1 ) );

diff --git a/Envy/BTPacket.h b/Envy/BTPacket.h
@@ -1,7 +1,7 @@
 //
 // BTPacket.h
 //
-// This file is part of Envy (getenvy.com) © 2016
+// This file is part of Envy (getenvy.com) © 2016-2017
 // Portions copyright PeerProject 2008-2014 and Shareaza 2002-2007
 //
 // Envy is free software. You may redistribute and/or modify it
@@ -132,7 +132,7 @@ class CBTPacket : public CPacket
 public:
 	BYTE				m_nType;
 	BYTE				m_nExtension;	// Extension type if packet type is a BT_PACKET_EXTENSION
-	auto_ptr< CBENode > m_pNode;		// Extension decoded data
+	unique_ptr< CBENode > m_pNode;		// Extension decoded data
 
 public:
 	virtual void		Reset();

diff --git a/Envy/CollectionFile.cpp b/Envy/CollectionFile.cpp
@@ -1,7 +1,7 @@
 //
 // CollectionFile.cpp
 //
-// This file is part of Envy (getenvy.com) © 2016
+// This file is part of Envy (getenvy.com) © 2016-2017
 // Portions copyright PeerProject 2008-2014 and Shareaza 2002-2007
 //
 // Envy is free software. You may redistribute and/or modify it
@@ -191,10 +191,10 @@ BOOL CCollectionFile::LoadCollection(LPCTSTR pszFile)
 	if ( pZIP.GetCount() == 1 )		// xml-only
 		m_nType = SimpleCollection;
 
-	auto_ptr< CBuffer > pBuffer ( pFile->Decompress() );
+	unique_ptr< CBuffer > pBuffer ( pFile->Decompress() );
 	if ( ! pBuffer.get() ) return FALSE;
 
-	auto_ptr< CXMLElement > pXML ( CXMLElement::FromString( pBuffer->ReadString( pBuffer->m_nLength, CP_UTF8 ), TRUE ) );
+	unique_ptr< CXMLElement > pXML ( CXMLElement::FromString( pBuffer->ReadString( pBuffer->m_nLength, CP_UTF8 ), TRUE ) );
 	if ( ! pXML.get() ) return FALSE;
 	if ( ! pXML->IsNamed( L"collection" ) ) return FALSE;
 
@@ -209,7 +209,7 @@ BOOL CCollectionFile::LoadCollection(LPCTSTR pszFile)
 		CXMLElement* pElement = pContents->GetNextElement( pos );
 		if ( pElement->IsNamed( L"file" ) )
 		{
-			auto_ptr< File > pNewFile( new File( this ) );
+			unique_ptr< File > pNewFile( new File( this ) );
 			if ( pNewFile.get() && pNewFile->Parse( pElement ) )
 				m_pFiles.AddTail( pNewFile.release() );
 		}
@@ -289,7 +289,7 @@ BOOL CCollectionFile::LoadEMule(LPCTSTR pszFile)
 			{
 				for ( DWORD i = 0 ; i < nFileCount ; ++i )
 				{
-					auto_ptr< File > pCollectionFile( new File( this ) );
+					unique_ptr< File > pCollectionFile( new File( this ) );
 					if ( pCollectionFile.get() && pCollectionFile->Parse( pFile ) )
 						m_pFiles.AddTail( pCollectionFile.release() );
 					else
@@ -332,7 +332,7 @@ BOOL CCollectionFile::LoadDC(LPCTSTR pszFile)
 	if ( ! pBuffer.UnBZip() )
 		return FALSE;	// Decompression error
 
-	auto_ptr< CXMLElement > pXML ( CXMLElement::FromString( pBuffer.ReadString( pBuffer.m_nLength, CP_UTF8 ), TRUE ) );
+	unique_ptr< CXMLElement > pXML ( CXMLElement::FromString( pBuffer.ReadString( pBuffer.m_nLength, CP_UTF8 ), TRUE ) );
 	if ( ! pXML.get() )
 		return FALSE;	// XML decoding error
 
@@ -363,7 +363,7 @@ void CCollectionFile::LoadDC(CXMLElement* pRoot)
 		{
 			// <File Name="music.mp3" Size="100000" TTH="3A6D6T2NDRLU6BGSTSJNW3R3QWTV6A44M6AGXMA"/>
 
-			auto_ptr< File > pNewFile( new File( this ) );
+			unique_ptr< File > pNewFile( new File( this ) );
 			if ( pNewFile.get() && pNewFile->Parse( pElement ) )
 				m_pFiles.AddTail( pNewFile.release() );
 		}
@@ -396,7 +396,7 @@ BOOL CCollectionFile::LoadText(LPCTSTR pszFile)
 			if ( ! pFile.ReadString( strText ) )
 				break;	// End of file
 
-			auto_ptr< File > pCollectionFile( new File( this ) );
+			unique_ptr< File > pCollectionFile( new File( this ) );
 			if ( ! pCollectionFile.get() )
 				break;	// Out of memory