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 #323 from TsudaKageyu/ifdefs

Browse Source 
Removed some unused #ifdefs
This commit is contained in:
Stephen F. Booth 2013-11-29 05:33:13 -08:00
commit 37b0ba6989
4 changed files with 1 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
taglib/toolkit/tbytevectorlist.cpp
View File

@ -68,30 +68,12 @@ ByteVectorList::ByteVectorList(const ByteVectorList &l) : List<ByteVector>(l)
{
}
#ifdef TAGLIB_USE_MOVE_SEMANTICS
ByteVectorList::ByteVectorList(ByteVectorList &&l) : List<ByteVector>(l)
{
}
#endif
ByteVectorList &ByteVectorList::operator=(const ByteVectorList &l)
{
List<ByteVector>::operator=(l);
return *this;
}
#ifdef TAGLIB_USE_MOVE_SEMANTICS
ByteVectorList &ByteVectorList::operator=(ByteVectorList &&l)
{
List<ByteVector>::operator=(l);
return *this;
}
#endif
ByteVector ByteVectorList::toByteVector(const ByteVector &separator) const
{
ByteVector v;

22
taglib/toolkit/tbytevectorlist.h
View File

@ -54,17 +54,6 @@ namespace TagLib {
*/
ByteVectorList(const ByteVectorList &l);
#ifdef TAGLIB_USE_MOVE_SEMANTICS
/*!
* Moves \a l into this ByteVectorList.
*
* \note Not available unless TAGLIB_USE_MOVE_SEMANTICS macro is defined.
*/
ByteVectorList(ByteVectorList &&l);
#endif
/*!
* Make a shallow, implicitly shared, copy of \a l. Because this is
* implicitly shared, this method is lightweight and suitable for
@ -72,17 +61,6 @@ namespace TagLib {
*/
ByteVectorList &operator=(const ByteVectorList &l);
#ifdef TAGLIB_USE_MOVE_SEMANTICS
/*!
* Moves \a l into this ByteVectorList.
*
* \note Not available unless TAGLIB_USE_MOVE_SEMANTICS macro is defined.
*/
ByteVectorList &operator=(ByteVectorList &&l);
#endif
/*!
* Convert the ByteVectorList to a ByteVector separated by \a separator. By
* default a space is used.

36
taglib/toolkit/tstringlist.cpp
View File

@ -38,7 +38,7 @@ StringList StringList::split(const String &s, const String &pattern)
size_t previousOffset = 0;
for(size_t offset = s.find(pattern);
offset != String::npos;
offset = s.find(pattern, offset + 1))
offset = s.find(pattern, offset + 1))
{
l.append(s.substr(previousOffset, offset - previousOffset));
previousOffset = offset + 1;
@ -61,14 +61,6 @@ StringList::StringList(const StringList &l) : List<String>(l)
{
}
#ifdef TAGLIB_USE_MOVE_SEMANTICS
StringList::StringList(StringList &&l) : List<String>(l)
{
}
#endif
StringList::StringList(const String &s) : List<String>()
{
append(s);
@ -111,38 +103,12 @@ StringList &StringList::append(const StringList &l)
return *this;
}
#ifdef TAGLIB_USE_MOVE_SEMANTICS
StringList &StringList::append(String &&s)
{
List<String>::append(s);
return *this;
}
StringList &StringList::append(StringList &&l)
{
List<String>::append(l);
return *this;
}
#endif
StringList &StringList::operator=(const StringList &l)
{
List<String>::operator=(l);
return *this;
}
#ifdef TAGLIB_USE_MOVE_SEMANTICS
StringList &StringList::operator=(StringList &&l)
{
List<String>::operator=(l);
return *this;
}
#endif
////////////////////////////////////////////////////////////////////////////////
// related functions
////////////////////////////////////////////////////////////////////////////////

42
taglib/toolkit/tstringlist.h
View File

@ -58,17 +58,6 @@ namespace TagLib {
*/
StringList(const StringList &l);
#ifdef TAGLIB_USE_MOVE_SEMANTICS
/*!
* Constructs a StringList equivalent to \a l.
*
* \note Not available unless TAGLIB_USE_MOVE_SEMANTICS macro is defined.
*/
StringList(StringList &&l);
#endif
/*!
* Constructs a StringList with \a s as a member.
*/
@ -99,26 +88,6 @@ namespace TagLib {
*/
StringList &append(const StringList &l);
#ifdef TAGLIB_USE_MOVE_SEMANTICS
/*!
* Appends \a s to the end of the list and returns a reference to the
* list.
*
* \note Not available unless TAGLIB_USE_MOVE_SEMANTICS macro is defined.
*/
StringList &append(String &&s);
/*!
* Appends all of the values in \a l to the end of the list and returns a
* reference to the list.
*
* \note Not available unless TAGLIB_USE_MOVE_SEMANTICS macro is defined.
*/
StringList &append(StringList &&l);
#endif
/*!
* Make a shallow, implicitly shared, copy of \a l. Because this is
* implicitly shared, this method is lightweight and suitable for
@ -126,17 +95,6 @@ namespace TagLib {
*/
StringList &operator=(const StringList &l);
#ifdef TAGLIB_USE_MOVE_SEMANTICS
/*!
* Moves \a l into this StringList.
*
* \note Not available unless TAGLIB_USE_MOVE_SEMANTICS macro is defined.
*/
StringList &operator=(StringList &&l);
#endif
/*!
* Splits the String \a s into several strings at \a pattern. This will not include
* the pattern in the returned strings.