diff options
author | Mathias Panzenböck <grosser.meister.morti@gmx.net> | 2011-06-14 01:47:07 +0200 |
---|---|---|
committer | Mathias Panzenböck <grosser.meister.morti@gmx.net> | 2011-06-14 01:47:07 +0200 |
commit | 812826fe3ae6278d6f207e5406f36f11d2ce9d24 (patch) | |
tree | 900b21ce29c725073ecb6c8bee388e36228abb86 | |
parent | 319233400637a10b056b229bc7b0d7ed1ea9008a (diff) |
Mod::File -> Mod::FileBase
-rw-r--r-- | taglib/CMakeLists.txt | 4 | ||||
-rw-r--r-- | taglib/it/itfile.cpp | 4 | ||||
-rw-r--r-- | taglib/it/itfile.h | 4 | ||||
-rw-r--r-- | taglib/mod/modfilebase.cpp (renamed from taglib/mod/modfile.cpp) | 16 | ||||
-rw-r--r-- | taglib/mod/modfilebase.h (renamed from taglib/mod/modfile.h) | 6 | ||||
-rw-r--r-- | taglib/s3m/s3mfile.cpp | 4 | ||||
-rw-r--r-- | taglib/s3m/s3mfile.h | 4 | ||||
-rw-r--r-- | taglib/xm/xmfile.cpp | 4 | ||||
-rw-r--r-- | taglib/xm/xmfile.h | 4 |
9 files changed, 25 insertions, 25 deletions
diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt index 55bcdefd..f344c462 100644 --- 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 9646ec3e..f3917c9e 100644 --- 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 3a50b062..5d6b3deb 100644 --- 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 index 5ad69e4b..3680e976 100644 --- 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 index 997c6d62..d763ba13 100644 --- 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 38e7311c..614688e3 100644 --- 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 05fbfd56..28433e13 100644 --- 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 b5c981d7..f567c25d 100644 --- 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 f30ea573..7d0b919d 100644 --- 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 |