Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Don't use 'using' directive in headers!

  • Loading branch information...
commit c0909faf3df69d7b8d0942fa0087afd4167ab657 1 parent 8193a53
t-nelson authored
Showing with 7 additions and 10 deletions.
  1. +7 −10 xbmc/music/tags/TagLibVFSStream.h
17 xbmc/music/tags/TagLibVFSStream.h
View
@@ -23,12 +23,9 @@
#include "utils/StdString.h"
#include <taglib/tiostream.h>
-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;
Please sign in to comment.
Something went wrong with that request. Please try again.