Refactor: Update data stream parsing functions for XDataStream

This commit updates the parsing functions within the FastFile class to use the XDataStream instead of the QDataStream. This change aligns the code with newer data stream implementations and improves maintainability.
This commit is contained in:
njohnson 2025-09-10 21:55:39 -04:00
parent 9dc45d3024
commit 3452b73eb0

View File

@ -115,7 +115,7 @@ void FastFile::SetPlatform(const QString aPlatform) {
mPlatform = aPlatform; mPlatform = aPlatform;
} }
FF_COMPANY FastFile::pParseFFCompany(QDataStream *afastFileStream, quint32 &aCompanyInt) { FF_COMPANY FastFile::pParseFFCompany(XDataStream *afastFileStream, quint32 &aCompanyInt) {
LogManager::instance().addEntry("Parsing company into reference..."); LogManager::instance().addEntry("Parsing company into reference...");
// Check for null datastream ptr // Check for null datastream ptr
if (!afastFileStream) { return COMPANY_NONE; } if (!afastFileStream) { return COMPANY_NONE; }
@ -137,7 +137,7 @@ FF_COMPANY FastFile::pParseFFCompany(QDataStream *afastFileStream, quint32 &aCom
return COMPANY_NONE; return COMPANY_NONE;
} }
FF_COMPANY FastFile::pParseFFCompany(QDataStream *afastFileStream) { FF_COMPANY FastFile::pParseFFCompany(XDataStream *afastFileStream) {
LogManager::instance().addEntry("Parsing company..."); LogManager::instance().addEntry("Parsing company...");
// Check for null datastream ptr // Check for null datastream ptr
if (!afastFileStream) { return COMPANY_NONE; } if (!afastFileStream) { return COMPANY_NONE; }
@ -157,7 +157,7 @@ FF_COMPANY FastFile::pParseFFCompany(QDataStream *afastFileStream) {
return COMPANY_NONE; return COMPANY_NONE;
} }
FF_FILETYPE FastFile::pParseFFFileType(QDataStream *afastFileStream) { FF_FILETYPE FastFile::pParseFFFileType(XDataStream *afastFileStream) {
// Parse filetype // Parse filetype
QByteArray fileTypeData(2, Qt::Uninitialized); QByteArray fileTypeData(2, Qt::Uninitialized);
afastFileStream->readRawData(fileTypeData.data(), 2); afastFileStream->readRawData(fileTypeData.data(), 2);
@ -168,7 +168,7 @@ FF_FILETYPE FastFile::pParseFFFileType(QDataStream *afastFileStream) {
return FILETYPE_NONE; return FILETYPE_NONE;
} }
FF_SIGNAGE FastFile::pParseFFSignage(QDataStream *afastFileStream) { FF_SIGNAGE FastFile::pParseFFSignage(XDataStream *afastFileStream) {
// Parse filetype // Parse filetype
QByteArray signedData(1, Qt::Uninitialized); QByteArray signedData(1, Qt::Uninitialized);
afastFileStream->readRawData(signedData.data(), 1); afastFileStream->readRawData(signedData.data(), 1);
@ -181,7 +181,7 @@ FF_SIGNAGE FastFile::pParseFFSignage(QDataStream *afastFileStream) {
return SIGNAGE_NONE; return SIGNAGE_NONE;
} }
QString FastFile::pParseFFMagic(QDataStream *afastFileStream) { QString FastFile::pParseFFMagic(XDataStream *afastFileStream) {
// Parse magic // Parse magic
QByteArray magicData(3, Qt::Uninitialized); QByteArray magicData(3, Qt::Uninitialized);
afastFileStream->readRawData(magicData.data(), 3); afastFileStream->readRawData(magicData.data(), 3);
@ -192,7 +192,7 @@ QString FastFile::pParseFFMagic(QDataStream *afastFileStream) {
return ""; return "";
} }
quint32 FastFile::pParseFFVersion(QDataStream *afastFileStream) { quint32 FastFile::pParseFFVersion(XDataStream *afastFileStream) {
// Parse version // Parse version
quint32 version; quint32 version;
*afastFileStream >> version; *afastFileStream >> version;