From fc0c4048366e0b0cfc822a9c654fced9ec63ff69 Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 22 Jul 2021 12:22:57 -0400 Subject: [PATCH] remove some commented old code --- include/core/map.h | 1 - src/project.cpp | 9 --------- src/ui/newmappopup.cpp | 1 - 3 files changed, 11 deletions(-) diff --git a/include/core/map.h b/include/core/map.h index 66017ae0..61b6538f 100644 --- a/include/core/map.h +++ b/include/core/map.h @@ -35,7 +35,6 @@ public: public: QString name; QString constantName; - QString group_num; QString song; QString layoutId; QString location; diff --git a/src/project.cpp b/src/project.cpp index 97503b48..3217da1c 100644 --- a/src/project.cpp +++ b/src/project.cpp @@ -1145,10 +1145,6 @@ Tileset* Project::loadTileset(QString label, Tileset *tileset) { } bool Project::loadBlockdata(MapLayout *layout) { - // if (map->hasUnsavedChanges()) { - // return true; - // } - QString path = QString("%1/%2").arg(root).arg(layout->blockdata_path); layout->blockdata = readBlockdata(path); layout->lastCommitMapBlocks.blocks = layout->blockdata; @@ -1175,10 +1171,6 @@ void Project::setNewMapBlockdata(Map *map) { } bool Project::loadLayoutBorder(MapLayout *layout) { - // if (map->hasUnsavedChanges()) { - // return true; - // } - QString path = QString("%1/%2").arg(root).arg(layout->border_path); layout->border = readBlockdata(path); int borderLength = layout->getBorderWidth() * layout->getBorderHeight(); @@ -1860,7 +1852,6 @@ Map* Project::addNewMapToGroup(QString mapName, int groupNum, Map *newMap, bool setNewMapBorder(newMap); } - //loadMapTilesets(newMap); loadLayoutTilesets(newMap->layout); setNewMapEvents(newMap); setNewMapConnections(newMap); diff --git a/src/ui/newmappopup.cpp b/src/ui/newmappopup.cpp index 988d6129..c53c6416 100644 --- a/src/ui/newmappopup.cpp +++ b/src/ui/newmappopup.cpp @@ -260,7 +260,6 @@ void NewMapPopup::on_pushButton_NewMap_Accept_clicked() { if (this->existingLayout) { project->loadMapLayout(newMap); } - newMap->group_num = QString::number(group); map = newMap; emit applied(); this->close();