Skip to content

Commit 9ef5a15

Browse files
neogeekneogeek
committed
Changed return type syntax.
1 parent 4205faf commit 9ef5a15

File tree

10 files changed

+62
-54
lines changed

10 files changed

+62
-54
lines changed

‎include/RhythmGameUtilities/Audio.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ extern "C"
2424
* @public
2525
*/
2626

27-
PACKAGE_API int **ConvertSamplesToWaveform(const float *samples, int size,
28-
int width, int height)
27+
PACKAGE_API auto ConvertSamplesToWaveform(const float *samples, int size,
28+
int width, int height) -> int **
2929
{
3030
auto *waveform = new int *[width];
3131

‎include/RhythmGameUtilities/Common.hpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ extern "C"
2424
* @public
2525
*/
2626

27-
PACKAGE_API float Lerp(float a, float b, float t)
27+
PACKAGE_API auto Lerp(float a, float b, float t) -> float
2828
{
2929
return ((1 - t) * a) + (b * t);
3030
}
@@ -38,7 +38,7 @@ extern "C"
3838
* @public
3939
*/
4040

41-
PACKAGE_API float InverseLerp(float a, float b, float v)
41+
PACKAGE_API auto InverseLerp(float a, float b, float v) -> float
4242
{
4343
return std::clamp((v - a) / (b - a), 0.0F, 1.0F);
4444
}
@@ -51,7 +51,7 @@ extern "C"
5151
* @private
5252
*/
5353

54-
inline std::string Trim(const char *contents)
54+
inline auto Trim(const char *contents) -> std::string
5555
{
5656
return std::regex_replace(contents, std::regex("^\\s+|\\s+$"), "");
5757
}
@@ -64,8 +64,8 @@ inline std::string Trim(const char *contents)
6464
* @private
6565
*/
6666

67-
inline std::vector<std::string> Split(const char *contents,
68-
const char delimiter)
67+
inline auto Split(const char *contents, const char delimiter)
68+
-> std::vector<std::string>
6969
{
7070
auto parts = std::vector<std::string>();
7171

@@ -81,8 +81,8 @@ inline std::vector<std::string> Split(const char *contents,
8181
return parts;
8282
}
8383

84-
inline std::vector<std::string> FindAllMatches(const char *contents,
85-
const std::regex &pattern)
84+
inline auto FindAllMatches(const char *contents, const std::regex &pattern)
85+
-> std::vector<std::string>
8686
{
8787
auto currentMatch =
8888
std::cregex_iterator(contents, contents + strlen(contents), pattern);
@@ -102,8 +102,8 @@ inline std::vector<std::string> FindAllMatches(const char *contents,
102102
return matches;
103103
}
104104

105-
inline std::vector<std::string> FindMatchGroups(const char *contents,
106-
const std::regex &pattern)
105+
inline auto FindMatchGroups(const char *contents, const std::regex &pattern)
106+
-> std::vector<std::string>
107107
{
108108
auto currentMatch =
109109
std::cregex_iterator(contents, contents + strlen(contents), pattern);

‎include/RhythmGameUtilities/Enums/Difficulty.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ typedef enum Difficulty
2020
Expert
2121
} DifficultyType;
2222

23-
inline std::string ToString(Difficulty difficulty)
23+
inline auto ToString(Difficulty difficulty) -> std::string
2424
{
2525
switch (difficulty)
2626
{

‎include/RhythmGameUtilities/Enums/NamedSection.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ typedef enum NamedSection
1717
Events
1818
} NamedSectionType;
1919

20-
inline std::string ToString(NamedSection namedSection)
20+
inline auto ToString(NamedSection namedSection) -> std::string
2121
{
2222
switch (namedSection)
2323
{

‎include/RhythmGameUtilities/Enums/TypeCode.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ typedef enum TypeCode
2020
EventMarker
2121
} TypeCodeType;
2222

23-
inline std::string ToString(TypeCode typeCode)
23+
inline auto ToString(TypeCode typeCode) -> std::string
2424
{
2525
switch (typeCode)
2626
{

‎include/RhythmGameUtilities/File.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace RhythmGameUtilities
1616
* @public
1717
*/
1818

19-
inline std::vector<uint8_t> ReadBytesFromFile(const char *path)
19+
inline auto ReadBytesFromFile(const char *path) -> std::vector<uint8_t>
2020
{
2121
std::ifstream file(path, std::ios::binary | std::ios::ate);
2222

@@ -43,7 +43,7 @@ inline std::vector<uint8_t> ReadBytesFromFile(const char *path)
4343
* @public
4444
*/
4545

46-
inline std::string ReadStringFromFile(const char *path)
46+
inline auto ReadStringFromFile(const char *path) -> std::string
4747
{
4848
std::ifstream file(path);
4949

‎include/RhythmGameUtilities/Parsers.hpp‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ std::regex CHART_SECTION_LINE_PATTERN(R"(([^=]+)\s*=([^\r\n]+))");
3737

3838
std::regex JSON_VALUE_PATTERN(R"(("[^"]+"|\S+))");
3939

40-
inline std::map<std::string,
40+
inline auto ParseSectionsFromChart(const char *contents)
41+
-> std::map<std::string,
4142
std::vector<std::pair<std::string, std::vector<std::string>>>>
42-
ParseSectionsFromChart(const char *contents)
4343
{
4444
auto matches = FindAllMatches(contents, CHART_SECTION_PATTERN);
4545

@@ -85,8 +85,9 @@ ParseSectionsFromChart(const char *contents)
8585
return sections;
8686
}
8787

88-
inline std::map<std::string, std::string> ParseMetaDataFromChartSection(
88+
inline auto ParseMetaDataFromChartSection(
8989
std::vector<std::pair<std::string, std::vector<std::string>>> section)
90+
-> std::map<std::string, std::string>
9091
{
9192
auto data = std::map<std::string, std::string>();
9293

@@ -98,8 +99,9 @@ inline std::map<std::string, std::string> ParseMetaDataFromChartSection(
9899
return data;
99100
}
100101

101-
inline std::vector<TimeSignature> ParseTimeSignatureChangesFromChartSection(
102+
inline auto ParseTimeSignatureChangesFromChartSection(
102103
std::vector<std::pair<std::string, std::vector<std::string>>> section)
104+
-> std::vector<TimeSignature>
103105
{
104106
auto timeSignaturesChanges = std::vector<TimeSignature>();
105107

@@ -119,8 +121,9 @@ inline std::vector<TimeSignature> ParseTimeSignatureChangesFromChartSection(
119121
return timeSignaturesChanges;
120122
}
121123

122-
inline std::vector<Tempo> ParseTempoChangesFromChartSection(
124+
inline auto ParseTempoChangesFromChartSection(
123125
std::vector<std::pair<std::string, std::vector<std::string>>> section)
126+
-> std::vector<Tempo>
124127
{
125128
auto tempoChanges = std::vector<Tempo>();
126129

@@ -138,8 +141,9 @@ inline std::vector<Tempo> ParseTempoChangesFromChartSection(
138141
return tempoChanges;
139142
}
140143

141-
inline std::vector<Note> ParseNotesFromChartSection(
144+
inline auto ParseNotesFromChartSection(
142145
std::vector<std::pair<std::string, std::vector<std::string>>> section)
146+
-> std::vector<Note>
143147
{
144148
auto notes = std::vector<Note>();
145149

@@ -156,8 +160,9 @@ inline std::vector<Note> ParseNotesFromChartSection(
156160
return notes;
157161
}
158162

159-
inline std::map<int, std::string> ParseLyricsFromChartSection(
163+
inline auto ParseLyricsFromChartSection(
160164
std::vector<std::pair<std::string, std::vector<std::string>>> section)
165+
-> std::map<int, std::string>
161166
{
162167
auto lyrics = std::map<int, std::string>();
163168

‎include/RhythmGameUtilities/ParsersInternal.hpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ namespace RhythmGameUtilities
1515

1616
extern "C"
1717
{
18-
PACKAGE_API ChartSectionInternal *
19-
ParseSectionsFromChartInternal(const char *contents, int *outSize)
18+
PACKAGE_API auto ParseSectionsFromChartInternal(const char *contents,
19+
int *outSize)
20+
-> ChartSectionInternal *
2021
{
2122
auto internalSections = ParseSectionsFromChart(contents);
2223

‎include/RhythmGameUtilities/Utilities.hpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ const float SECONDS_PER_MINUTE = 60.0F;
2828
* @public
2929
*/
3030

31-
inline int
31+
inline auto
3232
ConvertSecondsToTicks(float seconds, int resolution,
3333
std::vector<Tempo> tempoChanges,
34-
std::vector<TimeSignature> timeSignatureChanges)
34+
std::vector<TimeSignature> timeSignatureChanges) -> int
3535
{
3636
auto tempoChangesIterator = tempoChanges.begin();
3737
auto timeSignatureIterator = timeSignatureChanges.begin();
@@ -94,8 +94,8 @@ ConvertSecondsToTicks(float seconds, int resolution,
9494
* @public
9595
*/
9696

97-
inline std::vector<std::tuple<int, int>>
98-
GenerateAdjacentKeyPairs(const std::map<int, int> &keyValuePairs)
97+
inline auto GenerateAdjacentKeyPairs(const std::map<int, int> &keyValuePairs)
98+
-> std::vector<std::tuple<int, int>>
9999
{
100100
auto adjacentKeyPairs = std::vector<std::tuple<int, int>>();
101101

@@ -116,9 +116,9 @@ GenerateAdjacentKeyPairs(const std::map<int, int> &keyValuePairs)
116116
return adjacentKeyPairs;
117117
}
118118

119-
inline std::vector<BeatBar>
120-
CalculateBeatBars(const std::vector<Tempo> &tempoChanges, int resolution,
121-
int ts, bool includeHalfNotes)
119+
inline auto CalculateBeatBars(const std::vector<Tempo> &tempoChanges,
120+
int resolution, int ts, bool includeHalfNotes)
121+
-> std::vector<BeatBar>
122122
{
123123
std::vector<BeatBar> beatBars;
124124

@@ -153,8 +153,8 @@ CalculateBeatBars(const std::vector<Tempo> &tempoChanges, int resolution,
153153
return beatBars;
154154
}
155155

156-
inline std::optional<Note> FindPositionNearGivenTick(std::vector<Note> notes,
157-
int tick, int delta = 50)
156+
inline auto FindPositionNearGivenTick(std::vector<Note> notes, int tick,
157+
int delta = 50) -> std::optional<Note>
158158
{
159159
auto left = 0;
160160
auto right = static_cast<int>(notes.size()) - 1;
@@ -190,7 +190,7 @@ inline std::optional<Note> FindPositionNearGivenTick(std::vector<Note> notes,
190190
* @public
191191
*/
192192

193-
inline float ConvertTickToPosition(int tick, int resolution)
193+
inline auto ConvertTickToPosition(int tick, int resolution) -> float
194194
{
195195
return tick / static_cast<float>(resolution);
196196
}
@@ -204,7 +204,7 @@ inline float ConvertTickToPosition(int tick, int resolution)
204204
* @public
205205
*/
206206

207-
inline bool IsOnTheBeat(int bpm, float currentTime, float delta = 0.05F)
207+
inline auto IsOnTheBeat(int bpm, float currentTime, float delta = 0.05F) -> bool
208208
{
209209
auto beatInterval = SECONDS_PER_MINUTE / static_cast<float>(bpm);
210210

@@ -225,7 +225,7 @@ inline bool IsOnTheBeat(int bpm, float currentTime, float delta = 0.05F)
225225
* @public
226226
*/
227227

228-
inline int RoundUpToTheNearestMultiplier(int value, int multiplier)
228+
inline auto RoundUpToTheNearestMultiplier(int value, int multiplier) -> int
229229
{
230230
return static_cast<int>(std::ceil(static_cast<float>(value) / multiplier) *
231231
multiplier);
@@ -241,8 +241,8 @@ inline int RoundUpToTheNearestMultiplier(int value, int multiplier)
241241
* @public
242242
*/
243243

244-
inline float CalculateAccuracyRatio(int position, int currentPosition,
245-
int delta = 50)
244+
inline auto CalculateAccuracyRatio(int position, int currentPosition,
245+
int delta = 50) -> float
246246
{
247247
auto diff = position - currentPosition;
248248

‎include/RhythmGameUtilities/UtilitiesInternal.hpp‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ namespace RhythmGameUtilities
1313

1414
extern "C"
1515
{
16-
PACKAGE_API int
16+
PACKAGE_API auto
1717
ConvertSecondsToTicksInternal(float seconds, int resolution,
1818
Tempo *tempoChanges, int tempoChangesSize,
1919
TimeSignature *timeSignaturesChanges,
20-
int timeSignaturesChangesSize)
20+
int timeSignaturesChangesSize) -> int
2121
{
2222
std::vector<Tempo> tempoChangesVector;
2323

@@ -37,11 +37,11 @@ extern "C"
3737
timeSignatureChangesVector);
3838
}
3939

40-
PACKAGE_API BeatBar *CalculateBeatBarsInternal(Tempo *tempoChanges,
41-
int tempoChangesSize,
42-
int resolution, int ts,
43-
bool includeHalfNotes,
44-
int *outSize)
40+
PACKAGE_API auto CalculateBeatBarsInternal(Tempo *tempoChanges,
41+
int tempoChangesSize,
42+
int resolution, int ts,
43+
bool includeHalfNotes,
44+
int *outSize) -> BeatBar *
4545
{
4646
std::vector<Tempo> tempoChangesVector;
4747

@@ -66,26 +66,28 @@ extern "C"
6666
return beatBars;
6767
}
6868

69-
PACKAGE_API float ConvertTickToPositionInternal(int tick, int resolution)
69+
PACKAGE_API auto ConvertTickToPositionInternal(int tick, int resolution)
70+
-> float
7071
{
7172
return ConvertTickToPosition(tick, resolution);
7273
}
7374

74-
PACKAGE_API bool IsOnTheBeatInternal(int bpm, float currentTime,
75-
float delta = 0.05F)
75+
PACKAGE_API auto IsOnTheBeatInternal(int bpm, float currentTime,
76+
float delta = 0.05F) -> bool
7677
{
7778
return IsOnTheBeat(bpm, currentTime, delta);
7879
}
7980

80-
PACKAGE_API int RoundUpToTheNearestMultiplierInternal(int value,
81-
int multiplier)
81+
PACKAGE_API auto RoundUpToTheNearestMultiplierInternal(int value,
82+
int multiplier)
83+
-> int
8284
{
8385
return RoundUpToTheNearestMultiplier(value, multiplier);
8486
}
8587

86-
PACKAGE_API float CalculateAccuracyRatioInternal(int position,
87-
int currentPosition,
88-
int delta = 50)
88+
PACKAGE_API auto CalculateAccuracyRatioInternal(int position,
89+
int currentPosition,
90+
int delta = 50) -> float
8991
{
9092
return CalculateAccuracyRatio(position, currentPosition, delta);
9193
}

0 commit comments

Comments
 (0)