AURORA: Use ScopedPtr in the GFF classes

xoreos · Oct 29, 2016 · 884e76c · 884e76c
1 parent 1daf31b
commit 884e76c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/aurora/gff3file.cpp b/src/aurora/gff3file.cpp
@@ -73,8 +73,7 @@ GFF3File::~GFF3File() {
 }
 
 void GFF3File::clear() {
-	delete _stream;
-	_stream = 0;
+	_stream.reset();
 
 	for (StructArray::iterator strct = _structs.begin(); strct != _structs.end(); ++strct)
 		delete *strct;

diff --git a/src/aurora/gff3file.h b/src/aurora/gff3file.h
@@ -31,6 +31,7 @@
 #include <boost/noncopyable.hpp>
 
 #include "src/common/types.h"
+#include "src/common/scopedptr.h"
 #include "src/common/ustring.h"
 
 #include "src/aurora/types.h"
@@ -112,7 +113,7 @@ class GFF3File : boost::noncopyable, public AuroraFile {
 	typedef std::vector<GFF3List> ListArray;
 
 
-	Common::SeekableReadStream *_stream;
+	Common::ScopedPtr<Common::SeekableReadStream> _stream;
 
 	Header _header; ///< The GFF3's header.
 

diff --git a/src/aurora/gff4file.cpp b/src/aurora/gff4file.cpp
@@ -73,8 +73,7 @@ GFF4File::~GFF4File() {
 }
 
 void GFF4File::clear() {
-	delete _stream;
-	_stream = 0;
+	_stream.reset();
 
 	for (StructMap::iterator s = _structs.begin(); s != _structs.end(); ++s)
 		delete s->second;

diff --git a/src/aurora/gff4file.h b/src/aurora/gff4file.h
@@ -31,6 +31,7 @@
 #include <boost/noncopyable.hpp>
 
 #include "src/common/types.h"
+#include "src/common/scopedptr.h"
 #include "src/common/ustring.h"
 #include "src/common/encoding.h"
 
@@ -129,7 +130,7 @@ class GFF4File : boost::noncopyable, public AuroraFile {
 
 
 
-	Common::SeekableReadStream *_stream;
+	Common::ScopedPtr<Common::SeekableReadStream> _stream;
 
 	/** This GFF4's header. */
 	Header          _header;