From kde-commits  Sun Nov 09 23:12:41 2003
From: Scott Wheeler <wheeler () kde ! org>
Date: Sun, 09 Nov 2003 23:12:41 +0000
To: kde-commits
Subject: kdeextragear-2/taglib/mpeg
X-MARC-Message: https://marc.info/?l=kde-commits&m=106841967503174

CVS commit by wheeler: 

A forward declaration will suffice here and keeps us from needing two extra
gets rid of the extra includes in the header file.

Don't need the explicit declaration that we're using the TagLib namespace
since we're working inside of the TagLib namespace.

CCMAIL:kde@carewolf.com


  M +3 -3      id3v1/id3v1tag.cpp   1.22
  M +3 -2      id3v1/id3v1tag.h   1.13
  M +3 -5      id3v2/id3v2tag.cpp   1.39
  M +3 -2      id3v2/id3v2tag.h   1.24


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

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

--- kdeextragear-2/taglib/mpeg/id3v2/id3v2tag.cpp  #1.38:1.39
@@ -20,7 +20,5 @@
  ***************************************************************************/
 
-#include <iostream>
-#include <fstream>
-
+#include <tfile.h>
 #include <tdebug.h>
 
@@ -50,5 +48,5 @@ public:
   }
 
-  TagLib::File *file;
+  File *file;
   long tagOffset;
   const FrameFactory *factory;
@@ -74,5 +72,5 @@ ID3v2::Tag::Tag() : TagLib::Tag()
 }
 
-ID3v2::Tag::Tag(TagLib::File *file, long tagOffset, const FrameFactory *factory) :
+ID3v2::Tag::Tag(File *file, long tagOffset, const FrameFactory *factory) :
   TagLib::Tag()
 {

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