[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-2/taglib/mpeg
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2003-11-09 22:53:57
[Download RAW message or body]

CVS commit by carewolf: 

Cleaning API: UnMPEGify ID3-tags


  M +2 -3      id3v1/id3v1tag.cpp   1.21
  M +2 -3      id3v1/id3v1tag.h   1.12
  M +2 -4      id3v2/id3v2tag.cpp   1.38
  M +2 -3      id3v2/id3v2tag.h   1.23


--- kdeextragear-2/taglib/mpeg/id3v1/id3v1tag.cpp  #1.20:1.21
@@ -22,5 +22,4 @@
 #include <tdebug.h>
 #include <taglib.h>
-#include <mpegfile.h>
 
 #include "id3v1tag.h"
@@ -35,5 +34,5 @@ public:
   TagPrivate() : file(0), tagOffset(-1), track(0), genre(255) {}
 
-  MPEG::File *file;
+  TagLib::File *file;
   long tagOffset;
 
@@ -56,5 +55,5 @@ ID3v1::Tag::Tag() : TagLib::Tag()
 }
 
-ID3v1::Tag::Tag(MPEG::File *file, long tagOffset) : TagLib::Tag()
+ID3v1::Tag::Tag(TagLib::File *file, long tagOffset) : TagLib::Tag()
 {
   d = new TagPrivate;

--- kdeextragear-2/taglib/mpeg/id3v1/id3v1tag.h  #1.11:1.12
@@ -25,9 +25,8 @@
 #include <tag.h>
 #include <tbytevector.h>
+#include <tfile.h>
 
 namespace TagLib {
 
-  class MPEG::File;
-
   //! An ID3v1 implementation
 
@@ -59,5 +58,5 @@ namespace TagLib {
        * \a tagOffset.
        */
-      Tag(MPEG::File *file, long tagOffset);
+      Tag(TagLib::File *file, long tagOffset);
 
       /*!

--- kdeextragear-2/taglib/mpeg/id3v2/id3v2tag.cpp  #1.37:1.38
@@ -25,6 +25,4 @@
 #include <tdebug.h>
 
-#include <mpegfile.h>
-
 #include "id3v2tag.h"
 #include "id3v2header.h"
@@ -52,5 +50,5 @@ public:
   }
 
-  MPEG::File *file;
+  TagLib::File *file;
   long tagOffset;
   const FrameFactory *factory;
@@ -76,5 +74,5 @@ ID3v2::Tag::Tag() : TagLib::Tag()
 }
 
-ID3v2::Tag::Tag(MPEG::File *file, long tagOffset, const FrameFactory *factory) :
+ID3v2::Tag::Tag(TagLib::File *file, long tagOffset, const FrameFactory *factory) :
   TagLib::Tag()
 {

--- kdeextragear-2/taglib/mpeg/id3v2/id3v2tag.h  #1.22:1.23
@@ -27,4 +27,5 @@
 #include <tstring.h>
 #include <tlist.h>
+#include <tfile.h>
 #include <tmap.h>
 
@@ -33,6 +34,4 @@
 namespace TagLib {
 
-  namespace MPEG { class File; }
-
   namespace ID3v2 {
 
@@ -111,5 +110,5 @@ namespace TagLib {
        * \see FrameFactory
        */
-      Tag(MPEG::File *file, long tagOffset,
+      Tag(TagLib::File *file, long tagOffset,
           const FrameFactory *factory = FrameFactory::instance());
 


[prev in list] [next in list] [prev in thread] [next in thread]