From 341df470d154e1fe8ce974b3bf8e0c359d2e4153 Mon Sep 17 00:00:00 2001 From: scawful Date: Wed, 7 Aug 2024 15:06:50 -0400 Subject: [PATCH] cleanup project.h --- src/app/core/project.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/app/core/project.h b/src/app/core/project.h index 113716f3..7bae104f 100644 --- a/src/app/core/project.h +++ b/src/app/core/project.h @@ -1,26 +1,24 @@ #ifndef YAZE_APP_CORE_PROJECT_H #define YAZE_APP_CORE_PROJECT_H -#include "absl/strings/match.h" - +#include #include #include #include #include #include "absl/status/status.h" -#include "absl/strings/string_view.h" +#include "absl/strings/match.h" #include "app/core/common.h" namespace yaze { namespace app { -constexpr absl::string_view kProjectFileExtension = ".yaze"; +constexpr std::string kProjectFileExtension = ".yaze"; constexpr absl::string_view kProjectFileFilter = "Yaze Project Files (*.yaze)\0*.yaze\0"; -constexpr absl::string_view kPreviousRomFilenameDelimiter = - "PreviousRomFilename"; -constexpr absl::string_view kEndOfProjectFile = "EndOfProjectFile"; +constexpr std::string kPreviousRomFilenameDelimiter = "PreviousRomFilename"; +constexpr std::string kEndOfProjectFile = "EndOfProjectFile"; /** * @struct Project @@ -70,9 +68,12 @@ struct Project : public core::ExperimentFlags { } if (absl::StrContains(line, kPreviousRomFilenameDelimiter)) { - previous_rom_filenames_.push_back( - line.substr(line.find(kPreviousRomFilenameDelimiter) + - kPreviousRomFilenameDelimiter.size() + 1)); + size_t delimiter_pos = line.find(kPreviousRomFilenameDelimiter); + if (delimiter_pos != std::string::npos) { + std::string filename = + line.substr(delimiter_pos + kPreviousRomFilenameDelimiter.size()); + previous_rom_filenames_.push_back(filename); + } } }