String removal - fix weird char to str cast

Correctly calculate frame counts when reading WAV files

fixes

fix

Revert "fix"

This reverts commit 96ac2e6.

Revert "fixes"

This reverts commit c431eb9.

Revert "Correctly calculate frame counts when reading WAV files"

This reverts commit 2af47ea.

Remove String and StringRef

this doesnt compile. effectively a replacement of:
String -> std::string
StringRef -> const std::string&

Fix compilation issues after removing String/StringRef

this includes some questionable includes of Core.h which seemed to be required to compile. this also includes some reimplementations of StringUtils functions and misc items

String removal crash fix 1

String removal broken format string fix

finish merge

String removal crash fix 2

i was getting cant reference iterator past end over and over here for no reason no matter what i did even if i checked for end and then ran into 25 other errors so lets just rewrite it

String removal warns reduction

this doesnt solve as many as i would like but it begins to reach outside the scope as more get fixed. it would be more ideal to actually just change the argument types instead of doing all this casting

String removal - for shader logging, clear and resize a string

String removal - Str::create replaced by constructor

template <class InputIterator>  std::string  (InputIterator first, InputIterator last);

String removal - remove Str::assign

String removal crash fix 3

typo

String removal - replace stricmp

Author: poco0317

build/VisualStudio/ArrowVortex.vcxproj

@@ -330,7 +330,6 @@
     <ClCompile Include="..\..\src\Core\Renderer.cpp" />
     <ClCompile Include="..\..\src\Core\Shader.cpp" />
     <ClCompile Include="..\..\src\Core\Slot.cpp" />
-    <ClCompile Include="..\..\src\Core\String.cpp" />
     <ClCompile Include="..\..\src\Core\StringUtils.cpp" />
     <ClCompile Include="..\..\src\Core\Text.cpp" />
     <ClCompile Include="..\..\src\Core\TextDraw.cpp" />
@@ -440,7 +439,6 @@
     <ClInclude Include="..\..\src\Core\Renderer.h" />
     <ClInclude Include="..\..\src\Core\Shader.h" />
     <ClInclude Include="..\..\src\Core\Slot.h" />
-    <ClInclude Include="..\..\src\Core\String.h" />
     <ClInclude Include="..\..\src\Core\StringUtils.h" />
     <ClInclude Include="..\..\src\Core\Text.h" />
     <ClInclude Include="..\..\src\Core\TextDraw.h" />

build/VisualStudio/ArrowVortex.vcxproj.filters

@@ -48,9 +48,6 @@
     <ClCompile Include="..\..\src\Core\Input.cpp">
       <Filter>Core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\Core\String.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\Core\StringUtils.cpp">
       <Filter>Core</Filter>
     </ClCompile>
@@ -368,9 +365,6 @@
     <ClInclude Include="..\..\src\Core\Reference.h">
       <Filter>Core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\Core\String.h">
-      <Filter>Core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\Core\StringUtils.h">
       <Filter>Core</Filter>
     </ClInclude>

src/Core/ByteStream.cpp

@@ -1,5 +1,4 @@
 #include <Core/ByteStream.h>
-#include <Core/String.h>
 #include <Core/Utils.h>
 
 #include <string.h>
@@ -159,10 +158,10 @@ void WriteStream::writeNum(uint32_t num)
 	}
 }
 
-void WriteStream::writeStr(StringRef str)
+void WriteStream::writeStr(const std::string& str)
 {
-	writeNum(str.len());
-	write(str.str(), str.len());
+	writeNum(str.length());
+	write(str.data(), str.length());
 }
 
 // ================================================================================================
@@ -312,28 +311,27 @@ uint32_t ReadStream::readNum()
 	return out;
 }
 
-String ReadStream::readStr()
+std::string ReadStream::readStr()
 {
-	String out;
-	uint32_t len = readNum();
-	auto newPos = read_position_ + len;
+	std::string out;
+	uint len = readNum();
 	if(newPos <= end_position_)
 	{
 		auto str = read_position_;
 		read_position_ = newPos;
-		return String((const char*)str, len);
+		return std::string((const char*)str, len);
 	}
 	read_position_ = end_position_;
 	is_read_successful_ = false;
-	return String();
+	return std::string();
 }
 
 void ReadStream::readNum(uint32_t& num)
 {
 	num = readNum();
 }
 
-void ReadStream::readStr(String& str)
+void ReadStream::readStr(std::string& str)
 {
 	str = readStr();
 }

