From debae8c4cdcd2e5785382dff19276545a20a4226 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Tue, 14 Jul 2015 23:27:39 +0100 Subject: [PATCH] Plugin class code tidy. Just assign Form IDs, remove unused member function, and move NumOverrideFormIDs() declaration to data accessors block. --- src/backend/plugin/plugin.cpp | 11 +---------- src/backend/plugin/plugin.h | 3 +-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/backend/plugin/plugin.cpp b/src/backend/plugin/plugin.cpp index 1d20153b..88da030e 100644 --- a/src/backend/plugin/plugin.cpp +++ b/src/backend/plugin/plugin.cpp @@ -102,7 +102,7 @@ namespace loot { isMaster = loader.IsMaster(); masters = loader.Masters(); _isEmpty = loader.IsEmpty(); - formIDs.insert(loader.FormIDs().begin(), loader.FormIDs().end()); + formIDs = loader.FormIDs(); if (!headerOnly) { BOOST_LOG_TRIVIAL(trace) << name << ": Caching CRC value."; @@ -203,15 +203,6 @@ namespace loot { return overlap; } - std::set Plugin::OverrideFormIDs() const { - set fidSubset; - for (const auto &formID : formIDs) { - if (!boost::iequals(formID.Plugin(), name)) - fidSubset.insert(formID); - } - return fidSubset; - } - std::vector Plugin::Masters() const { return masters; } diff --git a/src/backend/plugin/plugin.h b/src/backend/plugin/plugin.h index 56f34744..0118c65e 100644 --- a/src/backend/plugin/plugin.h +++ b/src/backend/plugin/plugin.h @@ -50,6 +50,7 @@ namespace loot { bool IsEmpty() const; std::string Version() const; uint32_t Crc() const; + size_t NumOverrideFormIDs() const; bool LoadsBSA(const Game& game) const; bool IsValid(const Game& game) const; @@ -61,9 +62,7 @@ namespace loot { //Load ordering functions. bool DoFormIDsOverlap(const Plugin& plugin) const; - size_t NumOverrideFormIDs() const; std::set OverlapFormIDs(const Plugin& plugin) const; - std::set OverrideFormIDs() const; //Validity checks. bool CheckInstallValidity(const Game& game); //Checks that reqs and masters are all present, and that no incs are present. Returns true if the plugin is dirty.