From 06f9201717c26825156ba0983b018408eef2c9d5 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Tue, 13 Dec 2022 17:50:23 +0000 Subject: [PATCH] Tidy up PluginSortingData construction --- src/api/sorting/plugin_sorting_data.cpp | 6 +----- src/api/sorting/plugin_sorting_data.h | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/api/sorting/plugin_sorting_data.cpp b/src/api/sorting/plugin_sorting_data.cpp index 3208e710..850e09bd 100644 --- a/src/api/sorting/plugin_sorting_data.cpp +++ b/src/api/sorting/plugin_sorting_data.cpp @@ -49,9 +49,6 @@ std::vector GetPluginsSubset( return pluginsSubset; } -PluginSortingData::PluginSortingData() : - plugin_(nullptr), numOverrideFormIDs(0) {} - PluginSortingData::PluginSortingData( const PluginSortingInterface* plugin, const PluginMetadata& masterlistMetadata, @@ -63,8 +60,7 @@ PluginSortingData::PluginSortingData( masterlistLoadAfter_(masterlistMetadata.GetLoadAfterFiles()), userLoadAfter_(userMetadata.GetLoadAfterFiles()), masterlistReq_(masterlistMetadata.GetRequirements()), - userReq_(userMetadata.GetRequirements()), - numOverrideFormIDs(0) { + userReq_(userMetadata.GetRequirements()) { if (userMetadata.GetGroup()) { group_ = userMetadata.GetGroup().value(); } else if (masterlistMetadata.GetGroup()) { diff --git a/src/api/sorting/plugin_sorting_data.h b/src/api/sorting/plugin_sorting_data.h index 8443b79b..390a0e7a 100644 --- a/src/api/sorting/plugin_sorting_data.h +++ b/src/api/sorting/plugin_sorting_data.h @@ -31,7 +31,7 @@ namespace loot { class PluginSortingData { public: - explicit PluginSortingData(); + explicit PluginSortingData() = default; /** * This stores a copy of the plugin pointer that is passed to it, so @@ -66,7 +66,7 @@ public: const std::optional& GetLoadOrderIndex() const; private: - const PluginSortingInterface* plugin_; + const PluginSortingInterface* plugin_{nullptr}; std::string group_; std::unordered_set afterGroupPlugins_; @@ -76,7 +76,7 @@ private: std::vector userReq_; std::optional loadOrderIndex_; - size_t numOverrideFormIDs; + size_t numOverrideFormIDs{0}; }; }