From d3308cbefd3e6baa036ec287a41971dabe9b070a Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Sat, 28 Jan 2017 14:08:45 +0000 Subject: [PATCH] Refactor Version usage out of GUI code --- src/backend/plugin/plugin.cpp | 5 +++++ src/backend/plugin/plugin.h | 1 + src/gui/query/get_game_data_query.h | 2 +- src/gui/query_handler.cpp | 1 - 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/backend/plugin/plugin.cpp b/src/backend/plugin/plugin.cpp index 079196be..00f7cc82 100644 --- a/src/backend/plugin/plugin.cpp +++ b/src/backend/plugin/plugin.cpp @@ -34,6 +34,7 @@ #include "backend/game/game.h" #include "backend/helpers/helpers.h" +#include "backend/helpers/version.h" using libespm::FormId; using std::set; @@ -143,6 +144,10 @@ size_t Plugin::NumOverrideFormIDs() const { return numOverrideRecords_; } +std::string Plugin::GetVersion() const { + return Version(getDescription()).AsString(); +} + std::set Plugin::OverlapFormIDs(const Plugin& plugin) const { set formIds(getFormIds()); set otherFormIds(plugin.getFormIds()); diff --git a/src/backend/plugin/plugin.h b/src/backend/plugin/plugin.h index 05bba79a..ce8de0aa 100644 --- a/src/backend/plugin/plugin.h +++ b/src/backend/plugin/plugin.h @@ -51,6 +51,7 @@ public: bool IsEmpty() const; uint32_t Crc() const; size_t NumOverrideFormIDs() const; + std::string GetVersion() const; bool LoadsArchive() const; bool IsActive() const; diff --git a/src/gui/query/get_game_data_query.h b/src/gui/query/get_game_data_query.h index 144bf8aa..601057de 100644 --- a/src/gui/query/get_game_data_query.h +++ b/src/gui/query/get_game_data_query.h @@ -146,7 +146,7 @@ private: pluginNode["isMaster"] = plugin.isMasterFile(); pluginNode["loadsArchive"] = plugin.LoadsArchive(); pluginNode["crc"] = plugin.Crc(); - pluginNode["version"] = Version(plugin.getDescription()).AsString(); + pluginNode["version"] = plugin.GetVersion(); BOOST_LOG_TRIVIAL(trace) << "Getting masterlist metadata for: " << plugin.Name(); Plugin mlistPlugin(plugin); diff --git a/src/gui/query_handler.cpp b/src/gui/query_handler.cpp index c211f387..e8c6f860 100644 --- a/src/gui/query_handler.cpp +++ b/src/gui/query_handler.cpp @@ -74,7 +74,6 @@ #include "backend/plugin/plugin_sorter.h" #include "backend/helpers/helpers.h" #include "gui/query/json.h" -#include "backend/helpers/version.h" #include "loot/loot_version.h" using boost::filesystem::exists;