mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-14 11:04:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use a standard type rather than TagLib::wchar.

Browse Source 
This won't break the ABI compatibility.
This commit is contained in:
Tsuda Kageyu
2015-12-02 11:30:29 +09:00
parent 6966be4292
commit 060a50ab11
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
taglib/mpeg/id3v1/id3v1genres.cpp
View File

@ -29,7 +29,7 @@ using namespace TagLib;
namespace
{
const wchar *genres[] = {
const wchar_t *genres[] = {
L"Blues",
L"Classic Rock",
L"Country",

2
taglib/toolkit/taglib.h
View File

@ -73,7 +73,7 @@ namespace TagLib {
* Unfortunately std::wstring isn't defined on some systems, (i.e. GCC < 3)
* so I'm providing something here that should be constant.
*/
typedef std::basic_string<wchar> wstring;
typedef std::basic_string<wchar_t> wstring;
}
/*!

4
taglib/toolkit/tstring.cpp
View File

@ -635,13 +635,13 @@ String String::number(int n) // static
return Utils::formatString("%d", n);
}
TagLib::wchar &String::operator[](int i)
wchar_t &String::operator[](int i)
{
detach();
return d->data[i];
}
const TagLib::wchar &String::operator[](int i) const
const wchar_t &String::operator[](int i) const
{
return d->data[i];
}

8
taglib/toolkit/tstring.h
View File

@ -86,8 +86,8 @@ namespace TagLib {
public:
#ifndef DO_NOT_DOCUMENT
typedef std::basic_string<wchar>::iterator Iterator;
typedef std::basic_string<wchar>::const_iterator ConstIterator;
typedef TagLib::wstring::iterator Iterator;
typedef TagLib::wstring::const_iterator ConstIterator;
#endif
/**
@ -395,12 +395,12 @@ namespace TagLib {
/*!
* Returns a reference to the character at position \a i.
*/
wchar &operator[](int i);
wchar_t &operator[](int i);
/*!
* Returns a const reference to the character at position \a i.
*/
const wchar &operator[](int i) const;
const wchar_t &operator[](int i) const;
/*!
* Compares each character of the String with each character of \a s and

2
tests/test_ogg.cpp
View File

@ -49,7 +49,7 @@ public:
String longText(std::string(128 * 1024, ' ').c_str());
for (size_t i = 0; i < longText.length(); ++i)
longText[i] = static_cast<wchar>(L'A' + (i % 26));
longText[i] = static_cast<wchar_t>(L'A' + (i % 26));
{
Vorbis::File f(newname.c_str());

2
tests/test_oggflac.cpp
View File

@ -54,7 +54,7 @@ public:
String longText(std::string(128 * 1024, ' ').c_str());
for(size_t i = 0; i < longText.length(); ++i)
longText[i] = static_cast<wchar>(L'A' + (i % 26));
longText[i] = static_cast<wchar_t>(L'A' + (i % 26));
{
Ogg::FLAC::File f(newname.c_str());

2
tests/test_opus.cpp
View File

@ -70,7 +70,7 @@ public:
String longText(std::string(128 * 1024, ' ').c_str());
for(size_t i = 0; i < longText.length(); ++i)
longText[i] = static_cast<wchar>(L'A' + (i % 26));
longText[i] = static_cast<wchar_t>(L'A' + (i % 26));
{
Ogg::Opus::File f(newname.c_str());

2
tests/test_speex.cpp
View File

@ -35,7 +35,7 @@ public:
String longText(std::string(128 * 1024, ' ').c_str());
for (size_t i = 0; i < longText.length(); ++i)
longText[i] = static_cast<wchar>(L'A' + (i % 26));
longText[i] = static_cast<wchar_t>(L'A' + (i % 26));
{
Ogg::Speex::File f(newname.c_str());