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

Use a standard type rather than TagLib::ushort.

Browse Source 
This won't break the ABI compatibility.
This commit is contained in:
Tsuda Kageyu
2015-12-02 18:59:45 +09:00
parent 8bdddaabce
commit dcc0fe553c
22 changed files with 212 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
taglib/mod/modfilebase.cpp
View File

@ -61,7 +61,7 @@ void Mod::FileBase::writeByte(unsigned char byte)
writeBlock(data);
}
void Mod::FileBase::writeU16L(ushort number)
void Mod::FileBase::writeU16L(unsigned short number)
{
writeBlock(ByteVector::fromShort(number, false));
}
@ -71,7 +71,7 @@ void Mod::FileBase::writeU32L(ulong number)
writeBlock(ByteVector::fromUInt(number, false));
}
void Mod::FileBase::writeU16B(ushort number)
void Mod::FileBase::writeU16B(unsigned short number)
{
writeBlock(ByteVector::fromShort(number, true));
}
@ -89,7 +89,7 @@ bool Mod::FileBase::readByte(unsigned char &byte)
return true;
}
bool Mod::FileBase::readU16L(ushort &number)
bool Mod::FileBase::readU16L(unsigned short &number)
{
ByteVector data(readBlock(2));
if(data.size() < 2) return false;
@ -104,7 +104,7 @@ bool Mod::FileBase::readU32L(ulong &number) {
return true;
}
bool Mod::FileBase::readU16B(ushort &number)
bool Mod::FileBase::readU16B(unsigned short &number)
{
ByteVector data(readBlock(2));
if(data.size() < 2) return false;

8
taglib/mod/modfilebase.h
View File

@ -42,16 +42,16 @@ namespace TagLib {
void writeString(const String &s, ulong size, char padding = 0);
void writeByte(unsigned char byte);
void writeU16L(ushort number);
void writeU16L(unsigned short number);
void writeU32L(ulong number);
void writeU16B(ushort number);
void writeU16B(unsigned short number);
void writeU32B(ulong number);
bool readString(String &s, ulong size);
bool readByte(unsigned char &byte);
bool readU16L(ushort &number);
bool readU16L(unsigned short &number);
bool readU32L(ulong &number);
bool readU16B(ushort &number);
bool readU16B(unsigned short &number);
bool readU32B(ulong &number);
};

8
taglib/mod/modfileprivate.h
View File

@ -38,9 +38,9 @@
}
#define READ_BYTE(setter) READ(setter,unsigned char,readByte)
#define READ_U16L(setter) READ(setter,ushort,readU16L)
#define READ_U16L(setter) READ(setter,unsigned short,readU16L)
#define READ_U32L(setter) READ(setter,ulong,readU32L)
#define READ_U16B(setter) READ(setter,ushort,readU16B)
#define READ_U16B(setter) READ(setter,unsigned short,readU16B)
#define READ_U32B(setter) READ(setter,ulong,readU32B)
#define READ_STRING(setter,size) \
@ -55,9 +55,9 @@
READ_ASSERT(read(name));
#define READ_BYTE_AS(name) READ_AS(unsigned char,name,readByte)
#define READ_U16L_AS(name) READ_AS(ushort,name,readU16L)
#define READ_U16L_AS(name) READ_AS(unsigned short,name,readU16L)
#define READ_U32L_AS(name) READ_AS(ulong,name,readU32L)
#define READ_U16B_AS(name) READ_AS(ushort,name,readU16B)
#define READ_U16B_AS(name) READ_AS(unsigned short,name,readU16B)
#define READ_U32B_AS(name) READ_AS(ulong,name,readU32B)
#define READ_STRING_AS(name,size) \