Use namespace for static taglib to avoid collision with taglib

linked to vlc

3rdparty/taglib/ape/apefile.cpp

@@ -44,7 +44,7 @@
 #include "apetag.h"
 #include "apefooter.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 namespace
 {
@@ -100,7 +100,7 @@ bool APE::File::isSupported(IOStream *stream)
 ////////////////////////////////////////////////////////////////////////////////
 
 APE::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
-  TagLib::File(file),
+  Strawberry_TagLib::TagLib::File(file),
   d(new FilePrivate())
 {
   if(isOpen())
@@ -108,7 +108,7 @@ APE::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
 }
 
 APE::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle) :
-  TagLib::File(stream),
+  Strawberry_TagLib::TagLib::File(stream),
   d(new FilePrivate())
 {
   if(isOpen())
@@ -120,7 +120,7 @@ APE::File::~File()
   delete d;
 }
 
-TagLib::Tag *APE::File::tag() const
+Strawberry_TagLib::TagLib::Tag *APE::File::tag() const
 {
   return &d->tag;
 }

3rdparty/taglib/ape/apefile.h

@@ -38,7 +38,7 @@
 #include "taglib_export.h"
 #include "apeproperties.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   class Tag;
 
@@ -56,16 +56,16 @@ namespace TagLib {
 
   namespace APE {
 
-    //! An implementation of TagLib::File with APE specific methods
+    //! An implementation of Strawberry_TagLib::TagLib::File with APE specific methods
 
     /*!
      * This implements and provides an interface for APE files to the
-     * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
-     * the abstract TagLib::File API as well as providing some additional
+     * Strawberry_TagLib::TagLib::Tag and Strawberry_TagLib::TagLib::AudioProperties interfaces by way of implementing
+     * the abstract Strawberry_TagLib::TagLib::File API as well as providing some additional
      * information specific to APE files.
      */
 
-    class TAGLIB_EXPORT File : public TagLib::File
+    class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
     {
     public:
       /*!
@@ -113,7 +113,7 @@ namespace TagLib {
        * Returns the Tag for this file.  This will be an APE tag, an ID3v1 tag
        * or a combination of the two.
        */
-      virtual TagLib::Tag *tag() const;
+      virtual Strawberry_TagLib::TagLib::Tag *tag() const;
 
       /*!
        * Implements the unified property interface -- export function.

3rdparty/taglib/ape/apefooter.cpp

@@ -32,7 +32,7 @@
 
 #include "apefooter.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace APE;
 
 class APE::Footer::FooterPrivate

3rdparty/taglib/ape/apefooter.h

@@ -29,7 +29,7 @@
 #include "tbytevector.h"
 #include "taglib_export.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   namespace APE {
 

3rdparty/taglib/ape/apeitem.cpp

@@ -28,7 +28,7 @@
 
 #include "apeitem.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace APE;
 
 class APE::Item::ItemPrivate

3rdparty/taglib/ape/apeitem.h

@@ -30,7 +30,7 @@
 #include "tstring.h"
 #include "tstringlist.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   namespace APE {
 

3rdparty/taglib/ape/apeproperties.cpp

@@ -36,7 +36,7 @@
 #include "apetag.h"
 #include "apefooter.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class APE::Properties::PropertiesPrivate
 {

3rdparty/taglib/ape/apeproperties.h

@@ -33,7 +33,7 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   namespace APE {
 

3rdparty/taglib/ape/apetag.cpp

@@ -42,7 +42,7 @@
 #include "apefooter.h"
 #include "apeitem.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace APE;
 
 namespace
@@ -91,13 +91,13 @@ public:
 ////////////////////////////////////////////////////////////////////////////////
 
 APE::Tag::Tag() :
-  TagLib::Tag(),
+  Strawberry_TagLib::TagLib::Tag(),
   d(new TagPrivate())
 {
 }
 
-APE::Tag::Tag(TagLib::File *file, long footerLocation) :
-  TagLib::Tag(),
+APE::Tag::Tag(Strawberry_TagLib::TagLib::File *file, long footerLocation) :
+  Strawberry_TagLib::TagLib::Tag(),
   d(new TagPrivate())
 {
   d->file = file;

3rdparty/taglib/ape/apetag.h

@@ -34,7 +34,7 @@
 
 #include "apeitem.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   class File;
 
@@ -54,7 +54,7 @@ namespace TagLib {
 
     //! An APE tag implementation
 
-    class TAGLIB_EXPORT Tag : public TagLib::Tag
+    class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag
     {
     public:
       /*!
@@ -66,7 +66,7 @@ namespace TagLib {
        * Create an APE tag and parse the data in \a file with APE footer at
        * \a tagOffset.
        */
-      Tag(TagLib::File *file, long footerLocation);
+      Tag(Strawberry_TagLib::TagLib::File *file, long footerLocation);
 
       /*!
        * Destroys this Tag instance.