jh163888/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2024-11-25 09:28:22 +08:00
Code Issues Projects Releases Wiki Activity

GCC compatibility update

Browse Source 
- changed paths and init sequences
This commit is contained in:
Nikolaj Schlej 2015-04-04 15:22:52 +02:00
parent d62e9f6560
commit b429c74bcf
10 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UEFIExtract/ffsdumper.cpp
View File

@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "ffsdumper.h"
FfsDumper::FfsDumper(TreeModel* treeModel, QObject *parent)
: model(treeModel), QObject(parent), dumped(false)
: QObject(parent), model(treeModel), dumped(false)
{
}

4
UEFIExtract/ffsdumper.h
View File

@ -21,8 +21,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <QModelIndex>
#include <QFileInfo>
#include "..\common\basetypes.h"
#include "..\common\treemodel.h"
#include "../common/basetypes.h"
#include "../common/treemodel.h"
class FfsDumper : public QObject
{

2
UEFIExtract/uefiextract_main.cpp
View File

@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <iostream>
#include "..\common\ffsparser.h"
#include "../common/ffsparser.h"
#include "ffsdumper.h"
int main(int argc, char *argv[])

2
UEFITool/ffsfinder.cpp
View File

@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "ffsfinder.h"
FfsFinder::FfsFinder(const TreeModel* treeModel, QObject *parent)
: model(treeModel), QObject(parent)
: QObject(parent), model(treeModel)
{
}

4
UEFITool/ffsfinder.h
View File

@ -19,8 +19,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <QString>
#include <QModelIndex>
#include "..\common\basetypes.h"
#include "..\common\treemodel.h"
#include "../common/basetypes.h"
#include "../common/treemodel.h"
class FfsFinder : public QObject
{

2
UEFITool/ffsops.cpp
View File

@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "ffsops.h"
FfsOperations::FfsOperations(const TreeModel* treeModel, QObject *parent)
: model(treeModel), QObject(parent)
: QObject(parent), model(treeModel)
{
}

8
UEFITool/ffsops.h
View File

@ -19,10 +19,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <QString>
#include <QModelIndex>
#include "..\common\basetypes.h"
#include "..\common\treemodel.h"
#include "..\common\ffs.h"
#include "..\common\utility.h"
#include "../common/basetypes.h"
#include "../common/treemodel.h"
#include "../common/ffs.h"
#include "../common/utility.h"
class FfsOperations : public QObject
{

8
UEFITool/uefitool.h
View File

@ -33,10 +33,10 @@
#include <QTreeView>
#include <QUrl>
#include "..\common\basetypes.h"
#include "..\common\utility.h"
#include "..\common\ffs.h"
#include "..\common\ffsparser.h"
#include "../common/basetypes.h"
#include "../common/utility.h"
#include "../common/ffs.h"
#include "../common/ffsparser.h"
#include "searchdialog.h"
#include "messagelistitem.h"
#include "ffsfinder.h"

4
common/ffsparser.cpp
View File

@ -21,7 +21,7 @@ WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "me.h"
FfsParser::FfsParser(TreeModel* treeModel, QObject *parent)
: model(treeModel), QObject(parent)
: QObject(parent), model(treeModel)
{
}
@ -1785,7 +1785,7 @@ STATUS FfsParser::parseCompressedSectionBody(const QModelIndex & index)
}
// Check reported uncompressed size
if (pdata.section.compressed.uncompressedSize != decompressed.size()) {
if (pdata.section.compressed.uncompressedSize != (UINT32)decompressed.size()) {
msg(tr("parseCompressedSectionBody: decompressed size stored in header %1h (%2) differs from actual %3h (%4)")
.hexarg(pdata.section.compressed.uncompressedSize)
.arg(pdata.section.compressed.uncompressedSize)

2
common/ffsparser.h
View File

@ -61,7 +61,7 @@ private:
TreeModel *model;
QVector<QPair<QString, QModelIndex> > messagesVector;
STATUS parseIntelImage(const QByteArray & intelImage, const QModelIndex & parent, QModelIndex & root = QModelIndex());
STATUS parseIntelImage(const QByteArray & intelImage, const QModelIndex & parent, QModelIndex & root);
STATUS parseGbeRegion(const QByteArray & gbe, const UINT32 parentOffset, const QModelIndex & parent, QModelIndex & index);
STATUS parseMeRegion(const QByteArray & me, const UINT32 parentOffset, const QModelIndex & parent, QModelIndex & index);
STATUS parseBiosRegion(const QByteArray & bios, const UINT32 parentOffset, const QModelIndex & parent, QModelIndex & index);