AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-20 02:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-commit of VS2017/submodule/library changes

Browse Source
This commit is contained in:
Aruki
2018-07-07 17:17:33 -06:00
parent 15e46dc551
commit 6cbc2a3208
17 changed files with 146 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Editor/CExportGameDialog.cpp
View File

@@ -89,7 +89,7 @@ void CExportGameDialog::InitUI(QString ExportDir)
mRegion == eRegion_PAL ? "PAL" : "JPN" );
// Disc tree widget
nod::Partition *pPartition = mpDisc->getDataPartition();
nod::IPartition *pPartition = mpDisc->getDataPartition();
ASSERT(pPartition);
QTreeWidgetItem *pTreeRoot = new QTreeWidgetItem((QTreeWidgetItem*) nullptr, QStringList(QString("Disc")));
@@ -314,7 +314,7 @@ void CExportGameDialog::RecursiveAddToTree(const nod::Node *pkNode, QTreeWidgetI
if (pkLeft->getKind() != pkRight->getKind())
return pkLeft->getKind() == nod::Node::Kind::Directory;
else
return TString(pkLeft->getName()).ToUpper() < TString(pkRight->getName()).ToUpper();
return TString(pkLeft->getName().data()).ToUpper() < TString(pkRight->getName().data()).ToUpper();
});
// Add nodes to tree
@@ -330,7 +330,7 @@ void CExportGameDialog::RecursiveAddToTree(const nod::Node *pkNode, QTreeWidgetI
bool IsDir = pkNode->getKind() == nod::Node::Kind::Directory;
QTreeWidgetItem *pItem = new QTreeWidgetItem(pParent, QStringList(QString::fromStdString(pkNode->getName())) );
QTreeWidgetItem *pItem = new QTreeWidgetItem(pParent, QStringList(QString::fromStdString(pkNode->getName().data())) );
pItem->setIcon(0, QIcon(IsDir ? skDirIcon : skFileIcon));
if (IsDir)