diff --git a/include/core/metatileparser.h b/include/core/metatileparser.h index 2008d60f..b85e5b36 100644 --- a/include/core/metatileparser.h +++ b/include/core/metatileparser.h @@ -4,13 +4,9 @@ #include "metatile.h" #include -#include -class MetatileParser -{ -public: - MetatileParser(); +namespace MetatileParser { QList parse(QString filepath, bool *error, bool primaryTileset); -}; +} #endif // METATILEPARSER_H diff --git a/src/core/metatileparser.cpp b/src/core/metatileparser.cpp index 3bbed668..852c26af 100644 --- a/src/core/metatileparser.cpp +++ b/src/core/metatileparser.cpp @@ -2,11 +2,7 @@ #include "config.h" #include "log.h" #include "project.h" - -MetatileParser::MetatileParser() -{ - -} +#include QList MetatileParser::parse(QString filepath, bool *error, bool primaryTileset) { diff --git a/src/ui/tileseteditor.cpp b/src/ui/tileseteditor.cpp index d324a5c9..58f41b24 100644 --- a/src/ui/tileseteditor.cpp +++ b/src/ui/tileseteditor.cpp @@ -878,9 +878,8 @@ void TilesetEditor::importTilesetMetatiles(Tileset *tileset, bool primary) return; } - MetatileParser parser; bool error = false; - QList metatiles = parser.parse(filepath, &error, primary); + QList metatiles = MetatileParser::parse(filepath, &error, primary); if (error) { QMessageBox msgBox(this); msgBox.setText("Failed to import metatiles from Advance Map 1.92 .bvd file.");