mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-04 01:28:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #315 from TsudaKageyu/string-redundant

Browse Source 
Removed some redundant code from String::operator==()
This commit is contained in:
Stephen F. Booth 2013-11-16 04:50:07 -08:00
commit 3cdbdfe0b9
1 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
taglib/toolkit/tstring.cpp
View File

@ -155,11 +155,6 @@ public:
{
}
StringPrivate(const std::wstring &s)
: data(new std::wstring(s))
{
}
StringPrivate(size_t n, wchar_t c)
: data(new std::wstring(n, c))
{
@ -651,54 +646,43 @@ String &String::operator=(const String &s)
String &String::operator=(const std::string &s)
{
d->data.reset(new std::wstring());
copyFromLatin1(s.c_str(), s.length());
*this = String(s);
return *this;
}
String &String::operator=(const std::wstring &s)
{
d->data.reset(new std::wstring(s));
*this = String(s);
return *this;
}
String &String::operator=(const wchar_t *s)
{
d->data.reset(new std::wstring());
copyFromUTF16(s, ::wcslen(s), WCharByteOrder);
*this = String(s);
return *this;
}
String &String::operator=(char c)
{
d->data.reset(new std::wstring(1, c));
*this = String(c);
return *this;
}
String &String::operator=(wchar_t c)
{
d->data.reset(new std::wstring(1, c));
*this = String(c);
return *this;
}
String &String::operator=(const char *s)
{
d->data.reset(new std::wstring());
copyFromLatin1(s, ::strlen(s));
*this = String(s);
return *this;
}
String &String::operator=(const ByteVector &v)
{
d->data.reset(new std::wstring());
copyFromLatin1(v.data(), v.size());
// If we hit a null in the ByteVector, shrink the string again.
d->data->resize(::wcslen(d->data->c_str()));
*this = String(v);
return *this;
}