- Disambiguate uint and ushort references

diff --git a/taglib/it/itproperties.cpp b/taglib/it/itproperties.cpp
index 392ec6041e508a738c354dad525e3579cc054149..7a328fb945171635bfb460516e034298f69ddf19 100644 (file)
--- a/taglib/it/itproperties.cpp
+++ b/taglib/it/itproperties.cpp
@@ -94,7 +94,7 @@ int IT::Properties::channels() const
   return d->channels;
 }
 
-ushort IT::Properties::lengthInPatterns() const
+TagLib::ushort IT::Properties::lengthInPatterns() const
 {
   return d->lengthInPatterns;
 }
@@ -104,37 +104,37 @@ bool IT::Properties::stereo() const
   return d->flags & Stereo;
 }
 
-ushort IT::Properties::instrumentCount() const
+TagLib::ushort IT::Properties::instrumentCount() const
 {
   return d->instrumentCount;
 }
 
-ushort IT::Properties::sampleCount() const
+TagLib::ushort IT::Properties::sampleCount() const
 {
   return d->sampleCount;
 }
 
-ushort IT::Properties::patternCount() const
+TagLib::ushort IT::Properties::patternCount() const
 {
   return d->patternCount;
 }
 
-ushort IT::Properties::version() const
+TagLib::ushort IT::Properties::version() const
 {
   return d->version;
 }
 
-ushort IT::Properties::compatibleVersion() const
+TagLib::ushort IT::Properties::compatibleVersion() const
 {
   return d->compatibleVersion;
 }
 
-ushort IT::Properties::flags() const
+TagLib::ushort IT::Properties::flags() const
 {
   return d->flags;
 }
 
-ushort IT::Properties::special() const
+TagLib::ushort IT::Properties::special() const
 {
   return d->special;
 }

diff --git a/taglib/mod/modproperties.cpp b/taglib/mod/modproperties.cpp
index c98714898c9b2e0ac2e93ecf1a1605aee8ed62f6..4d3c354846e3bb700093ce2565a9286074de4568 100644 (file)
--- a/taglib/mod/modproperties.cpp
+++ b/taglib/mod/modproperties.cpp
@@ -70,7 +70,7 @@ int Mod::Properties::channels() const
   return d->channels;
 }
 
-uint Mod::Properties::instrumentCount() const
+TagLib::uint Mod::Properties::instrumentCount() const
 {
   return d->instrumentCount;
 }

diff --git a/taglib/riff/aiff/aiffproperties.cpp b/taglib/riff/aiff/aiffproperties.cpp
index 0ef9c23944cbcab3563cbeeca7094ffe2e3819f7..c78f0cbae1a3637b54fd6c1aaacf1e7ac3e98086 100644 (file)
--- a/taglib/riff/aiff/aiffproperties.cpp
+++ b/taglib/riff/aiff/aiffproperties.cpp
@@ -139,7 +139,7 @@ int RIFF::AIFF::Properties::sampleWidth() const
   return d->sampleWidth;
 }
 
-uint RIFF::AIFF::Properties::sampleFrames() const
+TagLib::uint RIFF::AIFF::Properties::sampleFrames() const
 {
   return d->sampleFrames;
 }

diff --git a/taglib/riff/wav/wavproperties.cpp b/taglib/riff/wav/wavproperties.cpp
index f04539686e74a0e1058497303d5f41a4a10ce1e6..9e7ea70ccc01ebb7ea39938517f367fa6a11551c 100644 (file)
--- a/taglib/riff/wav/wavproperties.cpp
+++ b/taglib/riff/wav/wavproperties.cpp
@@ -104,7 +104,7 @@ int RIFF::WAV::Properties::sampleWidth() const
   return d->sampleWidth;
 }
 
-uint RIFF::WAV::Properties::sampleFrames() const
+TagLib::uint RIFF::WAV::Properties::sampleFrames() const
 {
   return d->sampleFrames;
 }

diff --git a/taglib/s3m/s3mproperties.cpp b/taglib/s3m/s3mproperties.cpp
index 47b305623226a9239939267eed2951e384225c94..a1a010a39a563182babef88752accad282ce49ea 100644 (file)
--- a/taglib/s3m/s3mproperties.cpp
+++ b/taglib/s3m/s3mproperties.cpp
@@ -88,7 +88,7 @@ int S3M::Properties::channels() const
   return d->channels;
 }
 
