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 function parameter

Browse Source
This commit is contained in:
Oliver Hamlet
2023-09-30 15:21:31 +01:00
parent 6821994248
commit 5207a682e1
3 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/sorting/plugin_sort.cpp
-2
View File
@@ -203,7 +203,6 @@ std::vector<std::string> SortPlugins(
std::vector<std::string> SortPlugins(
std::vector<PluginSortingData>&& pluginsSortingData,
const GameType gameType,
const std::vector<Group> masterlistGroups,
const std::vector<Group> userGroups,
const std::vector<std::string>& earlyLoadingPlugins) {
@@ -287,7 +286,6 @@ std::vector<std::string> SortPlugins(
const auto newLoadOrder =
SortPlugins(std::move(pluginsSortingData),
game.GetType(),
game.GetDatabase().GetGroups(false),
game.GetDatabase().GetUserGroups(),
game.GetLoadOrderHandler().GetEarlyLoadingPlugins());
src/api/sorting/plugin_sort.h
-1
View File
@@ -34,7 +34,6 @@
namespace loot {
std::vector<std::string> SortPlugins(
std::vector<PluginSortingData>&& pluginsSortingData,
const GameType gameType,
const std::vector<Group> masterlistGroups,
const std::vector<Group> userGroups,
const std::vector<std::string>& implicitlyActivePlugins);
src/tests/api/internals/sorting/plugin_sort_test.h
+8 -16
View File
@@ -182,8 +182,7 @@ TEST_P(PluginSortTest,
CreatePluginSortingData(p2->GetName(), loadOrder),
CreatePluginSortingData(p3->GetName(), loadOrder)};
auto sorted = SortPlugins(
std::move(pluginsSortingData), GetParam(), {Group()}, {}, {});
auto sorted = SortPlugins(std::move(pluginsSortingData), {Group()}, {}, {});
ASSERT_EQ(expectedSortedOrder, sorted);
loadOrder = sorted;
@@ -197,8 +196,7 @@ TEST_P(PluginSortTest,
CreatePluginSortingData(p2->GetName(), loadOrder),
CreatePluginSortingData(p3->GetName(), loadOrder)};
auto sorted = SortPlugins(
std::move(pluginsSortingData), GetParam(), {Group()}, {}, {});
auto sorted = SortPlugins(std::move(pluginsSortingData), {Group()}, {}, {});
ASSERT_EQ(expectedSortedOrder, sorted);
}
}
@@ -424,7 +422,7 @@ TEST_P(PluginSortTest,
CreatePluginSortingData(esp->GetName())};
try {
SortPlugins(std::move(pluginsSortingData), GetParam(), {Group()}, {}, {});
SortPlugins(std::move(pluginsSortingData), {Group()}, {}, {});
FAIL();
} catch (const CyclicInteractionError& e) {
ASSERT_EQ(2, e.GetCycle().size());
@@ -556,19 +554,13 @@ TEST_P(PluginSortTest,
CreatePluginSortingData(esm->GetName()),
CreatePluginSortingData(esp->GetName())};
EXPECT_THROW(SortPlugins(std::move(pluginsSortingData),
GetParam(),
{Group()},
{},
{esp->GetName()}),
CyclicInteractionError);
EXPECT_THROW(
SortPlugins(
std::move(pluginsSortingData), {Group()}, {}, {esp->GetName()}),
CyclicInteractionError);
try {
SortPlugins(std::move(pluginsSortingData),
GetParam(),
{Group()},
{},
{esp->GetName()});
SortPlugins(std::move(pluginsSortingData), {Group()}, {}, {esp->GetName()});
FAIL();
} catch (const CyclicInteractionError& e) {
ASSERT_EQ(2, e.GetCycle().size());