From c0909faf3df69d7b8d0942fa0087afd4167ab657 Mon Sep 17 00:00:00 2001 From: t-nelson Date: Sun, 21 Jul 2013 09:36:03 -0400 Subject: Don't use 'using' directive in headers! --- xbmc/music/tags/TagLibVFSStream.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/xbmc/music/tags/TagLibVFSStream.h b/xbmc/music/tags/TagLibVFSStream.h index 43bf4195a2..7e8501414d 100644 --- a/xbmc/music/tags/TagLibVFSStream.h +++ b/xbmc/music/tags/TagLibVFSStream.h @@ -23,12 +23,9 @@ #include "utils/StdString.h" #include -using namespace XFILE; -using namespace TagLib; - namespace MUSIC_INFO { - class TagLibVFSStream : public IOStream + class TagLibVFSStream : public TagLib::IOStream { public: /*! @@ -45,12 +42,12 @@ namespace MUSIC_INFO /*! * Returns the file name in the local file system encoding. */ - FileName name() const; + TagLib::FileName name() const; /*! * Reads a block of size \a length at the current get pointer. */ - ByteVector readBlock(TagLib::ulong length); + TagLib::ByteVector readBlock(TagLib::ulong length); /*! * Attempts to write the block \a data at the current get pointer. If the @@ -61,7 +58,7 @@ namespace MUSIC_INFO * for a ByteVector. And even this function is significantly slower than * doing output with a char[]. */ - void writeBlock(const ByteVector &data); + void writeBlock(const TagLib::ByteVector &data); /*! * Insert \a data at position \a start in the file overwriting \a replace @@ -70,7 +67,7 @@ namespace MUSIC_INFO * \note This method is slow since it requires rewriting all of the file * after the insertion point. */ - void insert(const ByteVector &data, TagLib::ulong start = 0, TagLib::ulong replace = 0); + void insert(const TagLib::ByteVector &data, TagLib::ulong start = 0, TagLib::ulong replace = 0); /*! * Removes a block of the file starting a \a start and continuing for @@ -98,7 +95,7 @@ namespace MUSIC_INFO * * \see Position */ - void seek(long offset, Position p = Beginning); + void seek(long offset, TagLib::IOStream::Position p = Beginning); /*! * Reset the end-of-file and error flags on the file. @@ -128,7 +125,7 @@ namespace MUSIC_INFO private: std::string m_strFileName; - CFile m_file; + XFILE::CFile m_file; bool m_bIsReadOnly; bool m_bIsOpen; int m_bufferSize; -- cgit v1.2.3