-ushort S3M::Properties::lengthInPatterns() const
+TagLib::ushort S3M::Properties::lengthInPatterns() const
 {
   return d->lengthInPatterns;
 }
@@ -98,27 +98,27 @@ bool S3M::Properties::stereo() const
   return d->stereo;
 }
 
-ushort S3M::Properties::sampleCount() const
+TagLib::ushort S3M::Properties::sampleCount() const
 {
   return d->sampleCount;
 }
 
-ushort S3M::Properties::patternCount() const
+TagLib::ushort S3M::Properties::patternCount() const
 {
   return d->patternCount;
 }
 
-ushort S3M::Properties::flags() const
+TagLib::ushort S3M::Properties::flags() const
 {
   return d->flags;
 }
 
-ushort S3M::Properties::trackerVersion() const
+TagLib::ushort S3M::Properties::trackerVersion() const
 {
   return d->trackerVersion;
 }
 
-ushort S3M::Properties::fileFormatVersion() const
+TagLib::ushort S3M::Properties::fileFormatVersion() const
 {
   return d->fileFormatVersion;
 }

diff --git a/taglib/trueaudio/trueaudioproperties.cpp b/taglib/trueaudio/trueaudioproperties.cpp
index c52a13efdc0f9298bda24df36fe6879048c52863..9b251ff18e02f32c5c76697d2704b9fe3b192204 100644 (file)
--- a/taglib/trueaudio/trueaudioproperties.cpp
+++ b/taglib/trueaudio/trueaudioproperties.cpp
@@ -103,7 +103,7 @@ int TrueAudio::Properties::channels() const
   return d->channels;
 }
 
-uint TrueAudio::Properties::sampleFrames() const
+TagLib::uint TrueAudio::Properties::sampleFrames() const
 {
   return d->sampleFrames;
 }

diff --git a/taglib/wavpack/wavpackproperties.cpp b/taglib/wavpack/wavpackproperties.cpp
index 7b3faa1a0c0e091e3759375d5f93566697d22142..1715f425d0a7e7fc593c12f042d6d79e3137a4f5 100644 (file)
--- a/taglib/wavpack/wavpackproperties.cpp
+++ b/taglib/wavpack/wavpackproperties.cpp
@@ -117,7 +117,7 @@ int WavPack::Properties::bitsPerSample() const
   return d->bitsPerSample;
 }
 
-uint WavPack::Properties::sampleFrames() const
+TagLib::uint WavPack::Properties::sampleFrames() const
 {
   return d->sampleFrames;
 }

diff --git a/taglib/xm/xmproperties.cpp b/taglib/xm/xmproperties.cpp
index 8c975ed8389fb452938ac68e1cb98c904c58149a..45da02bd3d3c5518923bd27be357eae9788b8951 100644 (file)
--- a/taglib/xm/xmproperties.cpp
+++ b/taglib/xm/xmproperties.cpp
@@ -84,47 +84,47 @@ int XM::Properties::channels() const
   return d->channels;
 }
 
-ushort XM::Properties::lengthInPatterns() const
+TagLib::ushort XM::Properties::lengthInPatterns() const
 {
   return d->lengthInPatterns;
 }
 
-ushort XM::Properties::version() const
+TagLib::ushort XM::Properties::version() const
 {
   return d->version;
 }
 
-ushort XM::Properties::restartPosition() const
+TagLib::ushort XM::Properties::restartPosition() const
 {
   return d->restartPosition;
 }
 
-ushort XM::Properties::patternCount() const
+TagLib::ushort XM::Properties::patternCount() const
 {
   return d->patternCount;
 }
 
-ushort XM::Properties::instrumentCount() const
+TagLib::ushort XM::Properties::instrumentCount() const
 {
   return d->instrumentCount;
 }
 
-uint XM::Properties::sampleCount() const
+TagLib::uint XM::Properties::sampleCount() const
 {
   return d->sampleCount;
 }
 
-ushort XM::Properties::flags() const
+TagLib::ushort XM::Properties::flags() const
 {
   return d->flags;
 }
 
-ushort XM::Properties::tempo() const
+TagLib::ushort XM::Properties::tempo() const
 {
   return d->tempo;
 }
 
-ushort XM::Properties::bpmSpeed() const
+TagLib::ushort XM::Properties::bpmSpeed() const
 {
   return d->bpmSpeed;
 }