From 21be39e2c9bf1553c2f59c80e428f9ee5e1c95b8 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 10 Sep 2017 09:20:40 -0500 Subject: [PATCH] Cleanup magic strings in tilesheet importer --- src/nostalgia/core/studio/import_tilesheet_wizard.cpp | 5 +++-- src/nostalgia/core/studio/import_tilesheet_wizard.hpp | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/nostalgia/core/studio/import_tilesheet_wizard.cpp b/src/nostalgia/core/studio/import_tilesheet_wizard.cpp index 26ca2abd..db8a00c8 100644 --- a/src/nostalgia/core/studio/import_tilesheet_wizard.cpp +++ b/src/nostalgia/core/studio/import_tilesheet_wizard.cpp @@ -13,6 +13,7 @@ namespace nostalgia { namespace core { +const QString ImportTilesheetWizardPage::TILESHEET_DIR = "/TileSheets/"; const QString ImportTilesheetWizardPage::TILESHEET_NAME = "projectName"; const QString ImportTilesheetWizardPage::IMPORT_PATH = "projectPath"; const QString ImportTilesheetWizardPage::BPP = "bpp"; @@ -52,8 +53,8 @@ int ImportTilesheetWizardPage::importImage(QFile &srcFile, QString tilesheetName srcFile.open(QIODevice::ReadOnly); if (srcFile.read((char*) buff, buffSize) > 0) { int err = 0; - m_project->mkdir("/TileSheets"); - err |= m_project->write("/TileSheets/" + tilesheetName, buff, buffSize); + m_project->mkdir(TILESHEET_DIR); + err |= m_project->write(TILESHEET_DIR + tilesheetName, buff, buffSize); err |= m_project->saveRomFs(); return err; } else { diff --git a/src/nostalgia/core/studio/import_tilesheet_wizard.hpp b/src/nostalgia/core/studio/import_tilesheet_wizard.hpp index 32cc4525..2b1848ab 100644 --- a/src/nostalgia/core/studio/import_tilesheet_wizard.hpp +++ b/src/nostalgia/core/studio/import_tilesheet_wizard.hpp @@ -15,6 +15,7 @@ namespace core { class ImportTilesheetWizardPage: public studio::WizardFormPage { private: + static const QString TILESHEET_DIR; static const QString TILESHEET_NAME; static const QString IMPORT_PATH; static const QString BPP;