Remove more redundant program code from FString
This commit is contained in:
parent
9662c09618
commit
19239df5d1
BIN
.travis.yml.swp
BIN
.travis.yml.swp
Binary file not shown.
|
@ -265,52 +265,6 @@ const FString FString::operator + (const FString& s)
|
|||
return tmp;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
const FString FString::operator + (const std::wstring& s)
|
||||
{
|
||||
FString tmp(string);
|
||||
tmp._insert (length, uInt(s.length()), s.c_str());
|
||||
return tmp;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
const FString FString::operator + (const wchar_t s[])
|
||||
{
|
||||
FString tmp(string);
|
||||
tmp._insert (length, uInt(std::wcslen(s)), s);
|
||||
return tmp;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
const FString FString::operator + (const std::string& s)
|
||||
{
|
||||
FString tmp(string);
|
||||
|
||||
if ( ! s.empty() )
|
||||
{
|
||||
wchar_t* wc_string = c_to_wc_str(s.c_str());
|
||||
tmp._insert (length, uInt(std::wcslen(wc_string)), wc_string);
|
||||
delete[] wc_string;
|
||||
}
|
||||
|
||||
return tmp;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
const FString FString::operator + (const char s[])
|
||||
{
|
||||
FString tmp(string);
|
||||
|
||||
if ( s )
|
||||
{
|
||||
wchar_t* wc_string = c_to_wc_str(s);
|
||||
tmp._insert (length, uInt(std::wcslen(wc_string)), wc_string);
|
||||
delete[] wc_string;
|
||||
}
|
||||
|
||||
return tmp;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
const FString FString::operator + (const wchar_t c)
|
||||
{
|
||||
|
|
|
@ -102,10 +102,6 @@ class FString
|
|||
const FString& operator += (const FString&);
|
||||
|
||||
const FString operator + (const FString&);
|
||||
const FString operator + (const std::wstring&);
|
||||
const FString operator + (const wchar_t[]);
|
||||
const FString operator + (const std::string&);
|
||||
const FString operator + (const char[]);
|
||||
const FString operator + (const wchar_t);
|
||||
const FString operator + (const char);
|
||||
|
||||
|
|
Loading…
Reference in New Issue