mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2026-02-12 19:23:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into merge-master

Browse Source 
Conflicts:
	ConfigureChecks.cmake
	config.h.cmake
	taglib/CMakeLists.txt
	taglib/toolkit/taglib.h
	taglib/toolkit/tbytevector.cpp
	taglib/toolkit/tmap.tcc
	taglib/toolkit/tstring.h
This commit is contained in:
Tsuda Kageyu
2013-05-04 01:38:49 +09:00
parent 73e5acdae9 db06166330
commit de04f4eb19
42 changed files with 415 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
taglib/asf/asfattribute.cpp
View File

@ -125,7 +125,7 @@ ASF::Attribute &ASF::Attribute::operator=(const ASF::Attribute &other)
return *this;
}
#ifdef SUPPORT_MOVE_SEMANTICS
#ifdef TAGLIB_USE_MOVE_SEMANTICS
ASF::Attribute &ASF::Attribute::operator=(ASF::Attribute &&other)
{

4
taglib/asf/asfattribute.h
View File

@ -115,12 +115,12 @@ namespace TagLib
*/
ASF::Attribute &operator=(const Attribute &other);
#ifdef SUPPORT_MOVE_SEMANTICS
#ifdef TAGLIB_USE_MOVE_SEMANTICS
/*!
* Moves the contents of \a other into this item.
*
* \note Not available unless SUPPORT_MOVE_SEMANTICS macro is defined.
* \note Not available unless TAGLIB_USE_MOVE_SEMANTICS macro is defined.
*/
ASF::Attribute &operator=(Attribute &&other);

4
taglib/asf/asfpicture.cpp
View File

@ -56,7 +56,7 @@ ASF::Picture::Picture(const Picture& other)
{
}
#ifdef SUPPORT_MOVE_SEMANTICS
#ifdef TAGLIB_USE_MOVE_SEMANTICS
ASF::Picture::Picture(Picture &&other)
: d(std::move(other.d))
@ -127,7 +127,7 @@ ASF::Picture& ASF::Picture::operator=(const ASF::Picture& other)
return *this;
}
#ifdef SUPPORT_MOVE_SEMANTICS
#ifdef TAGLIB_USE_MOVE_SEMANTICS
ASF::Picture& ASF::Picture::operator=(ASF::Picture &&other)
{

8
taglib/asf/asfpicture.h
View File

@ -107,12 +107,12 @@ namespace TagLib
*/
Picture(const Picture& other);
#ifdef SUPPORT_MOVE_SEMANTICS
#ifdef TAGLIB_USE_MOVE_SEMANTICS
/*!
* Constructs an picture equivalent to \a other.
*
* \note Not available unless SUPPORT_MOVE_SEMANTICS macro is defined.
* \note Not available unless TAGLIB_USE_MOVE_SEMANTICS macro is defined.
*/
Picture(Picture &&other);
@ -128,12 +128,12 @@ namespace TagLib
*/
Picture& operator=(const Picture& other);
#ifdef SUPPORT_MOVE_SEMANTICS
#ifdef TAGLIB_USE_MOVE_SEMANTICS
/*!
* Moves the contents of \a other into this picture.
*
* \note Not available unless SUPPORT_MOVE_SEMANTICS macro is defined.
* \note Not available unless TAGLIB_USE_MOVE_SEMANTICS macro is defined.
*/
Picture& operator=(Picture &&other);

3
taglib/asf/asfproperties.cpp
View File

@ -23,8 +23,7 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
#include "config.h"
#include "taglib_config.h"
#include <tdebug.h>
#include <tstring.h>
#include "asfproperties.h"

3
taglib/asf/asftag.cpp
View File

@ -23,8 +23,7 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
#include "config.h"
#include "taglib_config.h"
#include <tpropertymap.h>
#include "asftag.h"