Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-02-10 20:48:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Keep ZIP file objects in std::unique_ptr<> to clarify ownership.

Browse source
This commit is contained in:
Johannes Sixt 2020-12-13 17:23:05 +01:00
parent ac9954972d
commit b176cb421b
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
common/lc_library.cpp
View file

@ -44,8 +44,6 @@ lcPiecesLibrary::lcPiecesLibrary()
Dir.mkpath(mCachePath); Dir.mkpath(mCachePath);
mNumOfficialPieces = 0; mNumOfficialPieces = 0;
mZipFiles[LC_ZIPFILE_OFFICIAL] = nullptr;
mZipFiles[LC_ZIPFILE_UNOFFICIAL] = nullptr;
mBuffersDirty = false; mBuffersDirty = false;
mHasUnofficial = false; mHasUnofficial = false;
mCancelLoading = false; mCancelLoading = false;
@ -77,9 +75,7 @@ void lcPiecesLibrary::Unload()
mTextures.clear(); mTextures.clear();
mNumOfficialPieces = 0; mNumOfficialPieces = 0;
delete mZipFiles[LC_ZIPFILE_OFFICIAL];
mZipFiles[LC_ZIPFILE_OFFICIAL] = nullptr; mZipFiles[LC_ZIPFILE_OFFICIAL] = nullptr;
delete mZipFiles[LC_ZIPFILE_UNOFFICIAL];
mZipFiles[LC_ZIPFILE_UNOFFICIAL] = nullptr; mZipFiles[LC_ZIPFILE_UNOFFICIAL] = nullptr;
} }
@ -317,15 +313,10 @@ bool lcPiecesLibrary::OpenArchive(const QString& FileName, lcZipFileType ZipFile
bool lcPiecesLibrary::OpenArchive(std::unique_ptr<lcFile> File, const QString& FileName, lcZipFileType ZipFileType) bool lcPiecesLibrary::OpenArchive(std::unique_ptr<lcFile> File, const QString& FileName, lcZipFileType ZipFileType)
{ {
lcZipFile* ZipFile = new lcZipFile(); std::unique_ptr<lcZipFile> ZipFile(new lcZipFile());
if (!ZipFile->OpenRead(std::move(File))) if (!ZipFile->OpenRead(std::move(File)))
{
delete ZipFile;
return false; return false;
}
mZipFiles[ZipFileType] = ZipFile;
for (int FileIdx = 0; FileIdx < ZipFile->mFiles.GetSize(); FileIdx++) for (int FileIdx = 0; FileIdx < ZipFile->mFiles.GetSize(); FileIdx++)
{ {
@ -424,6 +415,8 @@ bool lcPiecesLibrary::OpenArchive(std::unique_ptr<lcFile> File, const QString& F
} }
} }
mZipFiles[ZipFileType] = std::move(ZipFile);
return true; return true;
} }

2
common/lc_library.h
View file

@ -194,7 +194,7 @@ protected:
QString mCachePath; QString mCachePath;
qint64 mArchiveCheckSum[4]; qint64 mArchiveCheckSum[4];
lcZipFile* mZipFiles[LC_NUM_ZIPFILES]; std::unique_ptr<lcZipFile> mZipFiles[LC_NUM_ZIPFILES];
bool mHasUnofficial; bool mHasUnofficial;
bool mCancelLoading; bool mCancelLoading;
}; };