Replace some raw pointers with std::unique_ptr

Author: lalinsky

src/index/index_writer.cpp

@@ -20,7 +20,7 @@ using namespace Acoustid;
 IndexWriter::IndexWriter(DirectorySharedPtr dir, const IndexInfo& info)
 	: IndexReader(dir, info), m_maxSegmentBufferSize(MAX_SEGMENT_BUFFER_SIZE), m_maxDocumentId(0)
 {
-	m_mergePolicy.reset(new SegmentMergePolicy());
+    m_mergePolicy = std::make_unique<SegmentMergePolicy>();
 }
 
 IndexWriter::IndexWriter(IndexSharedPtr index, bool alreadyHasLock)
@@ -29,7 +29,7 @@ IndexWriter::IndexWriter(IndexSharedPtr index, bool alreadyHasLock)
     if (!alreadyHasLock) {
 	    m_index->acquireWriterLock();
     }
-	m_mergePolicy.reset(new SegmentMergePolicy());
+    m_mergePolicy = std::make_unique<SegmentMergePolicy>();
 }
 
 IndexWriter::~IndexWriter()

src/index/segment_data_reader.cpp

@@ -20,9 +20,9 @@ void SegmentDataReader::setBlockSize(size_t blockSize)
 	m_blockSize = blockSize;
 }
 
-BlockDataIterator *SegmentDataReader::readBlock(size_t n, uint32_t key)
+std::unique_ptr<BlockDataIterator> SegmentDataReader::readBlock(size_t n, uint32_t key)
 {
 	m_input->seek(m_blockSize * n);
 	size_t length = m_input->readInt16();
-	return new BlockDataIterator(m_input.get(), length, key);
+	return std::make_unique<BlockDataIterator>(m_input.get(), length, key);
 }

src/index/segment_data_reader.h

@@ -58,7 +58,7 @@ class SegmentDataReader
 	size_t blockSize() { return m_blockSize; }
 	void setBlockSize(size_t blockSize);
 
-	BlockDataIterator *readBlock(size_t n, uint32_t key);
+	std::unique_ptr<BlockDataIterator> readBlock(size_t n, uint32_t key);
 
 private:
 	std::unique_ptr<InputStream> m_input;

src/index/segment_enum.h

@@ -25,7 +25,7 @@ class SegmentEnum
 				return false;
 			}
 			uint32_t firstKey = m_index->key(m_block);
-			m_currentBlock.reset(m_dataReader->readBlock(m_block, firstKey));
+			m_currentBlock = m_dataReader->readBlock(m_block, firstKey);
 			m_currentBlock->next();
 			m_block++;
 		}