Renamed methods.

Author: neogeek

includes/RhythmGameUtilities/Parsers.hpp

@@ -100,7 +100,7 @@ std::vector<ChartSection> ParseSectionsFromChart(const char *contents)
 }
 
 std::map<int, int>
-ParseTimeSignaturesFromChartSection(std::vector<ChartSection> sections)
+ParseTimeSignaturesFromChartSections(std::vector<ChartSection> sections)
 {
     auto timeSignatures = std::map<int, int>();
 
@@ -123,7 +123,7 @@ ParseTimeSignaturesFromChartSection(std::vector<ChartSection> sections)
     return timeSignatures;
 }
 
-std::map<int, int> ParseBpmFromChartSection(std::vector<ChartSection> sections)
+std::map<int, int> ParseBpmFromChartSections(std::vector<ChartSection> sections)
 {
     auto bpm = std::map<int, int>();
 
@@ -145,8 +145,9 @@ std::map<int, int> ParseBpmFromChartSection(std::vector<ChartSection> sections)
     return bpm;
 }
 
-std::vector<Note> ParseNotesFromChartSection(std::vector<ChartSection> sections,
-                                             Difficulty difficulty)
+std::vector<Note>
+ParseNotesFromChartSections(std::vector<ChartSection> sections,
+                            Difficulty difficulty)
 {
     auto notes = std::vector<Note>();
 
@@ -170,7 +171,7 @@ std::vector<Note> ParseNotesFromChartSection(std::vector<ChartSection> sections,
 }
 
 std::map<int, std::string>
-ParseLyricsFromChartSection(std::vector<ChartSection> sections)
+ParseLyricsFromChartSections(std::vector<ChartSection> sections)
 {
     auto lyrics = std::map<int, std::string>();
 

tests/RhythmGameUtilities/Parsers.cpp

@@ -104,44 +104,44 @@ void testParseValuesFromChartSections()
     std::cout << ".";
 }
 
-void testParseTimeSignaturesFromChartSection()
+void testParseTimeSignaturesFromChartSections()
 {
     auto sections = ParseSectionsFromChart(contents);
 
-    auto lines = ParseTimeSignaturesFromChartSection(sections);
+    auto lines = ParseTimeSignaturesFromChartSections(sections);
 
     assert(lines.size() == 4);
 
     std::cout << ".";
 }
 
-void testParseBpmFromChartSection()
+void testParseBpmFromChartSections()
 {
     auto sections = ParseSectionsFromChart(contents);
 
-    auto lines = ParseBpmFromChartSection(sections);
+    auto lines = ParseBpmFromChartSections(sections);
 
     assert(lines.size() == 7);
 
     std::cout << ".";
 }
 
-void testParseNotesFromChartSection()
+void testParseNotesFromChartSections()
 {
     auto sections = ParseSectionsFromChart(contents);
 
-    auto lines = ParseNotesFromChartSection(sections, Difficulty::Expert);
+    auto lines = ParseNotesFromChartSections(sections, Difficulty::Expert);
 
     assert(lines.size() == 8);
 
     std::cout << ".";
 }
 
-void testParseLyricsFromChartSection()
+void testParseLyricsFromChartSections()
 {
     auto sections = ParseSectionsFromChart(contents);
 
-    auto lines = ParseLyricsFromChartSection(sections);
+    auto lines = ParseLyricsFromChartSections(sections);
 
     assert(lines.size() == 12);
 
@@ -153,10 +153,10 @@ int main()
     testParseSectionsFromChart();
     testParseValuesFromChartSections();
 
-    testParseTimeSignaturesFromChartSection();
-    testParseBpmFromChartSection();
-    testParseNotesFromChartSection();
-    testParseLyricsFromChartSection();
+    testParseTimeSignaturesFromChartSections();
+    testParseBpmFromChartSections();
+    testParseNotesFromChartSections();
+    testParseLyricsFromChartSections();
 
     return 0;
 }