Make FontInfo::scan return a std::vector object

... rather than a pointer to a std::vector.  Given that a
std::vector is little more than a pointer and some size
information, there is no need to create std::vector objects
on the heap.  Returning them by value is just as fast
(the vector content is not copied), and makes the code
more readable, too.

1 files changed, 4 insertions, 9 deletions

diff --git a/qt5/src/poppler-fontinfo.cc b/qt5/src/poppler-fontinfo.cc
index 3948a298..6b3ae7cb 100644
--- a/qt5/src/poppler-fontinfo.cc
+++ b/qt5/src/poppler-fontinfo.cc
@@ -134,17 +134,12 @@ QList<FontInfo> FontIterator::next()
 	++d->currentPage;
 
 	QList<FontInfo> fonts;
-	std::vector<::FontInfo*> *items = d->fontInfoScanner.scan( 1 );
-	if ( !items )
-		return fonts;
-	fonts.reserve( items->size() );
-	for ( std::size_t i = 0; i < items->size(); ++i ) {
-		fonts.append( FontInfo( FontInfoData( (*items)[ i ] ) ) );
-	}
-	for ( auto entry : *items ) {
+	const std::vector<::FontInfo*> items = d->fontInfoScanner.scan( 1 );
+	fonts.reserve( items.size() );
+	for ( ::FontInfo* entry : items ) {
+		fonts.append( FontInfo( FontInfoData( entry ) ) );
 		delete entry;
 	}
-	delete items;
 
 	return fonts;
 }