Use namespace for static taglib to avoid collision with taglib

linked to vlc

3rdparty/taglib/ogg/flac/oggflacfile.cpp

@@ -32,8 +32,8 @@
 #include <xiphcomment.h>
 #include "oggflacfile.h"
 
-using namespace TagLib;
-using TagLib::FLAC::Properties;
+using namespace Strawberry_TagLib::TagLib;
+using Strawberry_TagLib::TagLib::FLAC::Properties;
 
 class Ogg::FLAC::File::FilePrivate
 {

3rdparty/taglib/ogg/flac/oggflacfile.h

@@ -32,7 +32,7 @@
 
 #include "flacproperties.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   class Tag;
 
@@ -49,14 +49,14 @@ namespace TagLib {
    */
   namespace FLAC {
 
-    using TagLib::FLAC::Properties;
+    using Strawberry_TagLib::TagLib::FLAC::Properties;
 
-    //! An implementation of TagLib::File with Ogg/FLAC specific methods
+    //! An implementation of Strawberry_TagLib::TagLib::File with Ogg/FLAC specific methods
 
     /*!
      * This implements and provides an interface for Ogg/FLAC 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 Ogg FLAC files.
      */
 
@@ -165,6 +165,6 @@ namespace TagLib {
     };
   } // namespace FLAC
   } // namespace Ogg
-} // namespace TagLib
+} // namespace Strawberry_TagLib::TagLib
 
 #endif

3rdparty/taglib/ogg/oggfile.cpp

