Merge pull request #48 from neogeek/hotfix/name-collision

[hotfix] Renamed TypeCodes to avoid name collisions with structs.

Author: neogeek

includes/RhythmGameUtilities/Enums/TypeCode.h

@@ -9,30 +9,30 @@ typedef enum TypeCode
 {
 
     /// BPM Marker
-    BPM,
+    BPM_Marker,
 
     /// Time Signature Marker
-    TimeSignature,
+    TimeSignatureMarker,
 
     /// Note Marker
-    Note,
+    NoteMarker,
 
     /// Event Marker
-    Event
+    EventMarker
 
 } TypeCodeType;
 
 std::string ToString(TypeCode typeCode)
 {
     switch (typeCode)
     {
-    case BPM:
+    case BPM_Marker:
         return "B";
-    case TimeSignature:
+    case TimeSignatureMarker:
         return "TS";
-    case Note:
+    case NoteMarker:
         return "N";
-    case Event:
+    case EventMarker:
         return "E";
     }
 }

tests/RhythmGameUtilities/Enum.cpp

@@ -28,10 +28,10 @@ void testNamedSection()
 
 void testTypeCode()
 {
-    assert(ToString(TypeCode::BPM) == "B");
-    assert(ToString(TypeCode::TimeSignature) == "TS");
-    assert(ToString(TypeCode::Note) == "N");
-    assert(ToString(TypeCode::Event) == "E");
+    assert(ToString(TypeCode::BPM_Marker) == "B");
+    assert(ToString(TypeCode::TimeSignatureMarker) == "TS");
+    assert(ToString(TypeCode::NoteMarker) == "N");
+    assert(ToString(TypeCode::EventMarker) == "E");
 
     std::cout << ".";
 }