From 478de001c6b5012d56523441dee7133f03606e07 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 9 Feb 2006 00:08:10 +0000
Subject: [PATCH] move URLEncode into RageUtil

---
 stepmania/src/RageUtil.cpp       | 14 ++++++++++++++
 stepmania/src/RageUtil.h         |  1 +
 stepmania/src/ScreenPackages.cpp | 14 --------------
 stepmania/src/ScreenPackages.h   |  1 -
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp
index c553a48821..3996bf1737 100644
--- a/stepmania/src/RageUtil.cpp
+++ b/stepmania/src/RageUtil.cpp
@@ -934,6 +934,20 @@ bool EndsWith( const RString &sTestThis, const RString &sEnding )
 	return sTestThis.compare( sTestThis.length()-sEnding.length(), sEnding.length(), sEnding ) == 0;
 }
 
+RString URLEncode( const RString &sStr )
+{
+	RString sOutput;
+	for( unsigned k = 0; k < sStr.size(); k++ )
+	{
+		char t = sStr[k];
+		if( t >= '!' && t <= 'z' )
+			sOutput += t;
+		else
+			sOutput += "%" + ssprintf( "%X", t );
+	}
+	return sOutput;
+}
+
 void StripCvs( vector<RString> &vs )
 {
 	for( unsigned i=0; i<vs.size(); i++ )
diff --git a/stepmania/src/RageUtil.h b/stepmania/src/RageUtil.h
index 4439edabbe..e9b1e2e4e7 100644
--- a/stepmania/src/RageUtil.h
+++ b/stepmania/src/RageUtil.h
@@ -346,6 +346,7 @@ void TrimRight( RString &sStr, const char *szTrim = "\r\n\t " );
 void StripCrnl( RString &sStr );
 bool BeginsWith( const RString &sTestThis, const RString &sBeginning );
 bool EndsWith( const RString &sTestThis, const RString &sEnding );
+RString URLEncode( const RString &sStr );
 
 void StripCvs( vector<RString> &vs );	// remove all items that end in "cvs"
 
diff --git a/stepmania/src/ScreenPackages.cpp b/stepmania/src/ScreenPackages.cpp
index fa811162e2..8f2157b37a 100644
--- a/stepmania/src/ScreenPackages.cpp
+++ b/stepmania/src/ScreenPackages.cpp
@@ -385,20 +385,6 @@ void ScreenPackages::HTMLParse()
 	UpdateLinksList();
 }
 
-RString ScreenPackages::URLEncode( const RString &sInput )
-{
-	RString sOutput;
-	for( unsigned k = 0; k < sInput.size(); k++ )
-	{
-		char t = sInput[k];
-		if( t >= '!' && t <= 'z' )
-			sOutput += t;
-		else
-			sOutput += "%" + ssprintf( "%X", t );
-	}
-	return sOutput;
-}
-
 RString ScreenPackages::StripOutContainers( const RString & In )
 {
 	if( In.size() == 0 )
diff --git a/stepmania/src/ScreenPackages.h b/stepmania/src/ScreenPackages.h
index fae5301718..772edce918 100644
--- a/stepmania/src/ScreenPackages.h
+++ b/stepmania/src/ScreenPackages.h
@@ -33,7 +33,6 @@ private:
 
 	void HTMLParse();
 
-	RString URLEncode( const RString &URL );			//Encode any string in URL-style
 	RString StripOutContainers( const RString & In );	//Strip off "'s and ''s
 
 	Sprite	m_sprExistingBG;