atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix build:

Browse source 
- use parser class when parsing metatile label files
- use QString() over QString::null which is deprecated
This commit is contained in:
garak 2019-09-09 18:24:30 -04:00
parent b9ba7777d3
commit e3f92fff12
2 changed files with 26 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mainwindow.cpp
View file

@ -343,7 +343,7 @@ bool MainWindow::setMap(QString map_name, bool scrollTreeView) {
if (scrollTreeView) { if (scrollTreeView) {
// Make sure we clear the filter first so we actually have a scroll target // Make sure we clear the filter first so we actually have a scroll target
mapListProxyModel->setFilterRegExp(QString::null); mapListProxyModel->setFilterRegExp(QString());
ui->mapList->setCurrentIndex(mapListProxyModel->mapFromSource(mapListIndexes.value(map_name))); ui->mapList->setCurrentIndex(mapListProxyModel->mapFromSource(mapListIndexes.value(map_name)));
ui->mapList->scrollTo(ui->mapList->currentIndex(), QAbstractItemView::PositionAtCenter); ui->mapList->scrollTo(ui->mapList->currentIndex(), QAbstractItemView::PositionAtCenter);
} }

61
src/project.cpp
View file

@ -344,7 +344,7 @@ QString Project::readMapLayoutId(QString map_name) {
QJsonDocument mapDoc; QJsonDocument mapDoc;
if (!parser.tryParseJsonFile(&mapDoc, mapFilepath)) { if (!parser.tryParseJsonFile(&mapDoc, mapFilepath)) {
logError(QString("Failed to read map layout id from %1").arg(mapFilepath)); logError(QString("Failed to read map layout id from %1").arg(mapFilepath));
return QString::null; return QString();
} }
QJsonObject mapObj = mapDoc.object(); QJsonObject mapObj = mapDoc.object();
@ -360,7 +360,7 @@ QString Project::readMapLocation(QString map_name) {
QJsonDocument mapDoc; QJsonDocument mapDoc;
if (!parser.tryParseJsonFile(&mapDoc, mapFilepath)) { if (!parser.tryParseJsonFile(&mapDoc, mapFilepath)) {
logError(QString("Failed to read map's region map section from %1").arg(mapFilepath)); logError(QString("Failed to read map's region map section from %1").arg(mapFilepath));
return QString::null; return QString();
} }
QJsonObject mapObj = mapDoc.object(); QJsonObject mapObj = mapDoc.object();
@ -633,29 +633,25 @@ void Project::saveTilesets(Tileset *primaryTileset, Tileset *secondaryTileset) {
} }
void Project::saveTilesetMetatileLabels(Tileset *primaryTileset, Tileset *secondaryTileset) { void Project::saveTilesetMetatileLabels(Tileset *primaryTileset, Tileset *secondaryTileset) {
QString filepath = root + "/include/constants/metatile_labels.h";
QString originalText = readTextFile(filepath);
QString primaryPrefix = QString("METATILE_%1_").arg(QString(primaryTileset->name).replace("gTileset_", "")); QString primaryPrefix = QString("METATILE_%1_").arg(QString(primaryTileset->name).replace("gTileset_", ""));
QString secondaryPrefix = QString("METATILE_%1_").arg(QString(secondaryTileset->name).replace("gTileset_", "")); QString secondaryPrefix = QString("METATILE_%1_").arg(QString(secondaryTileset->name).replace("gTileset_", ""));
QMap<QString, int> defines; QMap<QString, int> defines;
bool definesFileModified = false; bool definesFileModified = false;
if (!originalText.isNull()) {
defines = readCDefines(originalText, (QStringList() << "METATILE_"));
// Purge old entries from the file. defines = parser.readCDefines("include/constants/metatile_labels.h", (QStringList() << "METATILE_"));
QStringList definesToRemove;
for (QString defineName : defines.keys()) { // Purge old entries from the file.
if (defineName.startsWith(primaryPrefix) || defineName.startsWith(secondaryPrefix)) { QStringList definesToRemove;
definesToRemove << defineName; for (QString defineName : defines.keys()) {
} if (defineName.startsWith(primaryPrefix) || defineName.startsWith(secondaryPrefix)) {
} definesToRemove << defineName;
for (QString defineName : definesToRemove) {
defines.remove(defineName);
definesFileModified = true;
} }
} }
for (QString defineName : definesToRemove) {
defines.remove(defineName);
definesFileModified = true;
}
// Add the new labels. // Add the new labels.
for (int i = 0; i < primaryTileset->metatiles->size(); i++) { for (int i = 0; i < primaryTileset->metatiles->size(); i++) {
@ -713,7 +709,7 @@ void Project::saveTilesetMetatileLabels(Tileset *primaryTileset, Tileset *second
} }
outputText += "\n#endif // GUARD_METATILE_LABELS_H\n"; outputText += "\n#endif // GUARD_METATILE_LABELS_H\n";
saveTextFile(filepath, outputText); saveTextFile(root + "/include/constants/metatile_labels.h", outputText);
} }
void Project::saveTilesetMetatileAttributes(Tileset *tileset) { void Project::saveTilesetMetatileAttributes(Tileset *tileset) {
@ -1229,26 +1225,19 @@ void Project::loadTilesetMetatiles(Tileset* tileset) {
} }
void Project::loadTilesetMetatileLabels(Tileset* tileset) { void Project::loadTilesetMetatileLabels(Tileset* tileset) {
QString filepath = root + "/include/constants/metatile_labels.h"; QString tilesetPrefix = QString("METATILE_%1_").arg(QString(tileset->name).replace("gTileset_", ""));
QString text = readTextFile(filepath); QMap<QString, int> labels = parser.readCDefines("include/constants/metatile_labels.h", QStringList() << tilesetPrefix);
if (!text.isNull()) { for (QString labelName : labels.keys()) {
QString tilesetPrefix = QString("METATILE_%1_").arg(QString(tileset->name).replace("gTileset_", "")); int metatileId = labels[labelName];
QMap<QString, int> labels = readCDefines(text, QStringList() << tilesetPrefix); // subtract Project::num_tiles_primary from secondary metatiles
Metatile *metatile = Tileset::getMetatile(metatileId - (tileset->is_secondary == "TRUE" ? Project::num_tiles_primary : 0), tileset, nullptr);
for (QString labelName : labels.keys()) { if (metatile) {
int metatileId = labels[labelName]; metatile->label = labelName.replace(tilesetPrefix, "");
// subtract Project::num_tiles_primary from secondary metatiles } else {
Metatile *metatile = Tileset::getMetatile(metatileId - (tileset->is_secondary == "TRUE" ? Project::num_tiles_primary : 0), tileset, nullptr); QString hexString = QString("%1").arg(metatileId, 3, 16, QChar('0')).toUpper();
if (metatile) { logError(QString("Metatile 0x%1 cannot be found in tileset '%2'").arg(hexString, tileset->name));
metatile->label = labelName.replace(tilesetPrefix, "");
} else {
QString hexString = QString("%1").arg(metatileId, 3, 16, QChar('0')).toUpper();
logError(QString("Metatile 0x%1 cannot be found in tileset '%2'").arg(hexString, tileset->name));
}
} }
} else {
logError(QString("Failed to read C defines file: '%1'").arg(filepath));
} }
} }