mo2/modorganizer-bsapacker
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/modorganizer-bsapacker.git synced 2026-07-27 14:06:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Changes to compile with Qt6 + Boost 1.77

Browse Source
This commit is contained in:
Jeremy Rimpo
2021-12-05 03:42:52 -06:00
parent 113422543c
commit d9dbb171ef
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BSArchive.cpp
+11 -10
View File
@@ -42,9 +42,9 @@ void BSArchive::close()
void BSArchive::create(const QString &archiveName, const bsa_archive_type_e& type, const BSArchiveEntries& entries)
{
LOG_LIBBSARCH << "Creating archive. Archive name: " << archiveName << endl
<< "type: " << type << endl
<< "entries: " << entries.getEntries();
LOG_LIBBSARCH << "Creating archive. Archive name: " << archiveName;
LOG_LIBBSARCH << "type: " << type;
LOG_LIBBSARCH << "entries: " << entries.getEntries();
bsa_create_archive(_archive, PREPARE_PATH_LIBBSARCH(archiveName), type, entries.getEntries());
@@ -62,9 +62,9 @@ void BSArchive::save()
void BSArchive::addFileFromDiskRoot(const QString &rootDir, const QString &filename)
{
LOG_LIBBSARCH << "Adding file from disk root. Root directory: " << rootDir << endl
<< "Filename: " << filename << endl
<< "Archive: " << _archive;
LOG_LIBBSARCH << "Adding file from disk root. Root directory: " << rootDir;
LOG_LIBBSARCH << "Filename: " << filename;
LOG_LIBBSARCH << "Archive: " << _archive;
const auto &result = bsa_add_file_from_disk_root(_archive,
PREPARE_PATH_LIBBSARCH(rootDir),
@@ -81,9 +81,9 @@ void BSArchive::addFileFromDiskRoot(const QString &rootDir, const QStringList &f
void BSArchive::addFileFromDisk(const QString &pathInArchive, const QString &filePath)
{
LOG_LIBBSARCH << "Adding file from disk root. Path in archive: " << pathInArchive << endl
<< "Filepath: " << filePath << endl
<< "Archive: " << _archive;
LOG_LIBBSARCH << "Adding file from disk root. Path in archive: " << pathInArchive;
LOG_LIBBSARCH << "Filepath: " << filePath;
LOG_LIBBSARCH << "Archive: " << _archive;
const auto &result = bsa_add_file_from_disk_root(_archive,
PREPARE_PATH_LIBBSARCH(pathInArchive),
@@ -94,7 +94,8 @@ void BSArchive::addFileFromDisk(const QString &pathInArchive, const QString &fil
void BSArchive::addFileFromMemory(const QString &filename, const QByteArray &data) //NOTE UNTESTED
{
LOG_LIBBSARCH << "Adding file from memory. Filename: " << filename << endl << "Data size: " << data.size();
LOG_LIBBSARCH << "Adding file from memory. Filename: " << filename;
LOG_LIBBSARCH << "Data size: " << data.size();
uint32_t size = static_cast<uint32_t>(data.size());
bsa_buffer_t buffer = const_cast<char *>(data.data());
src/DummyPluginLogic.cpp
+3 -2
View File
@@ -37,7 +37,7 @@ namespace BsaPacker
bool DummyPluginLogic::canCreateDummy(const std::array<QString, SIZE>& fileList,
const QString& fileNameNoExtension) const
{
const QFileInfo& archive(fileNameNoExtension + this->m_ArchiveNameService->GetFileExtension());
const QFileInfo archive(fileNameNoExtension + this->m_ArchiveNameService->GetFileExtension());
if (!(archive.exists() && archive.isFile())) {
return false;
}
@@ -46,7 +46,8 @@ namespace BsaPacker
return false;
}
for (const QFileInfo fileInfo : fileList) {
for (const QString &info : fileList) {
const QFileInfo fileInfo(info);
if (fileInfo.exists() && fileInfo.isFile()) {
return false;
}
src/ModDtoFactory.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ namespace BsaPacker
const QString& fileName)
{
const QString& absoluteFileName = filePath + '/' + fileName;
const QFileInfo& fileInfo(absoluteFileName);
const QFileInfo fileInfo(absoluteFileName);
if (!fileInfo.exists() || !fileInfo.isFile()) {
return true;
}