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

Fix inconsistent case in EdgeType enum variant names

Browse Source
This commit is contained in:
Oliver Hamlet
2018-10-20 12:48:24 +01:00
parent 9a0b492cb0
commit db5acf3509
6 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/loot/exception/cyclic_interaction_error.h
+10 -10
View File
@@ -35,16 +35,16 @@ namespace loot {
* between plugins or groups.
*/
enum struct EdgeType : unsigned int {
Hardcoded,
MasterFlag,
Master,
MasterlistRequirement,
UserRequirement,
MasterlistLoadAfter,
UserLoadAfter,
Group,
Overlap,
TieBreak,
hardcoded,
masterFlag,
master,
masterlistRequirement,
userRequirement,
masterlistLoadAfter,
userLoadAfter,
group,
overlap,
tieBreak,
};
/**
src/api/sorting/cyclic_interaction_error.cpp
+10 -10
View File
@@ -34,25 +34,25 @@ EdgeType Vertex::GetTypeOfEdgeToNextVertex() const { return outEdgeType_; }
std::string describe(EdgeType edgeType) {
switch (edgeType) {
case EdgeType::Hardcoded:
case EdgeType::hardcoded:
return "Hardcoded";
case EdgeType::MasterFlag:
case EdgeType::masterFlag:
return "Master Flag";
case EdgeType::Master:
case EdgeType::master:
return "Master";
case EdgeType::MasterlistRequirement:
case EdgeType::masterlistRequirement:
return "Masterlist Requirement";
case EdgeType::UserRequirement:
case EdgeType::userRequirement:
return "User Requirement";
case EdgeType::MasterlistLoadAfter:
case EdgeType::masterlistLoadAfter:
return "Masterlist Load After";
case EdgeType::UserLoadAfter:
case EdgeType::userLoadAfter:
return "User Load After";
case EdgeType::Group:
case EdgeType::group:
return "Group";
case EdgeType::Overlap:
case EdgeType::overlap:
return "Overlap";
case EdgeType::TieBreak:
case EdgeType::tieBreak:
return "Tie Break";
default:
return "Unknown";
src/api/sorting/group_sort.cpp
+2 -2
View File
@@ -149,7 +149,7 @@ GetTransitiveAfterGroups(const std::unordered_set<Group>& masterlistGroups,
auto vertex = groupVertices[group.GetName()];
boost::add_edge(
vertex, otherVertex->second, EdgeType::MasterlistLoadAfter, graph);
vertex, otherVertex->second, EdgeType::masterlistLoadAfter, graph);
}
for (const auto& otherGroupName : group.GetUserAfterGroups()) {
@@ -160,7 +160,7 @@ GetTransitiveAfterGroups(const std::unordered_set<Group>& masterlistGroups,
auto vertex = groupVertices[group.GetName()];
boost::add_edge(
vertex, otherVertex->second, EdgeType::UserLoadAfter, graph);
vertex, otherVertex->second, EdgeType::userLoadAfter, graph);
}
}
src/api/sorting/plugin_sorter.cpp
+10 -10
View File
@@ -384,7 +384,7 @@ void PluginSorter::AddHardcodedPluginEdges(Game& game) {
if (processedPluginPaths.count(
std::filesystem::canonical(graphPluginPath)) == 0) {
AddEdge(pluginVertex, *vit, EdgeType::Hardcoded);
AddEdge(pluginVertex, *vit, EdgeType::hardcoded);
}
}
}
@@ -413,7 +413,7 @@ void PluginSorter::AddSpecificEdges() {
vertex = *vit2;
}
AddEdge(parentVertex, vertex, EdgeType::MasterFlag);
AddEdge(parentVertex, vertex, EdgeType::masterFlag);
}
vertex_t parentVertex;
@@ -422,7 +422,7 @@ void PluginSorter::AddSpecificEdges() {
}
for (const auto& master : graph_[*vit].GetMasters()) {
if (GetVertexByName(master, parentVertex))
AddEdge(parentVertex, *vit, EdgeType::Master);
AddEdge(parentVertex, *vit, EdgeType::master);
}
if (logger_) {
@@ -430,11 +430,11 @@ void PluginSorter::AddSpecificEdges() {
}
for (const auto& file : graph_[*vit].GetMasterlistRequirements()) {
if (GetVertexByName(file.GetName(), parentVertex))
AddEdge(parentVertex, *vit, EdgeType::MasterlistRequirement);
AddEdge(parentVertex, *vit, EdgeType::masterlistRequirement);
}
for (const auto& file : graph_[*vit].GetUserRequirements()) {
if (GetVertexByName(file.GetName(), parentVertex))
AddEdge(parentVertex, *vit, EdgeType::UserRequirement);
AddEdge(parentVertex, *vit, EdgeType::userRequirement);
}
if (logger_) {
@@ -442,11 +442,11 @@ void PluginSorter::AddSpecificEdges() {
}
for (const auto& file : graph_[*vit].GetMasterlistLoadAfterFiles()) {
if (GetVertexByName(file.GetName(), parentVertex))
AddEdge(parentVertex, *vit, EdgeType::MasterlistLoadAfter);
AddEdge(parentVertex, *vit, EdgeType::masterlistLoadAfter);
}
for (const auto& file : graph_[*vit].GetUserLoadAfterFiles()) {
if (GetVertexByName(file.GetName(), parentVertex))
AddEdge(parentVertex, *vit, EdgeType::UserLoadAfter);
AddEdge(parentVertex, *vit, EdgeType::userLoadAfter);
}
}
}
@@ -619,7 +619,7 @@ void PluginSorter::AddGroupEdges() {
shouldIgnoreGroupEdge(fromPlugin, toPlugin, groupPluginsToIgnore);
if (!ignore) {
AddEdge(edgePair.first, edgePair.second, EdgeType::Group);
AddEdge(edgePair.first, edgePair.second, EdgeType::group);
} else if (logger_) {
logger_->trace(
"Skipping edge from \"{}\" to \"{}\" as it would "
@@ -670,7 +670,7 @@ void PluginSorter::AddOverlapEdges() {
}
if (!EdgeCreatesCycle(fromVertex, toVertex))
AddEdge(fromVertex, toVertex, EdgeType::Overlap);
AddEdge(fromVertex, toVertex, EdgeType::overlap);
}
}
}
@@ -743,7 +743,7 @@ void PluginSorter::AddTieBreakEdges() {
}
if (!EdgeCreatesCycle(fromVertex, toVertex))
AddEdge(fromVertex, toVertex, EdgeType::TieBreak);
AddEdge(fromVertex, toVertex, EdgeType::tieBreak);
}
}
}
src/tests/api/internals/sorting/group_sort_test.h
+9 -9
View File
@@ -69,38 +69,38 @@ TEST(GetTransitiveAfterGroups, shouldThrowIfAfterGroupsAreCyclic) {
// Vertices can be added in any order, so which group is first is undefined.
if (e.GetCycle()[0].GetName() == "a") {
EXPECT_EQ(EdgeType::MasterlistLoadAfter,
EXPECT_EQ(EdgeType::masterlistLoadAfter,
e.GetCycle()[0].GetTypeOfEdgeToNextVertex());
EXPECT_EQ("c", e.GetCycle()[1].GetName());
EXPECT_EQ(EdgeType::UserLoadAfter,
EXPECT_EQ(EdgeType::userLoadAfter,
e.GetCycle()[1].GetTypeOfEdgeToNextVertex());
EXPECT_EQ("b", e.GetCycle()[2].GetName());
EXPECT_EQ(EdgeType::MasterlistLoadAfter,
EXPECT_EQ(EdgeType::masterlistLoadAfter,
e.GetCycle()[2].GetTypeOfEdgeToNextVertex());
} else if (e.GetCycle()[0].GetName() == "b") {
EXPECT_EQ(EdgeType::MasterlistLoadAfter,
EXPECT_EQ(EdgeType::masterlistLoadAfter,
e.GetCycle()[0].GetTypeOfEdgeToNextVertex());
EXPECT_EQ("a", e.GetCycle()[1].GetName());
EXPECT_EQ(EdgeType::MasterlistLoadAfter,
EXPECT_EQ(EdgeType::masterlistLoadAfter,
e.GetCycle()[1].GetTypeOfEdgeToNextVertex());
EXPECT_EQ("c", e.GetCycle()[2].GetName());
EXPECT_EQ(EdgeType::UserLoadAfter,
EXPECT_EQ(EdgeType::userLoadAfter,
e.GetCycle()[2].GetTypeOfEdgeToNextVertex());
} else {
EXPECT_EQ("c", e.GetCycle()[0].GetName());
EXPECT_EQ(EdgeType::UserLoadAfter,
EXPECT_EQ(EdgeType::userLoadAfter,
e.GetCycle()[0].GetTypeOfEdgeToNextVertex());
EXPECT_EQ("b", e.GetCycle()[1].GetName());
EXPECT_EQ(EdgeType::MasterlistLoadAfter,
EXPECT_EQ(EdgeType::masterlistLoadAfter,
e.GetCycle()[1].GetTypeOfEdgeToNextVertex());
EXPECT_EQ("a", e.GetCycle()[2].GetName());
EXPECT_EQ(EdgeType::MasterlistLoadAfter,
EXPECT_EQ(EdgeType::masterlistLoadAfter,
e.GetCycle()[2].GetTypeOfEdgeToNextVertex());
}
}
src/tests/api/internals/sorting/plugin_sorter_test.h
+3 -3
View File
@@ -386,11 +386,11 @@ TEST_P(
ASSERT_EQ(3, e.GetCycle().size());
EXPECT_EQ("Blank - Different Master Dependent.esm",
e.GetCycle()[0].GetName());
EXPECT_EQ(EdgeType::Group, e.GetCycle()[0].GetTypeOfEdgeToNextVertex());
EXPECT_EQ(EdgeType::group, e.GetCycle()[0].GetTypeOfEdgeToNextVertex());
EXPECT_EQ("Blank.esm", e.GetCycle()[1].GetName());
EXPECT_EQ(EdgeType::Master, e.GetCycle()[1].GetTypeOfEdgeToNextVertex());
EXPECT_EQ(EdgeType::master, e.GetCycle()[1].GetTypeOfEdgeToNextVertex());
EXPECT_EQ("Blank - Master Dependent.esm", e.GetCycle()[2].GetName());
EXPECT_EQ(EdgeType::Group, e.GetCycle()[2].GetTypeOfEdgeToNextVertex());
EXPECT_EQ(EdgeType::group, e.GetCycle()[2].GetTypeOfEdgeToNextVertex());
}
}