NWSCRIPT: Replace ScopedPtr/ScopedArray with std::unique_ptr

xoreos · Aug 11, 2020 · 59abc61 · 59abc61
1 parent 814203d
commit 59abc61
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/nwscript/decompiler.cpp b/src/nwscript/decompiler.cpp
@@ -31,7 +31,7 @@
 namespace NWScript {
 
 Decompiler::Decompiler(Common::SeekableReadStream &ncs, Aurora::GameID game) {
-	_ncs.reset(new NCSFile(ncs, game));
+	_ncs = std::make_unique<NCSFile>(ncs, game);
 }
 
 void Decompiler::createNSS(Common::WriteStream &out) {

diff --git a/src/nwscript/decompiler.h b/src/nwscript/decompiler.h
@@ -25,7 +25,8 @@
 #ifndef NWSCRIPT_DECOMPILER_H
 #define NWSCRIPT_DECOMPILER_H
 
-#include "src/common/scopedptr.h"
+#include <memory>
+
 #include "src/common/writestream.h"
 
 #include "src/nwscript/ncsfile.h"
@@ -46,7 +47,7 @@ class Decompiler {
 	void writeInstruction(Common::WriteStream &out, const Instruction *instruction, size_t indent);
 	void writeIndent(Common::WriteStream &out, size_t indent);
 
-	Common::ScopedPtr<NCSFile> _ncs;
+	std::unique_ptr<NCSFile> _ncs;
 };
 
 } // End of namespace NWScript

diff --git a/src/nwscript/disassembler.cpp b/src/nwscript/disassembler.cpp
@@ -53,7 +53,7 @@ static Common::UString quoteString(const Common::UString &str) {
 
 
 Disassembler::Disassembler(Common::SeekableReadStream &ncs, Aurora::GameID game) {
-	_ncs.reset(new NCSFile(ncs, game));
+	_ncs = std::make_unique<NCSFile>(ncs, game);
 }
 
 Disassembler::Disassembler(NCSFile *ncs) : _ncs(ncs) {

diff --git a/src/nwscript/disassembler.h b/src/nwscript/disassembler.h
@@ -26,11 +26,11 @@
 #define NWSCRIPT_DISASSEMBLER_H
 
 #include <vector>
+#include <memory>
 
 #include <boost/noncopyable.hpp>
 
 #include "src/common/types.h"
-#include "src/common/scopedptr.h"
 #include "src/common/ustring.h"
 
 #include "src/aurora/types.h"
@@ -68,7 +68,7 @@ class Disassembler : boost::noncopyable {
 
 
 private:
-	Common::ScopedPtr<NCSFile> _ncs;
+	std::unique_ptr<NCSFile> _ncs;
 
 
 	void writeInfo       (Common::WriteStream &out);