@@ -32,7 +32,7 @@
 #include "oggpage.h"
 #include "oggpageheader.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 namespace
 {
@@ -175,13 +175,13 @@ bool Ogg::File::save()
 ////////////////////////////////////////////////////////////////////////////////
 
 Ogg::File::File(FileName file) :
-  TagLib::File(file),
+  Strawberry_TagLib::TagLib::File(file),
   d(new FilePrivate())
 {
 }
 
 Ogg::File::File(IOStream *stream) :
-  TagLib::File(stream),
+  Strawberry_TagLib::TagLib::File(stream),
   d(new FilePrivate())
 {
 }

3rdparty/taglib/ogg/oggfile.h

@@ -30,7 +30,7 @@
 #ifndef TAGLIB_OGGFILE_H
 #define TAGLIB_OGGFILE_H
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   //! A namespace for the classes used by Ogg-based metadata files
 
@@ -38,7 +38,7 @@ namespace TagLib {
 
     class PageHeader;
 
-    //! An implementation of TagLib::File with some helpers for Ogg based formats
+    //! An implementation of Strawberry_TagLib::TagLib::File with some helpers for Ogg based formats
 
     /*!
      * This is an implementation of Ogg file page and packet rendering and is of
@@ -47,7 +47,7 @@ namespace TagLib {
      * these available (via subclassing) to the codec meta data implementations.
      */
 
-    class TAGLIB_EXPORT File : public TagLib::File
+    class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
     {
     public:
       virtual ~File();

3rdparty/taglib/ogg/oggpage.cpp

@@ -32,7 +32,7 @@
 #include "oggpageheader.h"
 #include "oggfile.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class Ogg::Page::PagePrivate
 {

3rdparty/taglib/ogg/oggpage.h

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

3rdparty/taglib/ogg/oggpageheader.cpp

@@ -32,7 +32,7 @@
 #include "oggpageheader.h"
 #include "oggfile.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class Ogg::PageHeader::PageHeaderPrivate
 {

3rdparty/taglib/ogg/oggpageheader.h

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

3rdparty/taglib/ogg/opus/opusfile.cpp

@@ -34,8 +34,8 @@
 
 #include "opusfile.h"
 
-using namespace TagLib;
-using namespace TagLib::Ogg;
+using namespace Strawberry_TagLib::TagLib;
+using namespace Strawberry_TagLib::TagLib::Ogg;
 
 class Opus::File::FilePrivate
 {

3rdparty/taglib/ogg/opus/opusfile.h

@@ -35,7 +35,7 @@
 
 #include "opusproperties.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   namespace Ogg {
 
@@ -84,7 +84,7 @@ namespace TagLib {
         /*!
          * Returns the XiphComment for this file.  XiphComment implements the tag
          * interface, so this serves as the reimplementation of
-         * TagLib::File::tag().
+         * Strawberry_TagLib::TagLib::File::tag().
          */
         virtual Ogg::XiphComment *tag() const;
 

3rdparty/taglib/ogg/opus/opusproperties.cpp

@@ -35,8 +35,8 @@
 #include "opusproperties.h"
 #include "opusfile.h"
 
-using namespace TagLib;
-using namespace TagLib::Ogg;
+using namespace Strawberry_TagLib::TagLib;
+using namespace Strawberry_TagLib::TagLib::Ogg;
 
 class Opus::Properties::PropertiesPrivate
 {

3rdparty/taglib/ogg/opus/opusproperties.h

@@ -32,7 +32,7 @@
 
 #include "audioproperties.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   namespace Ogg {
 

3rdparty/taglib/ogg/speex/speexfile.cpp

@@ -34,8 +34,8 @@
 
 #include "speexfile.h"
 
-using namespace TagLib;
-using namespace TagLib::Ogg;
+using namespace Strawberry_TagLib::TagLib;
+using namespace Strawberry_TagLib::TagLib::Ogg;
 
 class Speex::File::FilePrivate
 {

3rdparty/taglib/ogg/speex/speexfile.h

@@ -35,7 +35,7 @@
 
 #include "speexproperties.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   namespace Ogg {
 
@@ -84,7 +84,7 @@ namespace TagLib {
         /*!
          * Returns the XiphComment for this file.  XiphComment implements the tag
          * interface, so this serves as the reimplementation of
-         * TagLib::File::tag().
+         * Strawberry_TagLib::TagLib::File::tag().
          */
         virtual Ogg::XiphComment *tag() const;
 

3rdparty/taglib/ogg/speex/speexproperties.cpp

@@ -35,8 +35,8 @@
 #include "speexproperties.h"
 #include "speexfile.h"
 
-using namespace TagLib;
-using namespace TagLib::Ogg;
+using namespace Strawberry_TagLib::TagLib;
+using namespace Strawberry_TagLib::TagLib::Ogg;
 
 class Speex::Properties::PropertiesPrivate
 {

3rdparty/taglib/ogg/speex/speexproperties.h

@@ -32,7 +32,7 @@
 
 #include "audioproperties.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   namespace Ogg {
 

3rdparty/taglib/ogg/vorbis/vorbisfile.cpp

@@ -32,7 +32,7 @@
 
 #include "vorbisfile.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class Vorbis::File::FilePrivate
 {
@@ -51,7 +51,7 @@ public:
   Properties *properties;
 };
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
   /*!
    * Vorbis headers can be found with one type ID byte and the string "vorbis" in
    * an Ogg stream.  0x03 indicates the comment header.

3rdparty/taglib/ogg/vorbis/vorbisfile.h

@@ -32,7 +32,7 @@
 
 #include "vorbisproperties.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
 /*
  * This is just to make this appear to be in the Ogg namespace in the
@@ -91,7 +91,7 @@ namespace TagLib {
       /*!
        * Returns the XiphComment for this file.  XiphComment implements the tag
        * interface, so this serves as the reimplementation of
-       * TagLib::File::tag().
+       * Strawberry_TagLib::TagLib::File::tag().
        */
       virtual Ogg::XiphComment *tag() const;
 
@@ -149,7 +149,7 @@ namespace TagLib {
 #ifdef DOXYGEN
   }
 #else
-  namespace Ogg { namespace Vorbis { typedef TagLib::Vorbis::File File; } }
+  namespace Ogg { namespace Vorbis { typedef Strawberry_TagLib::TagLib::Vorbis::File File; } }
 #endif
 
 }

3rdparty/taglib/ogg/vorbis/vorbisproperties.cpp

@@ -31,7 +31,7 @@
 #include "vorbisproperties.h"
 #include "vorbisfile.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class Vorbis::Properties::PropertiesPrivate
 {
@@ -56,7 +56,7 @@ public:
   int bitrateMinimum;
 };
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
   /*!
    * Vorbis headers can be found with one type ID byte and the string "vorbis" in
    * an Ogg stream.  0x01 indicates the setup header.

3rdparty/taglib/ogg/vorbis/vorbisproperties.h

@@ -29,7 +29,7 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
 /*
  * This is just to make this appear to be in the Ogg namespace in the
@@ -152,7 +152,7 @@ namespace TagLib {
 #ifdef DOXYGEN
   }
 #else
-  namespace Ogg { namespace Vorbis { typedef TagLib::AudioProperties AudioProperties; } }
+  namespace Ogg { namespace Vorbis { typedef Strawberry_TagLib::TagLib::AudioProperties AudioProperties; } }
 #endif
 
 }

3rdparty/taglib/ogg/xiphcomment.cpp

@@ -30,7 +30,7 @@
 #include <xiphcomment.h>
 #include <tpropertymap.h>
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 namespace
 {
@@ -61,13 +61,13 @@ public:
 ////////////////////////////////////////////////////////////////////////////////
 
 Ogg::XiphComment::XiphComment() :
-  TagLib::Tag(),
+  Strawberry_TagLib::TagLib::Tag(),
   d(new XiphCommentPrivate())
 {
 }
 
 Ogg::XiphComment::XiphComment(const ByteVector &data) :
-  TagLib::Tag(),
+  Strawberry_TagLib::TagLib::Tag(),
   d(new XiphCommentPrivate())
 {
   parse(data);

3rdparty/taglib/ogg/xiphcomment.h

@@ -35,7 +35,7 @@
 #include "flacpicture.h"
 #include "taglib_export.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   namespace Ogg {
 
@@ -62,7 +62,7 @@ namespace TagLib {
      * \see fieldListMap()
      */
 
-    class TAGLIB_EXPORT XiphComment : public TagLib::Tag
+    class TAGLIB_EXPORT XiphComment : public Strawberry_TagLib::TagLib::Tag
     {
     public:
       /*!