loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused constructor arguments

Browse Source
This commit is contained in:
Oliver Hamlet
2024-08-22 08:31:33 +01:00
parent 88d5f2b484
commit 59a3b7ce40
7 changed files with 14 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/sorting/plugin_sort.cpp
+3 -8
View File
@@ -32,7 +32,6 @@
namespace loot {
std::vector<PluginSortingData> GetPluginsSortingData(
const GameType gameType,
const DatabaseInterface& db,
const std::vector<const PluginInterface*> loadedPluginInterfaces,
const std::vector<std::string>& loadOrder) {
@@ -57,12 +56,8 @@ std::vector<PluginSortingData> GetPluginsSortingData(
const auto userMetadata = db.GetPluginUserMetadata(plugin->GetName(), true)
.value_or(PluginMetadata(plugin->GetName()));
const auto pluginSortingData = PluginSortingData(plugin,
masterlistMetadata,
userMetadata,
loadOrder,
gameType,
loadedPluginInterfaces);
const auto pluginSortingData =
PluginSortingData(plugin, masterlistMetadata, userMetadata, loadOrder);
pluginsSortingData.push_back(pluginSortingData);
}
@@ -274,7 +269,7 @@ std::vector<std::string> SortPlugins(
Game& game,
const std::vector<std::string>& loadOrder) {
auto pluginsSortingData = GetPluginsSortingData(
game.GetType(), game.GetDatabase(), game.GetLoadedPlugins(), loadOrder);
game.GetDatabase(), game.GetLoadedPlugins(), loadOrder);
const auto logger = getLogger();
if (logger) {
src/api/sorting/plugin_sort.h
+1 -1
View File
@@ -36,7 +36,7 @@ std::vector<std::string> SortPlugins(
std::vector<PluginSortingData>&& pluginsSortingData,
const std::vector<Group> masterlistGroups,
const std::vector<Group> userGroups,
const std::vector<std::string>& implicitlyActivePlugins);
const std::vector<std::string>& earlyLoadingPlugins);
std::vector<std::string> SortPlugins(Game& game,
const std::vector<std::string>& loadOrder);
src/api/sorting/plugin_sorting_data.cpp
+1 -3
View File
@@ -53,9 +53,7 @@ PluginSortingData::PluginSortingData(
const PluginSortingInterface* plugin,
const PluginMetadata& masterlistMetadata,
const PluginMetadata& userMetadata,
const std::vector<std::string>& loadOrder,
const GameType gameType,
const std::vector<const PluginInterface*>& loadedPlugins) :
const std::vector<std::string>& loadOrder) :
plugin_(plugin),
group_(userMetadata.GetGroup().value_or(
masterlistMetadata.GetGroup().value_or(Group::DEFAULT_NAME))),
src/api/sorting/plugin_sorting_data.h
+1 -3
View File
@@ -44,9 +44,7 @@ public:
const PluginSortingInterface* plugin,
const PluginMetadata& masterlistMetadata,
const PluginMetadata& userMetadata,
const std::vector<std::string>& loadOrder,
const GameType gameType,
const std::vector<const PluginInterface*>& loadedPlugins);
const std::vector<std::string>& loadOrder);
std::string GetName() const;
bool IsMaster() const;
src/tests/api/internals/sorting/plugin_graph_test.h
+2 -2
View File
@@ -156,7 +156,7 @@ protected:
const auto plugin = GetPlugin(name);
return PluginSortingData(
plugin, PluginMetadata(), PluginMetadata(), {}, GameType::tes4, {});
plugin, PluginMetadata(), PluginMetadata(), {});
}
PluginSortingData CreatePluginSortingData(const std::string& name,
@@ -174,7 +174,7 @@ protected:
}
return PluginSortingData(
plugin, masterlistMetadata, userMetadata, {}, GameType::tes4, {});
plugin, masterlistMetadata, userMetadata, {});
}
plugingraph::TestPlugin* GetPlugin(const std::string& name) {
src/tests/api/internals/sorting/plugin_sort_test.h
+1 -3
View File
@@ -99,9 +99,7 @@ protected:
return PluginSortingData(plugin,
PluginMetadata(),
PluginMetadata(),
loadOrder,
GameType::tes4,
{});
loadOrder);
}
plugingraph::TestPlugin* GetPlugin(const std::string& name) {
src/tests/api/internals/sorting/plugin_sorting_data_test.h
+5 -15
View File
@@ -101,18 +101,14 @@ TEST_P(PluginSortingDataTest, lightFlaggedEspFilesShouldNotBeTreatedAsMasters) {
dynamic_cast<const PluginSortingInterface *>(game_.GetPlugin(blankEsp)),
PluginMetadata(),
PluginMetadata(),
getLoadOrder(),
game_.GetType(),
loadedPlugins);
getLoadOrder());
EXPECT_FALSE(esp.IsMaster());
auto master = PluginSortingData(
dynamic_cast<const PluginSortingInterface *>(game_.GetPlugin(blankEsm)),
PluginMetadata(),
PluginMetadata(),
getLoadOrder(),
game_.GetType(),
loadedPlugins);
getLoadOrder());
EXPECT_TRUE(master.IsMaster());
if (GetParam() == GameType::fo4 || GetParam() == GameType::tes5se) {
@@ -120,9 +116,7 @@ TEST_P(PluginSortingDataTest, lightFlaggedEspFilesShouldNotBeTreatedAsMasters) {
dynamic_cast<const PluginSortingInterface *>(game_.GetPlugin(blankEsl)),
PluginMetadata(),
PluginMetadata(),
getLoadOrder(),
game_.GetType(),
loadedPlugins);
getLoadOrder());
EXPECT_TRUE(lightMaster.IsMaster());
auto lightPlugin =
@@ -130,9 +124,7 @@ TEST_P(PluginSortingDataTest, lightFlaggedEspFilesShouldNotBeTreatedAsMasters) {
game_.GetPlugin(blankEslEsp)),
PluginMetadata(),
PluginMetadata(),
getLoadOrder(),
game_.GetType(),
loadedPlugins);
getLoadOrder());
EXPECT_FALSE(lightPlugin.IsMaster());
}
}
@@ -145,9 +137,7 @@ TEST_P(PluginSortingDataTest,
dynamic_cast<const Plugin *>(game_.GetPlugin(blankMasterDependentEsm)),
PluginMetadata(),
PluginMetadata(),
getLoadOrder(),
game_.GetType(),
getLoadedPlugins());
getLoadOrder());
EXPECT_EQ(4, plugin.GetOverrideRecordCount());
}
}