kill more stuff

pedrosoutinho · Jun 29, 2020 · fd2b1ea · fd2b1ea
1 parent 2c716b2
commit fd2b1ea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/Etterna/Models/Misc/LyricsLoader.cpp b/src/Etterna/Models/Misc/LyricsLoader.cpp
@@ -1,4 +1,4 @@
-#include "Etterna/Globals/global.h"
+#include "Etterna/Globals/global.h"
 #include "LyricsLoader.h"
 #include "RageUtil/File/RageFile.h"
 #include "RageUtil/Misc/RageLog.h"
@@ -99,8 +99,11 @@ LyricsLoader::LoadFromLRCFile(const RString& sPath, Song& out)
 			seg.m_fStartTime = HHMMSSToSeconds(sValueName);
 			seg.m_sLyric = sValueData;
 
-			seg.m_sLyric.Replace(
-			  "|", "\n"); // Pipe symbols denote a new line in LRC files
+			RString bloo = seg.m_sLyric;
+
+			bloo.Replace("|",
+						 "\n"); // Pipe symbols denote a new line in LRC files
+			seg.m_sLyric = bloo;
 			out.AddLyricSegment(seg);
 		}
 	}

diff --git a/src/Etterna/Models/Songs/Song.cpp b/src/Etterna/Models/Songs/Song.cpp
@@ -1566,8 +1566,8 @@ Song::GetInstrumentTracksToVectorString() const
 	FOREACH_ENUM(InstrumentTrack, it)
 	{
 		if (this->HasInstrumentTrack(it)) {
-			ret.push_back(InstrumentTrackToString(it) + "=" +
-						  this->m_sInstrumentTrackFile[it]);
+			ret.push_back(std::string(InstrumentTrackToString(it) + "=" +
+									  this->m_sInstrumentTrackFile[it]));
 		}
 	}
 	return ret;

diff --git a/src/Etterna/Models/Songs/Song.h b/src/Etterna/Models/Songs/Song.h
@@ -52,10 +52,10 @@ enum InstrumentTrack
 	NUM_InstrumentTrack,
 	InstrumentTrack_Invalid
 };
-const std::string&
+const RString&
 InstrumentTrackToString(InstrumentTrack it);
 InstrumentTrack
-StringToInstrumentTrack(const std::string& s);
+StringToInstrumentTrack(const RString& s);
 
 /** @brief The collection of lyrics for the Song. */
 struct LyricSegment