Skip to content
This repository
Browse code

Don't use 'using' directive in headers!

  • Loading branch information...
commit c0909faf3df69d7b8d0942fa0087afd4167ab657 1 parent 8193a53
Trent Nelson authored July 21, 2013

Showing 1 changed file with 7 additions and 10 deletions. Show diff stats Hide diff stats

  1. 17  xbmc/music/tags/TagLibVFSStream.h
17  xbmc/music/tags/TagLibVFSStream.h
@@ -23,12 +23,9 @@
23 23
 #include "utils/StdString.h"
24 24
 #include <taglib/tiostream.h>
25 25
 
26  
-using namespace XFILE;
27  
-using namespace TagLib;
28  
-
29 26
 namespace MUSIC_INFO
30 27
 {
31  
-  class TagLibVFSStream : public IOStream
  28
+  class TagLibVFSStream : public TagLib::IOStream
32 29
   {
33 30
   public:
34 31
     /*!
@@ -45,12 +42,12 @@ namespace MUSIC_INFO
45 42
     /*!
46 43
      * Returns the file name in the local file system encoding.
47 44
      */
48  
-    FileName name() const;
  45
+    TagLib::FileName name() const;
49 46
 
50 47
     /*!
51 48
      * Reads a block of size \a length at the current get pointer.
52 49
      */
53  
-    ByteVector readBlock(TagLib::ulong length);
  50
+    TagLib::ByteVector readBlock(TagLib::ulong length);
54 51
 
55 52
     /*!
56 53
      * Attempts to write the block \a data at the current get pointer.  If the
@@ -61,7 +58,7 @@ namespace MUSIC_INFO
61 58
      * for a ByteVector.  And even this function is significantly slower than
62 59
      * doing output with a char[].
63 60
      */
64  
-    void writeBlock(const ByteVector &data);
  61
+    void writeBlock(const TagLib::ByteVector &data);
65 62
 
66 63
     /*!
67 64
      * Insert \a data at position \a start in the file overwriting \a replace
@@ -70,7 +67,7 @@ namespace MUSIC_INFO
70 67
      * \note This method is slow since it requires rewriting all of the file
71 68
      * after the insertion point.
72 69
      */
73  
-    void insert(const ByteVector &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
  70
+    void insert(const TagLib::ByteVector &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
74 71
 
75 72
     /*!
76 73
      * Removes a block of the file starting a \a start and continuing for
@@ -98,7 +95,7 @@ namespace MUSIC_INFO
98 95
      *
99 96
      * \see Position
100 97
      */
101  
-    void seek(long offset, Position p = Beginning);
  98
+    void seek(long offset, TagLib::IOStream::Position p = Beginning);
102 99
 
103 100
     /*!
104 101
      * Reset the end-of-file and error flags on the file.
@@ -128,7 +125,7 @@ namespace MUSIC_INFO
128 125
 
129 126
   private:
130 127
     std::string m_strFileName;
131  
-    CFile       m_file;
  128
+    XFILE::CFile       m_file;
132 129
     bool        m_bIsReadOnly;
133 130
     bool        m_bIsOpen;
134 131
     int         m_bufferSize;

0 notes on commit c0909fa

Please sign in to comment.
Something went wrong with that request. Please try again.