diff --git a/src/base_tab/gamebase/GameBase.hpp b/src/base_tab/gamebase/GameBase.hpp index c39d714..89ba278 100644 --- a/src/base_tab/gamebase/GameBase.hpp +++ b/src/base_tab/gamebase/GameBase.hpp @@ -7,9 +7,9 @@ class GameBase { public: virtual std::shared_ptr GetGame(std::uint32_t id) = 0; - virtual void Save(std::vector to_ignore, - std::vector> new_games_bases, - std::vector> new_games) = 0; + virtual void Save(std::vector to_delete, + std::vector> databases_to_import, + std::vector> games_to_import) = 0; virtual std::shared_ptr GetCurrentGame() = 0; virtual bool NextGame() = 0; virtual std::string GetTag(std::string tag) = 0; diff --git a/src/base_tab/gamebase/PGNGameBase.cpp b/src/base_tab/gamebase/PGNGameBase.cpp index bb7955d..147899b 100644 --- a/src/base_tab/gamebase/PGNGameBase.cpp +++ b/src/base_tab/gamebase/PGNGameBase.cpp @@ -63,9 +63,9 @@ std::shared_ptr PGNGameBase::GetGame(std::uint32_t id) { return (std::shared_ptr(NULL)); } -void PGNGameBase::Save(std::vector to_ignore, - std::vector> new_games_bases, - std::vector> new_games) { +void PGNGameBase::Save(std::vector to_delete, + std::vector> databases_to_import, + std::vector> games_to_import) { wxStandardPaths stdPaths = wxStandardPaths::Get(); wxString tmp = stdPaths.GetTempDir() + "/save_pgn_tmp.pgn"; wxFile new_pgn(tmp, wxFile::write); @@ -74,7 +74,7 @@ void PGNGameBase::Save(std::vector to_ignore, std::uint32_t id = 0; bool several = false; while (NextGame()) { - if (std::find(to_ignore.begin(), to_ignore.end(), id) == to_ignore.end()) { + if (std::find(to_delete.begin(), to_delete.end(), id) == to_delete.end()) { if (several) { new_pgn.Write("\n\n"); } else { @@ -87,7 +87,7 @@ void PGNGameBase::Save(std::vector to_ignore, } // Now add new games - for (std::shared_ptr current : new_games_bases) { + for (std::shared_ptr current : databases_to_import) { current->Reset(); while (current->NextGame()) { if (several) { @@ -100,7 +100,7 @@ void PGNGameBase::Save(std::vector to_ignore, } } - for (std::shared_ptr g : new_games) { + for (std::shared_ptr g : games_to_import) { if (several) { new_pgn.Write("\n\n"); } else { diff --git a/src/base_tab/gamebase/PGNGameBase.hpp b/src/base_tab/gamebase/PGNGameBase.hpp index 72b7302..b184318 100644 --- a/src/base_tab/gamebase/PGNGameBase.hpp +++ b/src/base_tab/gamebase/PGNGameBase.hpp @@ -13,9 +13,9 @@ public: bool NextGame(); std::shared_ptr GetCurrentGame(); std::string GetTag(std::string tag); - void Save(std::vector to_ignore, - std::vector> new_games_bases, - std::vector> new_games); + void Save(std::vector to_delete, + std::vector> databases_to_import, + std::vector> games_to_import); void Reset(); void Export(std::shared_ptr base); std::string GetFormat() {return("PGN");};