Change namespaces for compatibility

3rdparty/taglib/toolkit/taglib.h

@@ -56,7 +56,8 @@
  * \endcode
  */
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class String;
 
@@ -75,6 +76,7 @@ namespace Strawberry_TagLib::TagLib {
    */
   typedef std::basic_string<wchar_t> wstring;
 }
+}
 
 /*!
  * \mainpage TagLib

3rdparty/taglib/toolkit/tbytevector.cpp

@@ -44,7 +44,8 @@
 //
 // http://www.informit.com/isapi/product_id~{9C84DAB4-FE6E-49C5-BB0A-FB50331233EA}/content/index.asp
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
 template <class TIterator>
 int findChar(
@@ -1031,6 +1032,7 @@ void ByteVector::detach()
   }
 }
 }
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // related functions

3rdparty/taglib/toolkit/tbytevector.h

@@ -32,7 +32,8 @@
 #include <vector>
 #include <iostream>
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! A byte vector
 
@@ -625,6 +626,7 @@ namespace Strawberry_TagLib::TagLib {
     ByteVectorPrivate *d;
   };
 }
+}
 
 /*!
  * \relates Strawberry_TagLib::TagLib::ByteVector

3rdparty/taglib/toolkit/tbytevectorlist.h

@@ -30,7 +30,8 @@
 #include "tbytevector.h"
 #include "tlist.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! A list of ByteVectors
 
@@ -87,5 +88,6 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 #endif

3rdparty/taglib/toolkit/tbytevectorstream.h

@@ -31,7 +31,8 @@
 #include "tbytevector.h"
 #include "tiostream.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class String;
   class Tag;
@@ -141,5 +142,6 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 #endif

3rdparty/taglib/toolkit/tdebug.cpp

@@ -38,7 +38,8 @@
 #include <cstdio>
 #include <cstdarg>
 
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
   // The instance is defined in tdebuglistener.cpp.
   extern DebugListener *debugListener;
@@ -60,5 +61,6 @@ namespace Strawberry_TagLib::TagLib
     }
   }
 }
+}
 
 #endif

3rdparty/taglib/toolkit/tdebug.h

@@ -26,7 +26,8 @@
 #ifndef TAGLIB_DEBUG_H
 #define TAGLIB_DEBUG_H
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class String;
   class ByteVector;
@@ -65,6 +66,7 @@ namespace Strawberry_TagLib::TagLib {
 
 #endif
 }
+}
 
 #endif
 #endif

3rdparty/taglib/toolkit/tdebuglistener.cpp

@@ -63,7 +63,8 @@ namespace
   DefaultListener defaultListener;
 }
 
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
   DebugListener *debugListener = &defaultListener;
 
@@ -83,3 +84,4 @@ namespace Strawberry_TagLib::TagLib
       debugListener = &defaultListener;
   }
 }
+}

3rdparty/taglib/toolkit/tdebuglistener.h

@@ -29,7 +29,8 @@
 #include "taglib_export.h"
 #include "tstring.h"
 
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
   //! An abstraction for the listener to the debug messages.
 
@@ -70,5 +71,6 @@ namespace Strawberry_TagLib::TagLib
    */
   TAGLIB_EXPORT void setDebugListener(DebugListener *listener);
 }
+}
 
 #endif

3rdparty/taglib/toolkit/tfile.h

@@ -32,7 +32,8 @@
 #include "tbytevector.h"
 #include "tiostream.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class String;
   class Tag;
@@ -302,5 +303,6 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 #endif

3rdparty/taglib/toolkit/tfilestream.h

@@ -31,7 +31,8 @@
 #include "tbytevector.h"
 #include "tiostream.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class String;
   class Tag;
@@ -155,5 +156,6 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 #endif

3rdparty/taglib/toolkit/tiostream.h

@@ -30,7 +30,8 @@
 #include "taglib.h"
 #include "tbytevector.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
 #ifdef _WIN32
   class TAGLIB_EXPORT FileName
@@ -166,5 +167,6 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 #endif

3rdparty/taglib/toolkit/tlist.h

@@ -30,7 +30,8 @@
 
 #include <list>
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! A generic, implicitly shared list.
 