src/Core/ByteStream.h

@@ -19,8 +19,8 @@ struct WriteStream
 	void write32(const void* val);
 	void write64(const void* val);
 
-	void writeNum(uint32_t num);
-	void writeStr(StringRef str);
+	void writeNum(uint num);
+	void writeStr(const std::string& str);
 
 	template <unsigned int S>
 	inline void writeSz(const void* val)
@@ -89,10 +89,10 @@ struct ReadStream
 	void read64(void* out);
 
 	uint32_t readNum();
-	String readStr();
+	std::string readStr();
 
-	void readNum(uint32_t& num);
-	void readStr(String& str);
+	void readNum(uint& num);
+	void readStr(std::string& str);
 
 	template <size_t S>
 	inline void readSz(void* out)

src/Core/Core.h

@@ -2,6 +2,7 @@
 
 #include <cstdint>
 #include <chrono>
+#include <string>
 
 namespace Vortex {
 
@@ -21,7 +22,6 @@ typedef areat<float>  areaf;
 
 struct colorf { float r, g, b, a; };
 
-class String;
 struct TileBar;
 struct TileRect;
 struct TileRect2;
@@ -43,7 +43,6 @@ struct Noteskin;
 struct Simfile;
 struct TimingData;
 
-typedef const String& StringRef;
 typedef uint64_t TextureHandle;
 
 extern std::chrono::duration<double> deltaTime;

src/Core/FontData.h

@@ -70,7 +70,7 @@ struct FontData
 	GlyphCache* currentCache;
 	int currentSize;
 	void* ftface;
-	String path;
+	std::string path;
 	FontData* next;
 	int refs;
 	int loadflags;

src/Core/FontManager.cpp

@@ -17,8 +17,8 @@ namespace {
 
 struct FontManagerInstance
 {
-	typedef std::map<String, FontData*> FontMap;
-	typedef std::map<String, Glyph> GlyphMap;
+	typedef std::map<std::string, FontData*> FontMap;
+	typedef std::map<std::string, Glyph> GlyphMap;
 
 	FontMap fonts;
 	void* ftLib;
@@ -136,13 +136,13 @@ void FontManager::release(FontData* font)
 	}
 }
 
-FontData* FontManager::find(StringRef path)
+FontData* FontManager::find(const std::string& path)
 {
 	auto it = Map::findVal(FM->fonts, path);
 	return it ? *it : nullptr;
 }
 
-FontData* FontManager::load(StringRef path, Text::Hinting hinting)
+FontData* FontManager::load(const std::string& path, Text::Hinting hinting)
 {
 	// If fonts are created before goo is initialized, just return null.
 	if(!FM) return nullptr;
@@ -158,17 +158,17 @@ FontData* FontManager::load(StringRef path, Text::Hinting hinting)
 
 	// If not, try to load the font.
 	FT_Face face;
-	int result = FT_New_Face((FT_Library)(FM->ftLib), path.str(), 0, &face);
+	int result = FT_New_Face((FT_Library)(FM->ftLib), path.c_str(), 0, &face);
 	if(result == FT_Err_Ok)
 	{
-		FontData* font = new FontData(face, path.str(), hinting);
+		FontData* font = new FontData(face, path.c_str(), hinting);
 		FM->fonts[path] = font;
 		return font;
 	}
 	else 
 	{
 		Debug::blockBegin(Debug::ERROR, "could not load font file");
-		Debug::log("file: %s\n", path.str());
+		Debug::log("file: %s\n", path.c_str());
 		switch(result)
 		{
 		case FT_Err_Cannot_Open_Resource:
@@ -197,7 +197,7 @@ void FontManager::cache(FontData* font)
 	}
 }
 
-bool FontManager::loadGlyph(StringRef name, const Texture& texture, int dx, int dy, int advance)
+bool FontManager::loadGlyph(const std::string& name, const Texture& texture, int dx, int dy, int advance)
 {
 	auto tex = (Texture::Data*)texture.data();
 	if(tex)
@@ -221,7 +221,7 @@ bool FontManager::loadGlyph(StringRef name, const Texture& texture, int dx, int
 	return false;
 }
 
-Glyph* FontManager::getGlyph(StringRef name)
+Glyph* FontManager::getGlyph(const std::string& name)
 {
 	return Map::findVal(FM->specialGlyphs, name);
 }
@@ -232,10 +232,10 @@ void FontManager::log()
 	Debug::log("amount: %i\n", FM->fonts.size());
 	for(auto& font : FM->fonts)
 	{
-		String path = font.second->path;
+		auto& path = font.second->path;
 		if(path.empty()) path = "-- no path --";
 
-		Debug::log("\npath: %s\n", path.str());
+		Debug::log("\npath: %s\n", path.c_str());
 		Debug::log("refs: %i\n", font.second->refs);
 		Debug::log("cached: %i\n", font.second->cached);
 	}

src/Core/FontManager.h

@@ -9,12 +9,12 @@ struct FontManager {
 static void create();
 static void destroy();
 
-static FontData* load(StringRef path, Text::Hinting h);
-static FontData* find(StringRef path);
+static FontData* load(const std::string& path, Text::Hinting h);
+static FontData* find(const std::string& path);
 static void cache(FontData* font);
 
-static bool loadGlyph(StringRef name, const Texture& texture, int dx, int dy, int advance);
-static Glyph* getGlyph(StringRef name);
+static bool loadGlyph(const std::string& name, const Texture& texture, int dx, int dy, int advance);
+static Glyph* getGlyph(const std::string& name);
 static void release(FontData* font);
 
 static void log();

src/Core/Gui.cpp

@@ -29,10 +29,10 @@ struct GuiMainData
 
 	GuiMain::ClipboardSetFunction clipboardSet;
 	GuiMain::ClipboardGetFunction clipboardGet;
-	String clipboardText;
+	std::string clipboardText;
 
-	String tooltipPreviousText;
-	String tooltipText;
+	std::string tooltipPreviousText;
+	std::string tooltipText;
 	vec2i tooltipPos;
 	float tooltipTimer;
 
@@ -87,7 +87,7 @@ static void handleTooltip()
 {
 	if(GUI->tooltipPreviousText == GUI->tooltipText)
 	{
-		if(GUI->tooltipText.len() && GUI->tooltipTimer > 1.0f)
+		if(GUI->tooltipText.length() && GUI->tooltipTimer > 1.0f)
 		{
 			TextStyle style;
 
@@ -97,7 +97,7 @@ static void handleTooltip()
 			style.shadowColor = Colors::blank;
 			style.fontSize = 11;
 
-			Text::arrange(Text::TL, style, 256, GUI->tooltipText.str());
+			Text::arrange(Text::TL, style, 256, GUI->tooltipText.c_str());
 			vec2i textSize = Text::getSize();
 
 			vec2i& pos = GUI->tooltipPos;
@@ -126,7 +126,7 @@ static void handleTooltip()
 			Text::draw(textBox);
 		}
 	}
-	else if(GUI->tooltipText.len())
+	else if(GUI->tooltipText.length())
 	{
 		GUI->tooltipPos = {INT_MAX, INT_MAX};
 		GUI->tooltipTimer = 0.0f;
@@ -148,7 +148,7 @@ void GuiMain::frameStart(float dt, InputEvents& events)
 	GUI->cursorIcon = Cursor::ARROW;
 
 	GUI->tooltipPreviousText = GUI->tooltipText;
-	GUI->tooltipText = String();
+	GUI->tooltipText = std::string();
 	GUI->tooltipTimer += dt;
 
 	Renderer::startFrame();
@@ -185,13 +185,13 @@ void GuiMain::setClipboardFunctions(ClipboardGetFunction get, ClipboardSetFuncti
 	GUI->clipboardSet = set;
 }
 
-void GuiMain::setClipboardText(String text)
+void GuiMain::setClipboardText(std::string text)
 {
 	GUI->clipboardText = text;
 	if(GUI->clipboardSet) (*GUI->clipboardSet)(GUI->clipboardText);
 }
 
-String GuiMain::getClipboardText()
+std::string GuiMain::getClipboardText()
 {
 	if(GUI->clipboardGet) GUI->clipboardText = (*GUI->clipboardGet)();
 	return GUI->clipboardText;
@@ -207,12 +207,12 @@ Cursor::Icon GuiMain::getCursorIcon()
 	return GUI->cursorIcon;
 }
 
-void GuiMain::setTooltip(String text)
+void GuiMain::setTooltip(std::string text)
 {
 	GUI->tooltipText = text;
 }
 
-String GuiMain::getTooltip()
+std::string GuiMain::getTooltip()
 {
 	return GUI->tooltipText;
 }