mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-16 08:42:23 +00:00
Code Issues Projects Releases Wiki Activity

Replace raw pointer in BsaArchive with unique_ptr

Browse Source
This commit is contained in:
Azdul 2019-01-17 08:42:43 +01:00
parent e502819246
commit caa0487c6a
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/vfs/bsaarchive.cpp
View File

@ -7,15 +7,13 @@ namespace VFS
BsaArchive::BsaArchive(const std::string &filename) BsaArchive::BsaArchive(const std::string &filename)
{ {
mFile = nullptr;
Bsa::BsaVersion bsaVersion = Bsa::TES4BSAFile::detectVersion(filename); Bsa::BsaVersion bsaVersion = Bsa::TES4BSAFile::detectVersion(filename);
if (bsaVersion == Bsa::BSAVER_TES4PLUS) { if (bsaVersion == Bsa::BSAVER_TES4PLUS) {
mFile = new Bsa::TES4BSAFile(); mFile = std::make_unique<Bsa::TES4BSAFile>();
} }
else { else {
mFile = new Bsa::BSAFile(); mFile = std::make_unique<Bsa::BSAFile>();
} }
mFile->open(filename); mFile->open(filename);
@ -23,12 +21,11 @@ BsaArchive::BsaArchive(const std::string &filename)
const Bsa::BSAFile::FileList &filelist = mFile->getList(); const Bsa::BSAFile::FileList &filelist = mFile->getList();
for(Bsa::BSAFile::FileList::const_iterator it = filelist.begin();it != filelist.end();++it) for(Bsa::BSAFile::FileList::const_iterator it = filelist.begin();it != filelist.end();++it)
{ {
mResources.push_back(BsaArchiveFile(&*it, mFile)); mResources.push_back(BsaArchiveFile(&*it, mFile.get()));
} }
} }
BsaArchive::~BsaArchive() { BsaArchive::~BsaArchive() {
delete mFile;
} }
void BsaArchive::listResources(std::map<std::string, File *> &out, char (*normalize_function)(char)) void BsaArchive::listResources(std::map<std::string, File *> &out, char (*normalize_function)(char))

2
components/vfs/bsaarchive.hpp
View File

@ -26,7 +26,7 @@ namespace VFS
virtual void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char)); virtual void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char));
private: private:
Bsa::BSAFile* mFile; std::unique_ptr<Bsa::BSAFile> mFile;
std::vector<BsaArchiveFile> mResources; std::vector<BsaArchiveFile> mResources;
}; };
} }