WebSVN – spk – Diff – //libspk/src/Utils/String.cpp

 	std::stringstream strm;
 	strm << std::setw(iAmount) << std::setfill(cWith) << *this;
 	*this = strm.str();
 	return (*this);
+}
 /////////////////////////////////////////////////////////////////
 // Conversion functions
 void String::fromLong(long l)
+{
 	std::stringstream strstream;
 	strstream << l;
 	*this = strstream.str();
+}
-void String::fromFloat(float f, int dp)
+const String &String::fromFloat(float f, int dp)
+{
 	std::stringstream strstream;
 	if ( dp != -1 ) {
 		strstream.precision(dp);
 		strstream << std::fixed << f;
+	}
 	else
 		strstream << f;
 	*this = strstream.str();
+	return (*this);
+}
 void String::fromDouble(double f)
 {
 	std::stringstream strstream;
 	strstream << f;
 	*this = strstream.str();
+}
 const String &String::format(const char *sFormat, ...)
 {
 	char buffer[1024];
 	va_list args;
 	va_start (args, sFormat);
 	vsprintf (buffer, sFormat, args);
 	va_end (args);
 	this->assign(buffer);
 	return (*this);
 }
 const String &String::arg(const String &s1)
+{
 	(*this) = this->findReplace("%1", s1);
 	return (*this);
 }
 const String &String::arg(const String &s1, const String &s2)
+{
 	(*this) = this->arg(s1).findReplace("%2", s2);
 	return (*this);
+}
 const String &String::arg(const String &s1, const String &s2, const String &s3)
 {
 	(*this) = this->arg(s1, s1).findReplace("%3", s3);
 	return (*this);
+}
 const String &String::arg(const String &s1, const String &s2, const String &s3, const String &s4)
+{
 	(*this) = this->arg(s1, s2, s3).findReplace("%4", s4);
 	return (*this);
+}
 const String &String::arg(const String &s1, const String &s2, const String &s3, const String &s4, const String &s5)
+{
 	(*this) = this->arg(s1, s2, s3, s4).findReplace("%5", s5);
 	return (*this);
+{
 	return this->tokens(token, tok, tok);
+}
 String String::tokens(const char *token, int from, int to) const
 {
 	if ( this->empty() ) return "";
 	int max = this->countToken(token);
 	Utils::String newstr;
 	int whichtok = 1;
 	Utils::String::size_type lastPos = 0;
 	Utils::String::size_type pos     = _token_nextPos(token, 0);
 	if ( from < 0 )
 		from = max + (from + 1);
 	if ( to < 0 )
+}
 String String::words(int from, int to) const
+{
 	return this->tokens(" ", from, to);
+}
+String String::addToken(const char *token, const Utils::String &str) const
+{
+	if (this->empty())
+		return str;
+	Utils::String s = (*this);
+	s += token;
+	s += str;
+	return s;
+}
 int String::countToken(const char *token) const
+{
 	if ( this->empty() )
 		return 0;
 	Utils::String::size_type pos = replace.find(find, 0 );
 	while ( pos != Utils::String::npos ) {
 		replace.erase ( pos, find.length() );
 		pos = replace.find(find, pos);
 	}
 	return replace;
+}
 String String::removeIf(int iChar, char c) const
+	}
 	// now remove all the starting new lines
 	while ( newStr[0] == '\n' || newStr[0] == '\t' ) newStr.erase(0, 1);
 	return newStr;
 }
-bool String::isin(const String &str, bool bCaseSensative) const
+bool String::contains(const String &str, bool bCaseSensative) const
 {
-	if ( bCaseSensative ) return (this->find(str, 0) == Utils::String::npos) ? false : true;
+	if (bCaseSensative) return (this->find(str, 0) == Utils::String::npos) ? false : true;
 	String thisLower = this->lower();
 	String strLower = str.lower();
 	return (thisLower.find(strLower, 0) == Utils::String::npos) ? false : true;
+}
+bool String::isin(const String &str, bool bCaseSensative) const
+{
+	return contains(str, bCaseSensative);
+}
 int String::findPos(const String &find, int iStartPos) const
+{
 	Utils::String::size_type pos = this->find(find, iStartPos);
 	if ( pos == Utils::String::npos ) return -1;
 	return pos;
+}
 bool String::isin(char c, bool bCaseSensative) const
+{
+	return contains(c, bCaseSensative);
+}
+bool String::contains(char c, bool bCaseSensative) const
+{
 	bool f = false;
 	for ( unsigned int i = 0; i < this->length(); i++ )
+	{
 		bool bCheck = (bCaseSensative) ? (this->at(i) == c) : (tolower(this->at(i)) == tolower(c));

Subversion Repositories spk

(root)//libspk/src/Utils/String.cpp – Rev 121 → 126