@@ -261,6 +262,7 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 // Since GCC doesn't support the "export" keyword, we have to include the
 // implementation.

3rdparty/taglib/toolkit/tlist.tcc

@@ -26,7 +26,8 @@
 #include <algorithm>
 #include "trefcounter.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
@@ -319,5 +320,5 @@ void List<T>::detach()
     d = new ListPrivate<T>(d->list);
   }
 }
-
+}
 } // namespace Strawberry_TagLib::TagLib

3rdparty/taglib/toolkit/tmap.h

@@ -30,7 +30,8 @@
 
 #include "taglib.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! A generic, implicitly shared map.
 
@@ -195,6 +196,7 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 // Since GCC doesn't support the "export" keyword, we have to include the
 // implementation.

3rdparty/taglib/toolkit/tmap.tcc

@@ -25,7 +25,8 @@
 
 #include "trefcounter.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
@@ -195,5 +196,5 @@ void Map<Key, T>::detach()
     d = new MapPrivate<Key, T>(d->map);
   }
 }
-
+}
 } // namespace Strawberry_TagLib::TagLib

3rdparty/taglib/toolkit/tpropertymap.h

@@ -29,7 +29,8 @@
 #include "tmap.h"
 #include "tstringlist.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   typedef Map<String,StringList> SimplePropertyMap;
 
@@ -233,5 +234,6 @@ namespace Strawberry_TagLib::TagLib {
     StringList unsupported;
   };
 
+}
 }
 #endif /* TAGLIB_PROPERTYMAP_H_ */

3rdparty/taglib/toolkit/trefcounter.cpp

@@ -62,7 +62,8 @@
 # define ATOMIC_DEC(x) (--x)
 #endif
 
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
 
   class RefCounter::RefCounterPrivate
@@ -99,3 +100,4 @@ namespace Strawberry_TagLib::TagLib
     return static_cast<int>(d->refCount);
   }
 }
+}

3rdparty/taglib/toolkit/trefcounter.h

@@ -56,7 +56,8 @@
   *
   * \warning This <b>is not</b> part of the TagLib public API!
   */
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
 
   class TAGLIB_EXPORT RefCounter
@@ -108,6 +109,7 @@ namespace Strawberry_TagLib::TagLib
   };
 
 }
+}
 
 #endif // DO_NOT_DOCUMENT
 #endif

3rdparty/taglib/toolkit/tstring.cpp

@@ -136,7 +136,8 @@ namespace
   }
 }
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
 class String::StringPrivate : public RefCounter
 {
@@ -713,6 +714,7 @@ void String::detach()
 
 const String::Type String::WCharByteOrder = wcharByteOrder();
 }
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // related non-member functions

3rdparty/taglib/toolkit/tstring.h

@@ -60,7 +60,8 @@
 
 #define TStringToQString(s) QString::fromUtf8(s.toCString(true))
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class StringList;
 
@@ -546,6 +547,8 @@ namespace Strawberry_TagLib::TagLib {
     class StringPrivate;
     StringPrivate *d;
   };
+
+}
 }
 
 /*!

3rdparty/taglib/toolkit/tstringlist.h

@@ -33,7 +33,8 @@
 
 #include <iostream>
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! A list of strings
 
@@ -105,6 +106,7 @@ namespace Strawberry_TagLib::TagLib {
   };
 
 }
+}
 
 /*!
  * \related Strawberry_TagLib::TagLib::StringList

3rdparty/taglib/toolkit/tutils.h

@@ -49,7 +49,8 @@
 #include <cstdarg>
 #include <cstring>
 
-namespace Strawberry_TagLib::TagLib
+namespace Strawberry_TagLib {
+namespace TagLib
 {
   namespace Utils
   {
@@ -237,6 +238,7 @@ namespace Strawberry_TagLib::TagLib
     }
   }
 }
+}
 
 #endif
 

3rdparty/taglib/toolkit/tzlib.h

@@ -32,7 +32,8 @@
 
 #ifndef DO_NOT_DOCUMENT  // tell Doxygen not to document this header
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace zlib {
 
@@ -48,6 +49,7 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 
 #endif