diff --git a/src/backend/helpers/helpers.cpp b/src/backend/helpers/helpers.cpp index ed2af9d6..a7845f75 100644 --- a/src/backend/helpers/helpers.cpp +++ b/src/backend/helpers/helpers.cpp @@ -64,16 +64,6 @@ namespace loot { // Helper functions ////////////////////////////////////////////////////////////////////////// - //Calculate modulo with dividend sign preserved, matching behaviour of C++11. - int modulo(int dividend, int divisor) { - divisor = abs(divisor); - if (dividend < 0) { - return -1 * (abs(dividend) % divisor); - } - else - return dividend % divisor; - } - //Calculate the CRC of the given file for comparison purposes. uint32_t GetCrc32(const fs::path& filename) { uint32_t chksum = 0; diff --git a/src/backend/helpers/helpers.h b/src/backend/helpers/helpers.h index e2ec49f7..6585b9ed 100644 --- a/src/backend/helpers/helpers.h +++ b/src/backend/helpers/helpers.h @@ -38,9 +38,6 @@ namespace loot { // Helper functions ////////////////////////////////////////////////////////////////////////// - //Calculate modulo with dividend sign preserved, matching behaviour of C++11. - int modulo(int dividend, int divisor); - //Calculate the CRC of the given file for comparison purposes. uint32_t GetCrc32(const boost::filesystem::path& filename); diff --git a/src/backend/plugin_sorter.cpp b/src/backend/plugin_sorter.cpp index 914c56de..19a0b520 100644 --- a/src/backend/plugin_sorter.cpp +++ b/src/backend/plugin_sorter.cpp @@ -340,8 +340,8 @@ namespace loot { vertex_t vertex, parentVertex; //Modulo operator is not consistently defined for negative numbers except in C++11, so use function. - int p1 = modulo(graph[*vit].Priority(), max_priority); - int p2 = modulo(graph[*vit2].Priority(), max_priority); + int p1 = graph[*vit].Priority() % max_priority; + int p2 = graph[*vit2].Priority() % max_priority; if (p1 < p2) { parentVertex = *vit; vertex = *vit2; diff --git a/src/gui/handler.cpp b/src/gui/handler.cpp index 55038fa4..0fbe8490 100644 --- a/src/gui/handler.cpp +++ b/src/gui/handler.cpp @@ -1021,7 +1021,7 @@ namespace loot { // Now add to pluginNode. YAML::Node pluginNode; pluginNode["name"] = tempPlugin.Name(); - pluginNode["modPriority"] = modulo(tempPlugin.Priority(), max_priority); + pluginNode["modPriority"] = tempPlugin.Priority() % max_priority; pluginNode["isGlobalPriority"] = (abs(tempPlugin.Priority()) >= max_priority); pluginNode["messages"] = tempPlugin.Messages(); pluginNode["tags"] = tempPlugin.Tags();