4 files changed, 12 insertions, 12 deletions

diff --git a/src/metadata/asf/asfattribute.cpp b/src/metadata/asf/asfattribute.cpp
index bfe81c5..5c83243 100644
--- a/src/metadata/asf/asfattribute.cpp
+++ b/src/metadata/asf/asfattribute.cpp
@@ -100,7 +100,7 @@ ASF::Attribute::Attribute(unsigned int value)
 ASF::Attribute::Attribute(unsigned long long value)
 {
   d = new AttributePrivate;
-  d->type = QWordType;
+  d->type = TQWordType;
   d->longLongValue = value;
 }
 
@@ -205,8 +205,8 @@ ASF::Attribute::parse(ASF::File &f, int kind)
     d->intValue = f.readDWORD();
     break;
 
-  case QWordType:
-    d->longLongValue = f.readQWORD();
+  case TQWordType:
+    d->longLongValue = f.readTQWORD();
     break;
 
   case UnicodeType:
@@ -245,7 +245,7 @@ ASF::Attribute::render(const String &name, int kind) const
     data.append(ByteVector::fromUInt(d->intValue, false));
     break;
 
-  case QWordType:
+  case TQWordType:
     data.append(ByteVector::fromLongLong(d->longLongValue, false));
     break;
 
diff --git a/src/metadata/asf/asfattribute.h b/src/metadata/asf/asfattribute.h
index 9a8e3c9..9624f33 100644
--- a/src/metadata/asf/asfattribute.h
+++ b/src/metadata/asf/asfattribute.h
@@ -45,7 +45,7 @@ namespace TagLib
         BytesType   = 1,
         BoolType    = 2,
         DWordType   = 3,
-        QWordType   = 4,
+        TQWordType   = 4,
         WordType    = 5,
         GuidType    = 6
       };
@@ -71,7 +71,7 @@ namespace TagLib
       Attribute(unsigned int value);
 
       /*!
-       * Constructs an attribute with \a key and a QWordType \a value.
+       * Constructs an attribute with \a key and a TQWordType \a value.
        */
       Attribute(unsigned long long value);
 
@@ -121,7 +121,7 @@ namespace TagLib
       unsigned int toUInt() const;
 
       /*!
-       * Returns the QWordType \a value.
+       * Returns the TQWordType \a value.
        */
       unsigned long long toULongLong() const;
 
diff --git a/src/metadata/asf/asffile.cpp b/src/metadata/asf/asffile.cpp
index 55a12cc..bbe5ee5 100644
--- a/src/metadata/asf/asffile.cpp
+++ b/src/metadata/asf/asffile.cpp
@@ -325,7 +325,7 @@ ASF::File::HeaderExtensionObject::parse(ASF::File *file, uint /*size*/)
   long long dataPos = 0;
   while(dataPos < dataSize) {
     ByteVector guid = file->readBlock(16);
-    long long size = file->readQWORD();
+    long long size = file->readTQWORD();
     BaseObject *obj;
     if(guid == metadataGuid) {
       obj = new MetadataObject();
@@ -401,13 +401,13 @@ void ASF::File::read(bool /*readProperties*/, Properties::ReadStyle /*properties
   d->tag = new ASF::Tag();
   d->properties = new ASF::Properties();
 
-  d->size = readQWORD();
+  d->size = readTQWORD();
   int numObjects = readDWORD();
   seek(2, Current);
 
   for(int i = 0; i < numObjects; i++) {
     ByteVector guid = readBlock(16);
-    long size = (long)readQWORD();
+    long size = (long)readTQWORD();
     BaseObject *obj;
     if(guid == filePropertiesGuid) {
       obj = new FilePropertiesObject();
@@ -513,7 +513,7 @@ unsigned int ASF::File::readDWORD()
   return v.toUInt(false);
 }
 
-long long ASF::File::readQWORD()
+long long ASF::File::readTQWORD()
 {
   ByteVector v = readBlock(8);
   return v.toLongLong(false);
diff --git a/src/metadata/asf/asffile.h b/src/metadata/asf/asffile.h
index db97331..618a3a9 100644
--- a/src/metadata/asf/asffile.h
+++ b/src/metadata/asf/asffile.h
@@ -86,7 +86,7 @@ namespace TagLib {
       int readBYTE();
       int readWORD();
       unsigned int readDWORD();
-      long long readQWORD();
+      long long readTQWORD();
       static ByteVector renderString(const String &str, bool includeLength = false);
       String readString(int len);
       void read(bool readProperties, Properties::ReadStyle propertiesStyle);