Mod::File -> Mod::FileBase

diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
index 55bcdefd15542df11e7f87573cd68b3b068ab22e..f344c462886efd6579443361a3188c35f5cb0bf0 100644 (file)
--- a/taglib/CMakeLists.txt
+++ b/taglib/CMakeLists.txt
@@ -101,7 +101,7 @@ set(tag_HDRS
   riff/aiff/aiffproperties.h
   riff/wav/wavfile.h
   riff/wav/wavproperties.h
-  mod/modfile.h
+  mod/modfilebase.h
   mod/modtag.h
   it/itfile.h
   it/itproperties.h
@@ -251,7 +251,7 @@ set(wav_SRCS
 )
 
 set(mod_SRCS
-  mod/modfile.cpp
+  mod/modfilebase.cpp
   mod/modtag.cpp
 )
 

diff --git a/taglib/it/itfile.cpp b/taglib/it/itfile.cpp
index 9646ec3eae3a09b1c939b6f81cd5da0b9c8cb9b6..f3917c9e94ecc7a639bb3c641a7cae5f347cc7bc 100644 (file)
--- a/taglib/it/itfile.cpp
+++ b/taglib/it/itfile.cpp
@@ -45,7 +45,7 @@ public:
 
 IT::File::File(FileName file, bool readProperties,
                AudioProperties::ReadStyle propertiesStyle) :
-  Mod::File(file),
+  Mod::FileBase(file),
   d(new FilePrivate(propertiesStyle))
 {
   read(readProperties);
@@ -53,7 +53,7 @@ IT::File::File(FileName file, bool readProperties,
 
 IT::File::File(IOStream *stream, bool readProperties,
                AudioProperties::ReadStyle propertiesStyle) :
-  Mod::File(stream),
+  Mod::FileBase(stream),
   d(new FilePrivate(propertiesStyle))
 {
   read(readProperties);

diff --git a/taglib/it/itfile.h b/taglib/it/itfile.h
index 3a50b0629845d44af94c7c95aaf18b861047260a..5d6b3deb37234e7477037537ecb42ddcabbeec2f 100644 (file)
--- a/taglib/it/itfile.h
+++ b/taglib/it/itfile.h
@@ -27,7 +27,7 @@
 #include "tfile.h"
 #include "audioproperties.h"
 #include "taglib_export.h"
-#include "modfile.h"
+#include "modfilebase.h"
 #include "modtag.h"
 #include "itproperties.h"
 
@@ -35,7 +35,7 @@ namespace TagLib {
 
   namespace IT {
 
-    class TAGLIB_EXPORT File : public Mod::File {
+    class TAGLIB_EXPORT File : public Mod::FileBase {
       public:
         /*!
          * Contructs a Impulse Tracker file from \a file. If \a readProperties

diff --git a/taglib/mod/modfile.cpp b/taglib/mod/modfilebase.cpp
similarity index 84%
rename from taglib/mod/modfile.cpp
rename to taglib/mod/modfilebase.cpp
index 5ad69e4bc5c1fa7e4dd4a500e055922dd186b4b9..3680e97628dc676c2e79f469f97f46671dc86017 100644 (file)
--- a/taglib/mod/modfile.cpp
+++ b/taglib/mod/modfilebase.cpp
@@ -19,27 +19,27 @@
  *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
-#include "modfile.h"
+#include "modfilebase.h"
 
 using namespace TagLib;
 using namespace Mod;
 
-Mod::File::File(FileName file) : TagLib::File(file)
+Mod::FileBase::FileBase(FileName file) : TagLib::File(file)
 {
 }
 
-Mod::File::File(IOStream *stream) : TagLib::File(stream)
+Mod::FileBase::FileBase(IOStream *stream) : TagLib::File(stream)
 {
 }
 
-void Mod::File::writeString(const String &s, ulong size)
+void Mod::FileBase::writeString(const String &s, ulong size)
 {
   ByteVector data(s.data(String::Latin1));
   data.resize(size, 0);
   writeBlock(data);
 }
 
-bool Mod::File::readString(String &s, ulong size)
+bool Mod::FileBase::readString(String &s, ulong size)
 {
   ByteVector data(readBlock(size));
   if(data.size() < size) return false;
@@ -54,7 +54,7 @@ bool Mod::File::readString(String &s, ulong size)
   return true;
 }
 
-bool Mod::File::readByte(uchar &byte)
+bool Mod::FileBase::readByte(uchar &byte)
 {
   ByteVector data(readBlock(1));
   if(data.size() < 1) return false;
@@ -62,7 +62,7 @@ bool Mod::File::readByte(uchar &byte)
   return true;
 }
 
-bool Mod::File::readU16L(ushort &number)
+bool Mod::FileBase::readU16L(ushort &number)
 {
   ByteVector data(readBlock(2));
   if(data.size() < 2) return false;
@@ -70,7 +70,7 @@ bool Mod::File::readU16L(ushort &number)
   return true;
 }
 
-bool Mod::File::readU32L(ulong &number) {
+bool Mod::FileBase::readU32L(ulong &number) {
   ByteVector data(readBlock(4));
   if(data.size() < 4) return false;
   number = data.toUInt(false);

diff --git a/taglib/mod/modfile.h b/taglib/mod/modfilebase.h
similarity index 93%
rename from taglib/mod/modfile.h
rename to taglib/mod/modfilebase.h
index 997c6d6293eca9890e3fea381a9ba3b58ef79ca1..d763ba132259e9917ef703b82c88a442d986b7c4 100644 (file)
--- a/taglib/mod/modfile.h
+++ b/taglib/mod/modfilebase.h
@@ -29,10 +29,10 @@
 
 namespace TagLib {
   namespace Mod {
-    class TAGLIB_EXPORT File : public TagLib::File {
+    class TAGLIB_EXPORT FileBase : public TagLib::File {
       protected:
-        File(FileName file);
-        File(IOStream *stream);
+        FileBase(FileName file);
+        FileBase(IOStream *stream);
 
         void writeString(const String &s, ulong size);
         bool readString(String &s, ulong size);

diff --git a/taglib/s3m/s3mfile.cpp b/taglib/s3m/s3mfile.cpp
index 38e7311ce6f0d9bd2044021c51ddfc7ad555730d..614688e3db9c3f9707e8fb36d8824da22cea4972 100644 (file)
--- a/taglib/s3m/s3mfile.cpp
+++ b/taglib/s3m/s3mfile.cpp
@@ -40,7 +40,7 @@ public:
 
 S3M::File::File(FileName file, bool readProperties,
                 AudioProperties::ReadStyle propertiesStyle) :
-  Mod::File(file),
+  Mod::FileBase(file),
   d(new FilePrivate(propertiesStyle))
 {
   read(readProperties);
@@ -48,7 +48,7 @@ S3M::File::File(FileName file, bool readProperties,
 
 S3M::File::File(IOStream *stream, bool readProperties,
                 AudioProperties::ReadStyle propertiesStyle) :
-  Mod::File(stream),
+  Mod::FileBase(stream),
   d(new FilePrivate(propertiesStyle))
 {
   read(readProperties);

diff --git a/taglib/s3m/s3mfile.h b/taglib/s3m/s3mfile.h
index 05fbfd56d6d0937dd2a5874f933a1728426aa2f7..28433e137cadb6e68e570907e684220349fe9da7 100644 (file)
--- a/taglib/s3m/s3mfile.h
+++ b/taglib/s3m/s3mfile.h
@@ -27,7 +27,7 @@
 #include "tfile.h"
 #include "audioproperties.h"
 #include "taglib_export.h"
-#include "modfile.h"
+#include "modfilebase.h"
 #include "modtag.h"
 #include "s3mproperties.h"
 
@@ -35,7 +35,7 @@ namespace TagLib {
 
   namespace S3M {
 
-    class TAGLIB_EXPORT File : public Mod::File {
+    class TAGLIB_EXPORT File : public Mod::FileBase {
       public:
         /*!
          * Contructs a ScreamTracker III file from \a file. If \a readProperties

diff --git a/taglib/xm/xmfile.cpp b/taglib/xm/xmfile.cpp
index b5c981d7e0ed6df80852001636b63e4011c0e09c..f567c25d32c936f2e3b2fc08b7d7c4ea22a0776b 100644 (file)
--- a/taglib/xm/xmfile.cpp
+++ b/taglib/xm/xmfile.cpp
@@ -42,7 +42,7 @@ public:
 
 XM::File::File(FileName file, bool readProperties,
                AudioProperties::ReadStyle propertiesStyle) :
-  Mod::File(file),
+  Mod::FileBase(file),
   d(new FilePrivate(propertiesStyle))
 {
   read(readProperties);
@@ -50,7 +50,7 @@ XM::File::File(FileName file, bool readProperties,
 
 XM::File::File(IOStream *stream, bool readProperties,
                AudioProperties::ReadStyle propertiesStyle) :
-  Mod::File(stream),
+  Mod::FileBase(stream),
   d(new FilePrivate(propertiesStyle))
 {
   read(readProperties);

diff --git a/taglib/xm/xmfile.h b/taglib/xm/xmfile.h
index f30ea57304b1043c22e8e11318cac8d88092283b..7d0b919d8d214a3472abe5a52060d3fe9c0b3d2c 100644 (file)
--- a/taglib/xm/xmfile.h
+++ b/taglib/xm/xmfile.h
@@ -27,7 +27,7 @@
 #include "tfile.h"
 #include "audioproperties.h"
 #include "taglib_export.h"
-#include "modfile.h"
+#include "modfilebase.h"
 #include "xmtag.h"
 #include "xmproperties.h"
 
@@ -35,7 +35,7 @@ namespace TagLib {
 
   namespace XM {
 
-    class TAGLIB_EXPORT File : public Mod::File {
+    class TAGLIB_EXPORT File : public Mod::FileBase {
       public:
         /*!
          * Contructs a Extended Module file from \a file. If \a readProperties