mirrors/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2025-05-24 20:14:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Build fixes for Windows builds

Browse source 
- now to test in OSX and Linux
This commit is contained in:
Nikolaj Schlej 2016-07-09 10:01:41 +02:00
parent 80b85cbf19
commit 0114a72fa5
7 changed files with 46 additions and 61 deletions

17
common/utility.cpp
View file

@ -52,7 +52,7 @@ UString uniqueItemName(const UModelIndex & index)
return UString("Invalid index");
// Get model from index
const TreeModel* model = index.model();
const TreeModel* model = (const TreeModel*)index.model();
// Get data from parsing data
PARSING_DATA pdata = parsingDataFromUModelIndex(index);
@ -64,7 +64,7 @@ UString uniqueItemName(const UModelIndex & index)
// Default name
UString name = itemName;
switch (model->type(index)) {
case Types::Volume:
case Types::Volume:
if (pdata.volume.hasExtendedHeader) name = guidToUString(pdata.volume.extendedHeaderGuid);
break;
case Types::NvarEntry:
@ -72,19 +72,22 @@ UString uniqueItemName(const UModelIndex & index)
case Types::FsysEntry:
case Types::EvsaEntry:
case Types::FlashMapEntry:
case Types::File:
name = itemText.isEmpty() ? itemName : itemText;
case Types::File:
name = itemText.isEmpty() ? itemName : itemName + '_' + itemText;
break;
case Types::Section: {
// Get parent file name
UModelIndex fileIndex = model->findParentOfType(index, Types::File);
UString fileText = model->text(fileIndex);
name = fileText.isEmpty() ? model->name(fileIndex) : fileText;
// Append section subtype name
name += '_' + itemName;
name = fileText.isEmpty() ? model->name(fileIndex) : model->name(fileIndex) + '_' + fileText;
} break;
}
UString subtypeString = itemSubtypeToUString(model->type(index), model->subtype(index));
name = itemTypeToUString(model->type(index))
+ (subtypeString.length() ? ('_' + subtypeString) : UString())
+ '_' + name;
name.findreplace(' ', '_');
name.findreplace('/', '_');
name.findreplace('-', '_');