Merge remote-tracking branch 'official/master'

This commit is contained in:
Michael Helmling 2012-01-04 19:49:50 +01:00
commit 7875d02a8f
2 changed files with 11 additions and 0 deletions

View File

@ -567,6 +567,11 @@ bool String::operator==(const String &s) const
return d == s.d || d->data == s.d->data;
}
bool String::operator!=(const String &s) const
{
return !operator==(s);
}
String &String::operator+=(const String &s)
{
detach();

View File

@ -357,6 +357,12 @@ namespace TagLib {
*/
bool operator==(const String &s) const;
/*!
* Compares each character of the String with each character of \a s and
* returns false if the strings match.
*/
bool operator!=(const String &s) const;
/*!
* Appends \a s to the end of the String.
*/