Some forgotten changes

- must make sure subprojects are also compiling before commiting another
big update
This commit is contained in:
Nikolaj Schlej 2015-01-31 15:07:28 +01:00
parent 831603dbc9
commit 44a3fb63f0
2 changed files with 4 additions and 4 deletions

View File

@ -86,8 +86,8 @@ UINT8 UEFIFind::find(const UINT8 mode, const bool count, const QString & hexPatt
UINT8 u8_7 = *(UINT8*)(data.constData() + 14); UINT8 u8_7 = *(UINT8*)(data.constData() + 14);
UINT8 u8_8 = *(UINT8*)(data.constData() + 15); UINT8 u8_8 = *(UINT8*)(data.constData() + 15);
QString guid = QString("%1-%2-%3-%4%5-%6%7%8%9%10%11\n").hexarg(u32, 8).hexarg(u16_1, 4).hexarg(u16_2, 4).hexarg(u8_1, 2).hexarg(u8_2, 2) QString guid = QString("%1-%2-%3-%4%5-%6%7%8%9%10%11\n").hexarg2(u32, 8).hexarg2(u16_1, 4).hexarg2(u16_2, 4).hexarg2(u8_1, 2).hexarg2(u8_2, 2)
.hexarg(u8_3, 2).hexarg(u8_4, 2).hexarg(u8_5, 2).hexarg(u8_6, 2).hexarg(u8_7, 2).hexarg(u8_8, 2); .hexarg2(u8_3, 2).hexarg2(u8_4, 2).hexarg2(u8_5, 2).hexarg2(u8_6, 2).hexarg2(u8_7, 2).hexarg2(u8_8, 2);
result.append(guid); result.append(guid);
} }
@ -122,7 +122,7 @@ UINT8 UEFIFind::findFileRecursive(const QModelIndex index, const QString & hexPa
else if (mode == SEARCH_MODE_BODY) else if (mode == SEARCH_MODE_BODY)
data.append(model->body(index)); data.append(model->body(index));
else else
data.append(model->header(index)).append(model->body(index)).append(model->tail(index)); data.append(model->header(index)).append(model->body(index));
} }
QString hexBody = QString(data.toHex()); QString hexBody = QString(data.toHex());

View File

@ -126,7 +126,7 @@ UINT8 UEFIPatch::patchFile(const QModelIndex & index, const QByteArray & fileGui
if (!model || !index.isValid()) if (!model || !index.isValid())
return ERR_INVALID_PARAMETER; return ERR_INVALID_PARAMETER;
if (model->type(index) == Types::Section && model->subtype(index) == sectionType) { if (model->type(index) == Types::Section && model->attributes(index) == sectionType) {
QModelIndex fileIndex = model->findParentOfType(index, Types::File); QModelIndex fileIndex = model->findParentOfType(index, Types::File);
if (model->type(fileIndex) == Types::File && if (model->type(fileIndex) == Types::File &&
model->header(fileIndex).left(sizeof(EFI_GUID)) == fileGuid) model->header(fileIndex).left(sizeof(EFI_GUID)) == fileGuid)