Adapt to changes in c++utilities

aac/aacframe.cpp

@@ -8,13 +8,12 @@
 #include "../exceptions.h"
 
 #include <c++utilities/io/bitreader.h>
-#include <c++utilities/misc/memory.h>
 
 #include <istream>
 #include <limits>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
 
 /*!
  * \file aacframe.cpp

aac/aacframe.h

@@ -462,7 +462,7 @@ private:
     void parseRawDataBlock();
 
     // these fields contain setup information
-    IoUtilities::BitReader m_reader;
+    CppUtilities::BitReader m_reader;
     std::uint8_t m_mpeg4AudioObjectId;
     std::uint8_t m_mpeg4SamplingFrequencyIndex;
     std::uint8_t m_mpeg4ExtensionSamplingFrequencyIndex;

abstractattachment.cpp

@@ -9,7 +9,7 @@
 #include <sstream>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

abstractchapter.cpp

@@ -3,7 +3,7 @@
 #include <sstream>
 
 using namespace std;
-using namespace ChronoUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

abstractchapter.h

@@ -18,8 +18,8 @@ public:
 
     std::uint64_t id() const;
     const std::vector<LocaleAwareString> &names() const;
-    ChronoUtilities::TimeSpan startTime() const;
+    CppUtilities::TimeSpan startTime() const;
-    ChronoUtilities::TimeSpan endTime() const;
+    CppUtilities::TimeSpan endTime() const;
     const std::vector<std::uint64_t> &tracks() const;
     bool isHidden() const;
     bool isEnabled() const;
@@ -37,8 +37,8 @@ protected:
 
     std::uint64_t m_id;
     std::vector<LocaleAwareString> m_names;
-    ChronoUtilities::TimeSpan m_startTime;
+    CppUtilities::TimeSpan m_startTime;
-    ChronoUtilities::TimeSpan m_endTime;
+    CppUtilities::TimeSpan m_endTime;
     std::vector<std::uint64_t> m_tracks;
     bool m_hidden;
     bool m_enabled;
@@ -63,7 +63,7 @@ inline const std::vector<LocaleAwareString> &AbstractChapter::names() const
 /*!
  * \brief Returns the start time if known; otherwise returns a negative time span.
  */
-inline ChronoUtilities::TimeSpan AbstractChapter::startTime() const
+inline CppUtilities::TimeSpan AbstractChapter::startTime() const
 {
     return m_startTime;
 }
@@ -71,7 +71,7 @@ inline ChronoUtilities::TimeSpan AbstractChapter::startTime() const
 /*!
  * \brief Returns the end time if known; otherwise returns a negative time span.
  */
-inline ChronoUtilities::TimeSpan AbstractChapter::endTime() const
+inline CppUtilities::TimeSpan AbstractChapter::endTime() const
 {
     return m_endTime;
 }

abstractcontainer.cpp

@@ -2,9 +2,7 @@
 #include "./diagnostics.h"
 
 using namespace std;
-using namespace ChronoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
-using namespace IoUtilities;
 
 namespace TagParser {
 

abstractcontainer.h

@@ -12,10 +12,10 @@
 
 #include <iostream>
 
-namespace IoUtilities {
+namespace CppUtilities {
 class BinaryReader;
 class BinaryWriter;
-} // namespace IoUtilities
+} // namespace CppUtilities
 
 namespace TagParser {
 
@@ -33,8 +33,8 @@ public:
     std::iostream &stream();
     void setStream(std::iostream &stream);
     std::uint64_t startOffset() const;
-    IoUtilities::BinaryReader &reader();
+    CppUtilities::BinaryReader &reader();
-    IoUtilities::BinaryWriter &writer();
+    CppUtilities::BinaryWriter &writer();
 
     void parseHeader(Diagnostics &diag);
     void parseTags(Diagnostics &diag);
@@ -79,9 +79,9 @@ public:
     void setTitle(const std::string &title, std::size_t segmentIndex = 0);
     virtual bool supportsTitle() const;
     virtual std::size_t segmentCount() const;
-    ChronoUtilities::TimeSpan duration() const;
+    CppUtilities::TimeSpan duration() const;
-    ChronoUtilities::DateTime creationTime() const;
+    CppUtilities::DateTime creationTime() const;
-    ChronoUtilities::DateTime modificationTime() const;
+    CppUtilities::DateTime modificationTime() const;
     std::uint32_t timeScale() const;
 
     virtual void reset();
@@ -102,9 +102,9 @@ protected:
     std::uint64_t m_doctypeVersion;
     std::uint64_t m_doctypeReadVersion;
     std::vector<std::string> m_titles;
-    ChronoUtilities::TimeSpan m_duration;
+    CppUtilities::TimeSpan m_duration;
-    ChronoUtilities::DateTime m_creationTime;
+    CppUtilities::DateTime m_creationTime;
-    ChronoUtilities::DateTime m_modificationTime;
+    CppUtilities::DateTime m_modificationTime;
     std::uint32_t m_timeScale;
 
     bool m_headerParsed;
@@ -117,8 +117,8 @@ protected:
 private:
     std::uint64_t m_startOffset;
     std::iostream *m_stream;
-    IoUtilities::BinaryReader m_reader;
+    CppUtilities::BinaryReader m_reader;
-    IoUtilities::BinaryWriter m_writer;
+    CppUtilities::BinaryWriter m_writer;
 };
 
 /*!
@@ -150,7 +150,7 @@ inline std::uint64_t AbstractContainer::startOffset() const
 /*!
  * \brief Returns the related BinaryReader.
  */
-inline IoUtilities::BinaryReader &AbstractContainer::reader()
+inline CppUtilities::BinaryReader &AbstractContainer::reader()
 {
     return m_reader;
 }
@@ -158,7 +158,7 @@ inline IoUtilities::BinaryReader &AbstractContainer::reader()
 /*!
  * \brief Returns the related BinaryWriter.
  */
-inline IoUtilities::BinaryWriter &AbstractContainer::writer()
+inline CppUtilities::BinaryWriter &AbstractContainer::writer()
 {
     return m_writer;
 }
@@ -273,7 +273,7 @@ inline void AbstractContainer::setTitle(const std::string &title, std::size_t se
 /*!
  * \brief Returns the duration of the file if known; otherwise returns a time span of zero ticks.
  */
-inline ChronoUtilities::TimeSpan AbstractContainer::duration() const
+inline CppUtilities::TimeSpan AbstractContainer::duration() const
 {
     return m_duration;
 }
@@ -281,7 +281,7 @@ inline ChronoUtilities::TimeSpan AbstractContainer::duration() const
 /*!
  * \brief Returns the creation time of the file if known; otherwise the returned date time is null.
  */
-inline ChronoUtilities::DateTime AbstractContainer::creationTime() const
+inline CppUtilities::DateTime AbstractContainer::creationTime() const
 {
     return m_creationTime;
 }
@@ -289,7 +289,7 @@ inline ChronoUtilities::DateTime AbstractContainer::creationTime() const
 /*!
  * \brief Returns the modification time of the file if known; otherwise the returned date time is null.
  */
-inline ChronoUtilities::DateTime AbstractContainer::modificationTime() const
+inline CppUtilities::DateTime AbstractContainer::modificationTime() const
 {
     return m_modificationTime;
 }

abstracttrack.cpp

@@ -7,9 +7,7 @@
 #include "mpegaudio/mpegaudioframe.h"
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
-using namespace ChronoUtilities;
-using namespace IoUtilities;
 
 namespace TagParser {
 

abstracttrack.h

@@ -49,8 +49,8 @@ public:
     void setInputStream(std::istream &stream);
     std::ostream &outputStream();
     void setOutputStream(std::ostream &stream);
-    IoUtilities::BinaryReader &reader();
+    CppUtilities::BinaryReader &reader();
-    IoUtilities::BinaryWriter &writer();
+    CppUtilities::BinaryWriter &writer();
     std::uint64_t startOffset() const;
     MediaFormat format() const;
     double version() const;
@@ -66,11 +66,11 @@ public:
     void setId(std::uint64_t id);
     const std::string name() const;
     void setName(const std::string &name);
-    const ChronoUtilities::TimeSpan &duration() const;
+    const CppUtilities::TimeSpan &duration() const;
     double bitrate() const;
     double maxBitrate() const;
-    const ChronoUtilities::DateTime &creationTime() const;
+    const CppUtilities::DateTime &creationTime() const;
-    const ChronoUtilities::DateTime &modificationTime() const;
+    const CppUtilities::DateTime &modificationTime() const;
     const std::string &language() const;
     void setLanguage(const std::string &language);
     std::uint32_t samplingFrequency() const;
@@ -117,8 +117,8 @@ protected:
 
     std::istream *m_istream;
     std::ostream *m_ostream;
-    IoUtilities::BinaryReader m_reader;
+    CppUtilities::BinaryReader m_reader;
-    IoUtilities::BinaryWriter m_writer;
+    CppUtilities::BinaryWriter m_writer;
     std::uint64_t m_startOffset;
     bool m_headerValid;
     MediaFormat m_format;
@@ -130,11 +130,11 @@ protected:
     std::uint32_t m_trackNumber;
     std::uint64_t m_id;
     std::string m_name;
-    ChronoUtilities::TimeSpan m_duration;
+    CppUtilities::TimeSpan m_duration;
     double m_bitrate;
     double m_maxBitrate;
-    ChronoUtilities::DateTime m_creationTime;
+    CppUtilities::DateTime m_creationTime;
-    ChronoUtilities::DateTime m_modificationTime;
+    CppUtilities::DateTime m_modificationTime;
     std::string m_language;
     std::uint32_t m_samplingFrequency;
     std::uint32_t m_extensionSamplingFrequency;
@@ -211,7 +211,7 @@ inline void AbstractTrack::setOutputStream(std::ostream &stream)
  * \remarks The returned reader is internally used when reading binary data
  *          from the associated stream. Do not change its byte order.
  */
-inline IoUtilities::BinaryReader &AbstractTrack::reader()
+inline CppUtilities::BinaryReader &AbstractTrack::reader()
 {
     return m_reader;
 }
@@ -222,7 +222,7 @@ inline IoUtilities::BinaryReader &AbstractTrack::reader()
  * \remarks The returned writer is internally used when writing binary data
  *          to the associated stream. Do not change its byte order.
  */
-inline IoUtilities::BinaryWriter &AbstractTrack::writer()
+inline CppUtilities::BinaryWriter &AbstractTrack::writer()
 {
     return m_writer;
 }
@@ -368,7 +368,7 @@ inline void AbstractTrack::setName(const std::string &name)
 /*!
  * \brief Returns the duration if known; otherwise returns a TimeSpan of zero ticks.
  */
-inline const ChronoUtilities::TimeSpan &AbstractTrack::duration() const
+inline const CppUtilities::TimeSpan &AbstractTrack::duration() const
 {
     return m_duration;
 }
@@ -392,7 +392,7 @@ inline double AbstractTrack::maxBitrate() const
 /*!
  * \brief Returns the creation time if known; otherwise returns a DateTime of zero ticks.
  */
-inline const ChronoUtilities::DateTime &AbstractTrack::creationTime() const
+inline const CppUtilities::DateTime &AbstractTrack::creationTime() const
 {
     return m_creationTime;
 }
@@ -400,7 +400,7 @@ inline const ChronoUtilities::DateTime &AbstractTrack::creationTime() const
 /*!
  * \brief Returns the time of the last modification if known; otherwise returns a DateTime of zero ticks.
  */
-inline const ChronoUtilities::DateTime &AbstractTrack::modificationTime() const
+inline const CppUtilities::DateTime &AbstractTrack::modificationTime() const
 {
     return m_modificationTime;
 }

adts/adtsframe.cpp

@@ -5,7 +5,6 @@
 #include <c++utilities/io/binaryreader.h>
 
 using namespace std;
-using namespace IoUtilities;
 
 namespace TagParser {
 
@@ -19,7 +18,7 @@ namespace TagParser {
  * \throws Throws InvalidDataException if the data read from the stream is
  *         no valid frame header.
  */
-void AdtsFrame::parseHeader(IoUtilities::BinaryReader &reader)
+void AdtsFrame::parseHeader(CppUtilities::BinaryReader &reader)
 {
     m_header1 = reader.readUInt16BE();
     // check whether syncword is present

adts/adtsframe.h

@@ -5,7 +5,7 @@
 
 #include <cstdint>
 
-namespace IoUtilities {
+namespace CppUtilities {
 class BinaryReader;
 }
 
@@ -15,7 +15,7 @@ class TAG_PARSER_EXPORT AdtsFrame {
 public:
     constexpr AdtsFrame();
 
-    void parseHeader(IoUtilities::BinaryReader &reader);
+    void parseHeader(CppUtilities::BinaryReader &reader);
 
     constexpr bool isValid() const;
     constexpr bool isMpeg4() const;

aspectratio.h

@@ -65,7 +65,7 @@ constexpr bool AspectRatio::isExtended() const
  */
 inline std::string AspectRatio::toString() const
 {
-    return ConversionUtilities::argsToString(numerator, " : ", denominator);
+    return CppUtilities::argsToString(numerator, " : ", denominator);
 }
 
 } // namespace TagParser

av1/av1configuration.cpp

@@ -6,7 +6,7 @@
 #include <c++utilities/io/binaryreader.h>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

av1/av1configuration.h

@@ -5,7 +5,7 @@
 
 #include <cstdint>
 
-namespace IoUtilities {
+namespace CppUtilities {
 class BinaryReader;
 }
 
@@ -26,7 +26,7 @@ struct TAG_PARSER_EXPORT Av1Configuration {
     std::uint8_t chromaSubsamplingY;
     std::uint16_t chromaSamplePosition;
 
-    void parse(IoUtilities::BinaryReader &reader, std::uint64_t maxSize, Diagnostics &diag);
+    void parse(CppUtilities::BinaryReader &reader, std::uint64_t maxSize, Diagnostics &diag);
 };
 
 /*!

avc/avcconfiguration.cpp

@@ -9,7 +9,7 @@
 #include <limits>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

avc/avcconfiguration.h

@@ -19,7 +19,7 @@ struct TAG_PARSER_EXPORT AvcConfiguration {
     std::vector<SpsInfo> spsInfos;
     std::vector<PpsInfo> ppsInfos;
 
-    void parse(IoUtilities::BinaryReader &reader, std::uint64_t maxSize, Diagnostics &diag);
+    void parse(CppUtilities::BinaryReader &reader, std::uint64_t maxSize, Diagnostics &diag);
 };
 
 /*!

avc/avcinfo.cpp

@@ -9,7 +9,7 @@
 #include <unordered_map>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 
@@ -262,7 +262,7 @@ void PpsInfo::parse(BinaryReader &reader, std::uint32_t maxSize)
 /*!
  * \brief Parses HRD parameters.
  */
-void HrdParameters::parse(IoUtilities::BitReader &reader)
+void HrdParameters::parse(CppUtilities::BitReader &reader)
 {
     cpbCount = reader.readUnsignedExpGolombCodedBits<ugolomb>() + 1;
     bitRateScale = reader.readBits<std::uint8_t>(4);

avc/avcinfo.h

@@ -5,7 +5,7 @@
 #include "../margin.h"
 #include "../size.h"
 
-namespace IoUtilities {
+namespace CppUtilities {
 class BinaryReader;
 class BitReader;
 } // namespace IoUtilities
@@ -54,7 +54,7 @@ struct TAG_PARSER_EXPORT HrdParameters {
     std::uint8_t cpbOutputDelayLength;
     std::uint8_t timeOffsetLength;
 
-    void parse(IoUtilities::BitReader &reader);
+    void parse(CppUtilities::BitReader &reader);
 };
 
 constexpr HrdParameters::HrdParameters()
@@ -94,7 +94,7 @@ struct TAG_PARSER_EXPORT SpsInfo {
     std::uint8_t pictureStructPresent;
     std::uint16_t size;
 
-    void parse(IoUtilities::BinaryReader &reader, std::uint32_t maxSize);
+    void parse(CppUtilities::BinaryReader &reader, std::uint32_t maxSize);
 };
 
 constexpr SpsInfo::SpsInfo()
@@ -125,7 +125,7 @@ struct TAG_PARSER_EXPORT PpsInfo {
     std::uint8_t picOrderPresent;
     std::uint16_t size;
 
-    void parse(IoUtilities::BinaryReader &reader, std::uint32_t maxSize);
+    void parse(CppUtilities::BinaryReader &reader, std::uint32_t maxSize);
 };
 
 constexpr PpsInfo::PpsInfo()

avi/bitmapinfoheader.cpp

@@ -2,7 +2,7 @@
 
 #include <c++utilities/io/binaryreader.h>
 
-using namespace IoUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

avi/bitmapinfoheader.h

@@ -5,7 +5,7 @@
 
 #include <cstdint>
 
-namespace IoUtilities {
+namespace CppUtilities {
 class BinaryReader;
 }
 
@@ -15,7 +15,7 @@ class TAG_PARSER_EXPORT BitmapInfoHeader {
 public:
     BitmapInfoHeader();
 
-    void parse(IoUtilities::BinaryReader &reader);
+    void parse(CppUtilities::BinaryReader &reader);
 
     std::uint32_t size;
     std::uint32_t width;

backuphelper.cpp

@@ -17,8 +17,7 @@
 #include <string>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
-using namespace IoUtilities;
 
 namespace TagParser {
 

backuphelper.h

@@ -13,11 +13,11 @@ class Diagnostics;
 namespace BackupHelper {
 
 TAG_PARSER_EXPORT void restoreOriginalFileFromBackupFile(const std::string &originalPath, const std::string &backupPath,
-    IoUtilities::NativeFileStream &originalStream, IoUtilities::NativeFileStream &backupStream);
+    CppUtilities::NativeFileStream &originalStream, CppUtilities::NativeFileStream &backupStream);
 TAG_PARSER_EXPORT void createBackupFile(const std::string &backupDir, const std::string &originalPath, std::string &backupPath,
-    IoUtilities::NativeFileStream &originalStream, IoUtilities::NativeFileStream &backupStream);
+    CppUtilities::NativeFileStream &originalStream, CppUtilities::NativeFileStream &backupStream);
 TAG_PARSER_EXPORT void handleFailureAfterFileModified(MediaFileInfo &mediaFileInfo, const std::string &backupPath,
-    IoUtilities::NativeFileStream &outputStream, IoUtilities::NativeFileStream &backupStream, Diagnostics &diag,
+    CppUtilities::NativeFileStream &outputStream, CppUtilities::NativeFileStream &backupStream, Diagnostics &diag,
     const std::string &context = "making file");
 
 } // namespace BackupHelper

basicfileinfo.cpp

@@ -3,7 +3,7 @@
 #include <c++utilities/conversion/stringconversion.h>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
 
 /*!
  * \brief Contains all classes and functions of the TagInfo library.

basicfileinfo.h

@@ -26,8 +26,8 @@ public:
     bool isReadOnly() const;
     void close();
     void invalidate();
-    IoUtilities::NativeFileStream &stream();
+    CppUtilities::NativeFileStream &stream();
-    const IoUtilities::NativeFileStream &stream() const;
+    const CppUtilities::NativeFileStream &stream() const;
 
     // methods to get, set path (components)
     const std::string &path() const;
@@ -52,7 +52,7 @@ protected:
 
 private:
     std::string m_path;
-    IoUtilities::NativeFileStream m_file;
+    CppUtilities::NativeFileStream m_file;
     std::uint64_t m_size;
     bool m_readOnly;
 };
@@ -78,7 +78,7 @@ inline bool BasicFileInfo::isReadOnly() const
 /*!
  * \brief Returns the std::fstream for the current instance.
  */
-inline IoUtilities::NativeFileStream &BasicFileInfo::stream()
+inline CppUtilities::NativeFileStream &BasicFileInfo::stream()
 {
     return m_file;
 }
@@ -86,7 +86,7 @@ inline IoUtilities::NativeFileStream &BasicFileInfo::stream()
 /*!
  * \brief Returns the std::fstream for the current instance.
  */
-inline const IoUtilities::NativeFileStream &BasicFileInfo::stream() const
+inline const CppUtilities::NativeFileStream &BasicFileInfo::stream() const
 {
     return m_file;
 }
@@ -139,7 +139,7 @@ inline void BasicFileInfo::reportPathChanged(const std::string &newPath)
  */
 inline const char *BasicFileInfo::pathForOpen(const std::string &url)
 {
-    return ConversionUtilities::startsWith(url, "file:/") ? url.data() + 6 : url.data();
+    return CppUtilities::startsWith(url, "file:/") ? url.data() + 6 : url.data();
 }
 
 } // namespace TagParser

diagnostics.h

@@ -49,7 +49,7 @@ public:
     const char *levelName() const;
     const std::string &message() const;
     const std::string &context() const;
-    const ChronoUtilities::DateTime &creationTime() const;
+    const CppUtilities::DateTime &creationTime() const;
     bool operator==(const DiagMessage &other) const;
 
     static std::string formatList(const std::vector<std::string> &values);
@@ -58,7 +58,7 @@ private:
     DiagLevel m_level;
     std::string m_message;
     std::string m_context;
-    ChronoUtilities::DateTime m_creationTime;
+    CppUtilities::DateTime m_creationTime;
 };
 
 /*!
@@ -68,7 +68,7 @@ inline DiagMessage::DiagMessage(DiagLevel level, const std::string &message, con
     : m_level(level)
     , m_message(message)
     , m_context(context)
-    , m_creationTime(ChronoUtilities::DateTime::gmtNow())
+    , m_creationTime(CppUtilities::DateTime::gmtNow())
 {
 }
 
@@ -79,7 +79,7 @@ inline DiagMessage::DiagMessage(DiagLevel level, std::string &&message, const st
     : m_level(level)
     , m_message(message)
     , m_context(context)
-    , m_creationTime(ChronoUtilities::DateTime::gmtNow())
+    , m_creationTime(CppUtilities::DateTime::gmtNow())
 {
 }
 
@@ -90,7 +90,7 @@ inline DiagMessage::DiagMessage(DiagLevel level, const std::string &message, std
     : m_level(level)
     , m_message(message)
     , m_context(context)
-    , m_creationTime(ChronoUtilities::DateTime::gmtNow())
+    , m_creationTime(CppUtilities::DateTime::gmtNow())
 {
 }
 
@@ -101,7 +101,7 @@ inline DiagMessage::DiagMessage(DiagLevel level, std::string &&message, std::str
     : m_level(level)
     , m_message(message)
     , m_context(context)
-    , m_creationTime(ChronoUtilities::DateTime::gmtNow())
+    , m_creationTime(CppUtilities::DateTime::gmtNow())
 {
 }
 
@@ -140,7 +140,7 @@ inline const std::string &DiagMessage::context() const
 /*!
  * \brief Returns the creation time (using GMT timezone).
  */
-inline const ChronoUtilities::DateTime &DiagMessage::creationTime() const
+inline const CppUtilities::DateTime &DiagMessage::creationTime() const
 {
     return m_creationTime;
 }

flac/flacmetadata.cpp

@@ -12,8 +12,7 @@
 #include <memory>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
-using namespace IoUtilities;
 
 namespace TagParser {
 

flac/flacstream.cpp

@@ -14,9 +14,7 @@
 #include <sstream>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
-using namespace ChronoUtilities;
 
 namespace TagParser {
 

flac/flactooggmappingheader.cpp

@@ -7,7 +7,7 @@
 #include <c++utilities/conversion/binaryconversion.h>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

genericfileelement.h

@@ -13,11 +13,9 @@
 #include <memory>
 #include <string>
 
-namespace IoUtilities {
+namespace CppUtilities {
-
 class BinaryReader;
 class BinaryWriter;
-
 } // namespace IoUtilities
 
 namespace TagParser {
@@ -73,8 +71,8 @@ public:
     ContainerType &container();
     const ContainerType &container() const;
     std::iostream &stream();
-    IoUtilities::BinaryReader &reader();
+    CppUtilities::BinaryReader &reader();
-    IoUtilities::BinaryWriter &writer();
+    CppUtilities::BinaryWriter &writer();
     std::uint64_t startOffset() const;
     std::uint64_t relativeStartOffset() const;
     const IdentifierType &id() const;
@@ -244,7 +242,7 @@ template <class ImplementationType> inline std::iostream &GenericFileElement<Imp
 /*!
  * \brief Returns the related BinaryReader.
  */
-template <class ImplementationType> inline IoUtilities::BinaryReader &GenericFileElement<ImplementationType>::reader()
+template <class ImplementationType> inline CppUtilities::BinaryReader &GenericFileElement<ImplementationType>::reader()
 {
     return m_container->reader();
 }
@@ -252,7 +250,7 @@ template <class ImplementationType> inline IoUtilities::BinaryReader &GenericFil
 /*!
  * \brief Returns the related BinaryWriter.
  */
-template <class ImplementationType> inline IoUtilities::BinaryWriter &GenericFileElement<ImplementationType>::writer()
+template <class ImplementationType> inline CppUtilities::BinaryWriter &GenericFileElement<ImplementationType>::writer()
 {
     return m_container->writer();
 }
@@ -933,7 +931,7 @@ void GenericFileElement<ImplementationType>::copyInternal(
     }
     auto &stream = container().stream();
     stream.seekg(startOffset);
-    IoUtilities::CopyHelper<0x2000> copyHelper;
+    CppUtilities::CopyHelper<0x2000> copyHelper;
     if (progress) {
         copyHelper.callbackCopy(stream, targetStream, bytesToCopy, std::bind(&AbortableProgressFeedback::isAborted, std::ref(progress)),
             std::bind(&AbortableProgressFeedback::updateStepPercentageFromFraction, std::ref(progress), std::placeholders::_1));

id3/id3v1tag.cpp

@@ -11,7 +11,7 @@
 #include <initializer_list>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 
@@ -276,7 +276,7 @@ void Id3v1Tag::readValue(TagValue &value, size_t maxLength, const char *buffer)
         --end;
         --maxLength;
     }
-    if (maxLength >= 3 && ConversionUtilities::BE::toUInt24(buffer) == 0x00EFBBBF) {
+    if (maxLength >= 3 && BE::toUInt24(buffer) == 0x00EFBBBF) {
         value.assignData(buffer + 3, maxLength - 3, TagDataType::Text, TagTextEncoding::Utf8);
     } else {
         value.assignData(buffer, maxLength, TagDataType::Text, TagTextEncoding::Latin1);

id3/id3v2frame.cpp

@@ -17,10 +17,7 @@
 #include <memory>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
-using namespace ChronoUtilities;
-using namespace IoUtilities;
-
 namespace TagParser {
 
 namespace Id3v2TextEncodingBytes {
@@ -537,7 +534,7 @@ Id3v2FrameMaker::Id3v2FrameMaker(Id3v2Frame &frame, std::uint8_t version, Diagno
                         diag.emplace_back(DiagLevel::Critical, argsToString("Assigned duration \"", duration.toString(), "\" is negative."), context);
                         throw InvalidDataException();
                     }
-                    substrings.emplace_back(ConversionUtilities::numberToString(static_cast<std::uint64_t>(duration.totalMilliseconds())));
+                    substrings.emplace_back(numberToString(static_cast<std::uint64_t>(duration.totalMilliseconds())));
                 }
 
             } else {
@@ -573,7 +570,7 @@ Id3v2FrameMaker::Id3v2FrameMaker(Id3v2Frame &frame, std::uint8_t version, Diagno
                     if ((value->type() == TagDataType::StandardGenreIndex)
                         && ((version >= 3 && m_frameId == Id3v2FrameIds::lGenre) || (version < 3 && m_frameId == Id3v2FrameIds::sGenre))) {
                         // make standard genere index
-                        substrings.emplace_back(ConversionUtilities::numberToString(value->toStandardGenreIndex()));
+                        substrings.emplace_back(numberToString(value->toStandardGenreIndex()));
 
                     } else {
                         // make other text frame
@@ -775,7 +772,7 @@ tuple<const char *, size_t, const char *> Id3v2Frame::parseSubstring(
     case TagTextEncoding::Unspecified:
     case TagTextEncoding::Latin1:
     case TagTextEncoding::Utf8: {
-        if ((bufferSize >= 3) && (ConversionUtilities::BE::toUInt24(buffer) == 0x00EFBBBF)) {
+        if ((bufferSize >= 3) && (BE::toUInt24(buffer) == 0x00EFBBBF)) {
             if (encoding == TagTextEncoding::Latin1) {
                 diag.emplace_back(DiagLevel::Critical, "Denoted character set is Latin-1 but an UTF-8 BOM is present - assuming UTF-8.",
                     "parsing frame " + idToString());
@@ -801,7 +798,7 @@ tuple<const char *, size_t, const char *> Id3v2Frame::parseSubstring(
     case TagTextEncoding::Utf16BigEndian:
     case TagTextEncoding::Utf16LittleEndian: {
         if (bufferSize >= 2) {
-            switch (ConversionUtilities::LE::toUInt16(buffer)) {
+            switch (LE::toUInt16(buffer)) {
             case 0xFEFF:
                 if (encoding == TagTextEncoding::Utf16BigEndian) {
                     diag.emplace_back(DiagLevel::Critical,
@@ -869,14 +866,14 @@ void Id3v2Frame::parseBom(const char *buffer, std::size_t maxSize, TagTextEncodi
     switch (encoding) {
     case TagTextEncoding::Utf16BigEndian:
     case TagTextEncoding::Utf16LittleEndian:
-        if ((maxSize >= 2) && (ConversionUtilities::BE::toUInt16(buffer) == 0xFFFE)) {
+        if ((maxSize >= 2) && (BE::toUInt16(buffer) == 0xFFFE)) {
             encoding = TagTextEncoding::Utf16LittleEndian;
-        } else if ((maxSize >= 2) && (ConversionUtilities::BE::toUInt16(buffer) == 0xFEFF)) {
+        } else if ((maxSize >= 2) && (BE::toUInt16(buffer) == 0xFEFF)) {
             encoding = TagTextEncoding::Utf16BigEndian;
         }
         break;
     default:
-        if ((maxSize >= 3) && (ConversionUtilities::BE::toUInt24(buffer) == 0x00EFBBBF)) {
+        if ((maxSize >= 3) && (BE::toUInt24(buffer) == 0x00EFBBBF)) {
             encoding = TagTextEncoding::Utf8;
             diag.emplace_back(DiagLevel::Warning, "UTF-8 byte order mark found in text frame.", "parsing byte oder mark of frame " + idToString());
         }
@@ -1021,7 +1018,7 @@ void Id3v2Frame::makeEncodingAndData(
         // allocate buffer
         buffer = make_unique<char[]>(bufferSize = static_cast<std::uint32_t>(1 + 2 + dataSize + 2));
         buffer[0] = static_cast<char>(makeTextEncodingByte(encoding)); // set text encoding byte
-        ConversionUtilities::LE::getBytes(
+        CppUtilities::LE::getBytes(
             encoding == TagTextEncoding::Utf16LittleEndian ? static_cast<std::uint16_t>(0xFEFF) : static_cast<std::uint16_t>(0xFFFE),
             buffer.get() + 1);
         bufferDataAddress = buffer.get() + 3;
@@ -1044,10 +1041,10 @@ size_t Id3v2Frame::makeBom(char *buffer, TagTextEncoding encoding)
 {
     switch (encoding) {
     case TagTextEncoding::Utf16LittleEndian:
-        ConversionUtilities::LE::getBytes(static_cast<std::uint16_t>(0xFEFF), buffer);
+        LE::getBytes(static_cast<std::uint16_t>(0xFEFF), buffer);
         return 2;
     case TagTextEncoding::Utf16BigEndian:
-        ConversionUtilities::BE::getBytes(static_cast<std::uint16_t>(0xFEFF), buffer);
+        BE::getBytes(static_cast<std::uint16_t>(0xFEFF), buffer);
         return 2;
     default:
         return 0;
@@ -1154,6 +1151,7 @@ void Id3v2Frame::makePicture(std::unique_ptr<char[]> &buffer, std::uint32_t &buf
     if (mimeTypeSize == string::npos) {
         mimeTypeSize = picture.mimeType().length();
     }
+
     // calculate needed buffer size and create buffer
     // note: encoding byte + mime type size + 0 byte + picture type byte + description size + 1 or 4 null bytes (depends on encoding)                                                                                       + data size
     const auto requiredBufferSize = 1 + mimeTypeSize + 1 + 1 + descriptionSize
@@ -1165,13 +1163,17 @@ void Id3v2Frame::makePicture(std::unique_ptr<char[]> &buffer, std::uint32_t &buf
     }
     buffer = make_unique<char[]>(bufferSize = static_cast<uint32_t>(requiredBufferSize));
     char *offset = buffer.get();
+
     // write encoding byte
     *offset = static_cast<char>(makeTextEncodingByte(descriptionEncoding));
+
     // write mime type
     picture.mimeType().copy(++offset, mimeTypeSize);
+
     *(offset += mimeTypeSize) = 0x00; // terminate mime type
     // write picture type
     *(++offset) = static_cast<char>(typeInfo);
+
     // write description
     offset += makeBom(offset + 1, descriptionEncoding);
     if (convertedDescription.first) {
@@ -1183,6 +1185,7 @@ void Id3v2Frame::makePicture(std::unique_ptr<char[]> &buffer, std::uint32_t &buf
     if (descriptionEncoding == TagTextEncoding::Utf16BigEndian || descriptionEncoding == TagTextEncoding::Utf16LittleEndian) {
         *(++offset) = 0x00;
     }
+
     // write actual data
     copy(picture.dataPointer(), picture.dataPointer() + picture.dataSize(), ++offset);
 }
@@ -1193,6 +1196,7 @@ void Id3v2Frame::makePicture(std::unique_ptr<char[]> &buffer, std::uint32_t &buf
 void Id3v2Frame::makeComment(unique_ptr<char[]> &buffer, std::uint32_t &bufferSize, const TagValue &comment, std::uint8_t version, Diagnostics &diag)
 {
     static const string context("making comment frame");
+
     // check whether type and other values are valid
     TagTextEncoding encoding = comment.dataEncoding();
     if (!comment.description().empty() && encoding != comment.descriptionEncoding()) {
@@ -1216,6 +1220,7 @@ void Id3v2Frame::makeComment(unique_ptr<char[]> &buffer, std::uint32_t &bufferSi
         convertedDescription = convertUtf8ToUtf16LE(comment.description().data(), descriptionSize);
         descriptionSize = convertedDescription.second;
     }
+
     // calculate needed buffer size and create buffer
     // note: encoding byte + language + description size + actual data size + BOMs and termination
     const auto data = comment.toString(encoding);
@@ -1227,12 +1232,15 @@ void Id3v2Frame::makeComment(unique_ptr<char[]> &buffer, std::uint32_t &bufferSi
     }
     buffer = make_unique<char[]>(bufferSize = static_cast<uint32_t>(requiredBufferSize));
     char *offset = buffer.get();
+
     // write encoding
     *offset = static_cast<char>(makeTextEncodingByte(encoding));
+
     // write language
     for (unsigned int i = 0; i < 3; ++i) {
         *(++offset) = (lng.length() > i) ? lng[i] : 0x00;
     }
+
     // write description
     offset += makeBom(offset + 1, encoding);
     if (convertedDescription.first) {
@@ -1245,6 +1253,7 @@ void Id3v2Frame::makeComment(unique_ptr<char[]> &buffer, std::uint32_t &bufferSi
     if (encoding == TagTextEncoding::Utf16BigEndian || encoding == TagTextEncoding::Utf16LittleEndian) {
         *(++offset) = 0x00;
     }
+
     // write actual data
     offset += makeBom(offset + 1, encoding);
     data.copy(++offset, data.size());

id3/id3v2frame.h

@@ -23,7 +23,7 @@ class TAG_PARSER_EXPORT Id3v2FrameMaker {
     friend class Id3v2Frame;
 
 public:
-    void make(IoUtilities::BinaryWriter &writer);
+    void make(CppUtilities::BinaryWriter &writer);
     const Id3v2Frame &field() const;
     const std::unique_ptr<char[]> &data() const;
     std::uint32_t dataSize() const;
@@ -92,9 +92,9 @@ public:
     Id3v2Frame(const IdentifierType &id, const TagValue &value, std::uint8_t group = 0, std::uint16_t flag = 0);
 
     // parsing/making
-    void parse(IoUtilities::BinaryReader &reader, std::uint32_t version, std::uint32_t maximalSize, Diagnostics &diag);
+    void parse(CppUtilities::BinaryReader &reader, std::uint32_t version, std::uint32_t maximalSize, Diagnostics &diag);
     Id3v2FrameMaker prepareMaking(std::uint8_t version, Diagnostics &diag);
-    void make(IoUtilities::BinaryWriter &writer, std::uint8_t version, Diagnostics &diag);
+    void make(CppUtilities::BinaryWriter &writer, std::uint8_t version, Diagnostics &diag);
 
     // member access
     const std::vector<TagValue> &additionalValues() const;
@@ -338,11 +338,11 @@ inline Id3v2Frame::IdentifierType Id3v2Frame::fieldIdFromString(const char *idSt
 {
     switch (idStringSize != std::string::npos ? idStringSize : std::strlen(idString)) {
     case 3:
-        return ConversionUtilities::BE::toUInt24(idString);
+        return CppUtilities::BE::toUInt24(idString);
     case 4:
-        return ConversionUtilities::BE::toUInt32(idString);
+        return CppUtilities::BE::toUInt32(idString);
     default:
-        throw ConversionUtilities::ConversionException("ID3v2 ID must be 3 or 4 chars");
+        throw CppUtilities::ConversionException("ID3v2 ID must be 3 or 4 chars");
     }
 }
 
@@ -351,7 +351,7 @@ inline Id3v2Frame::IdentifierType Id3v2Frame::fieldIdFromString(const char *idSt
  */
 inline std::string Id3v2Frame::fieldIdToString(Id3v2Frame::IdentifierType id)
 {
-    return ConversionUtilities::interpretIntegerAsString<std::uint32_t>(id, Id3v2FrameIds::isLongId(id) ? 0 : 1);
+    return CppUtilities::interpretIntegerAsString<std::uint32_t>(id, Id3v2FrameIds::isLongId(id) ? 0 : 1);
 }
 
 } // namespace TagParser

id3/id3v2tag.cpp

@@ -10,8 +10,7 @@
 #include <iostream>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
 
 namespace TagParser {
 

ivf/ivfframe.cpp

@@ -5,7 +5,7 @@
 #include <c++utilities/io/binaryreader.h>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 
@@ -18,7 +18,7 @@ namespace TagParser {
 /*!
  * \brief Parses the header read using the specified \a reader.
  */
-void IvfFrame::parseHeader(IoUtilities::BinaryReader &reader, Diagnostics &diag)
+void IvfFrame::parseHeader(CppUtilities::BinaryReader &reader, Diagnostics &diag)
 {
     VAR_UNUSED(diag)
     startOffset = static_cast<std::uint64_t>(reader.stream()->tellg());

ivf/ivfframe.h

@@ -3,7 +3,7 @@
 
 #include "../diagnostics.h"
 
-namespace IoUtilities {
+namespace CppUtilities {
 class BinaryReader;
 }
 
@@ -12,7 +12,7 @@ namespace TagParser {
 class TAG_PARSER_EXPORT IvfFrame {
 public:
     constexpr IvfFrame();
-    void parseHeader(IoUtilities::BinaryReader &reader, Diagnostics &diag);
+    void parseHeader(CppUtilities::BinaryReader &reader, Diagnostics &diag);
 
 private:
     std::uint64_t startOffset;

ivf/ivfstream.cpp

@@ -10,8 +10,7 @@
 #include <string>
 
 using namespace std;
-using namespace ChronoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
 
 namespace TagParser {
 

margin.h

@@ -122,7 +122,7 @@ constexpr bool Margin::isNull() const
  */
 inline std::string Margin::toString() const
 {
-    return ConversionUtilities::argsToString("top: ", m_top, "; left: ", m_left, "; bottom: ", m_bottom, "; right: ", m_right);
+    return CppUtilities::argsToString("top: ", m_top, "; left: ", m_left, "; bottom: ", m_bottom, "; right: ", m_right);
 }
 
 } // namespace TagParser

matroska/ebmlelement.cpp

@@ -17,8 +17,7 @@
 #include <string>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
 
 namespace TagParser {
 
@@ -173,7 +172,7 @@ void EbmlElement::internalParse(Diagnostics &diag)
             reader().read(buf + (maximumSizeLengthSupported() - m_sizeLength), m_sizeLength);
             // xor the first byte in buffer which has been read from the file with mask
             *(buf + (maximumSizeLengthSupported() - m_sizeLength)) ^= mask;
-            m_dataSize = ConversionUtilities::BE::toUInt64(buf);
+            m_dataSize = BE::toUInt64(buf);
             // check if element is truncated
             if (totalSize() > maxTotalSize()) {
                 if (m_idLength + m_sizeLength > maxTotalSize()) { // header truncated

matroska/ebmlelement.h

@@ -70,7 +70,7 @@ private:
  */
 inline std::string EbmlElement::idToString() const
 {
-    using namespace ConversionUtilities;
+    using namespace CppUtilities;
     const char *const name = matroskaIdName(id());
     if (*name) {
         return argsToString('0', 'x', numberToString(id(), 16), ' ', '\"', name, '\"');

matroska/matroskaattachment.cpp

@@ -9,8 +9,7 @@
 #include <memory>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
-using namespace IoUtilities;
 
 namespace TagParser {
 

matroska/matroskachapter.cpp

@@ -9,8 +9,7 @@
 #include <memory>
 
 using namespace std;
-using namespace ChronoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
 
 namespace TagParser {
 

matroska/matroskacontainer.cpp

@@ -26,9 +26,7 @@
 
 using namespace std;
 using namespace std::placeholders;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
-using namespace ChronoUtilities;
 
 namespace TagParser {
 

matroska/matroskacues.cpp

@@ -4,7 +4,7 @@
 #include <c++utilities/conversion/binaryconversion.h>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

matroska/matroskaeditionentry.cpp

@@ -11,7 +11,7 @@
 #include <string>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

matroska/matroskaseekinfo.cpp

@@ -10,7 +10,7 @@
 #include <string>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

matroska/matroskatag.cpp

@@ -8,7 +8,7 @@
 #include <stdexcept>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

matroska/matroskatagfield.cpp

@@ -9,8 +9,7 @@
 #include <memory>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
 
 namespace TagParser {
 

matroska/matroskatrack.cpp

@@ -19,7 +19,7 @@
 #include <c++utilities/conversion/stringconversion.h>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

mediafileinfo.cpp

@@ -49,9 +49,7 @@
 
 using namespace std;
 using namespace std::placeholders;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
-using namespace ChronoUtilities;
 
 /*!
  * \namespace IoUtilities
@@ -860,7 +858,7 @@ bool MediaFileInfo::hasTracksOfType(MediaType type) const
  *
  * \sa parseTracks()
  */
-ChronoUtilities::TimeSpan MediaFileInfo::duration() const
+CppUtilities::TimeSpan MediaFileInfo::duration() const
 {
     if (m_container) {
         return m_container->duration();

mediafileinfo.h

@@ -28,8 +28,8 @@ class VorbisComment;
 class Diagnostics;
 class AbortableProgressFeedback;
 
-DECLARE_ENUM_CLASS(MediaType, unsigned int);
+enum class MediaType : unsigned int;
-DECLARE_ENUM_CLASS(TagType, unsigned int);
+enum class TagType : unsigned int;
 
 /*!
  * \brief The ParsingStatus enum specifies whether a certain part of the file (tracks, tags, ...) has
@@ -86,7 +86,7 @@ public:
     std::size_t trackCount() const;
     std::vector<AbstractTrack *> tracks() const;
     bool hasTracksOfType(TagParser::MediaType type) const;
-    ChronoUtilities::TimeSpan duration() const;
+    CppUtilities::TimeSpan duration() const;
     double overallAverageBitrate() const;
     std::unordered_set<std::string> availableLanguages(TagParser::MediaType type = TagParser::MediaType::Audio) const;
     std::string technicalSummary() const;

mp4/mp4atom.cpp

@@ -14,8 +14,7 @@
 #include <sstream>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
 
 namespace TagParser {
 

mp4/mp4atom.h

@@ -49,7 +49,7 @@ public:
     static void seekBackAndWriteAtomSize(std::ostream &stream, const std::ostream::pos_type &startOffset, Diagnostics &diag);
     static void seekBackAndWriteAtomSize64(std::ostream &stream, const std::ostream::pos_type &startOffset);
     static constexpr void addHeaderSize(std::uint64_t &dataSize);
-    static void makeHeader(std::uint64_t size, std::uint32_t id, IoUtilities::BinaryWriter &writer);
+    static void makeHeader(std::uint64_t size, std::uint32_t id, CppUtilities::BinaryWriter &writer);
 
 protected:
     Mp4Atom(ContainerType &container, std::uint64_t startOffset, std::uint64_t maxSize);
@@ -66,7 +66,7 @@ private:
  */
 inline std::string Mp4Atom::idToString() const
 {
-    auto idString = ConversionUtilities::interpretIntegerAsString<IdentifierType>(id());
+    auto idString = CppUtilities::interpretIntegerAsString<IdentifierType>(id());
     for (char &c : idString) {
         if (c < ' ') {
             c = '?';

mp4/mp4container.cpp

@@ -17,9 +17,7 @@
 #include <tuple>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
-using namespace ChronoUtilities;
 
 namespace TagParser {
 

mp4/mp4tag.cpp

@@ -9,8 +9,7 @@
 #include <c++utilities/io/binarywriter.h>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
 
 namespace TagParser {
 
@@ -339,7 +338,7 @@ void Mp4Tag::parse(Mp4Atom &metaAtom, Diagnostics &diag)
         if (/*(((handlerType & 0xFFFFFFFF00000000) >> 32) != 0x6D647461) && */ (handlerType != 0x6d6469726170706c)) {
             diag.emplace_back(DiagLevel::Warning, "Handler type (value in hdlr atom) is unknown. Trying to parse meta information anyhow.", context);
         }
-        m_version = ConversionUtilities::numberToString(versionByte);
+        m_version = numberToString(versionByte);
     } else {
         m_version.clear();
     }

mp4/mp4tagfield.cpp

@@ -14,8 +14,7 @@
 #include <memory>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
 
 namespace TagParser {
 

mp4/mp4tagfield.h

@@ -73,7 +73,7 @@ private:
 
     Mp4TagField &m_field;
     std::stringstream m_convertedData;
-    IoUtilities::BinaryWriter m_writer;
+    CppUtilities::BinaryWriter m_writer;
     std::uint32_t m_rawDataType;
     std::uint64_t m_dataSize;
     std::uint64_t m_totalSize;
@@ -210,12 +210,12 @@ inline bool Mp4TagField::supportsNestedFields() const
  */
 inline Mp4TagField::IdentifierType Mp4TagField::fieldIdFromString(const char *idString, std::size_t idStringSize)
 {
-    const auto latin1 = ConversionUtilities::convertUtf8ToLatin1(idString, idStringSize != std::string::npos ? idStringSize : std::strlen(idString));
+    const auto latin1 = CppUtilities::convertUtf8ToLatin1(idString, idStringSize != std::string::npos ? idStringSize : std::strlen(idString));
     switch (latin1.second) {
     case 4:
-        return ConversionUtilities::BE::toUInt32(latin1.first.get());
+        return CppUtilities::BE::toUInt32(latin1.first.get());
     default:
-        throw ConversionUtilities::ConversionException("MP4 ID must be exactly 4 chars");
+        throw CppUtilities::ConversionException("MP4 ID must be exactly 4 chars");
     }
 }
 
@@ -226,7 +226,7 @@ inline Mp4TagField::IdentifierType Mp4TagField::fieldIdFromString(const char *id
  */
 inline std::string Mp4TagField::fieldIdToString(Mp4TagField::IdentifierType id)
 {
-    const auto utf8 = ConversionUtilities::convertLatin1ToUtf8(ConversionUtilities::interpretIntegerAsString<std::uint32_t>(id).data(), 4);
+    const auto utf8 = CppUtilities::convertLatin1ToUtf8(CppUtilities::interpretIntegerAsString<std::uint32_t>(id).data(), 4);
     return std::string(utf8.first.get(), utf8.second);
 }
 

mp4/mp4track.cpp

@@ -23,9 +23,7 @@
 #include <locale>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
-using namespace ChronoUtilities;
 
 namespace TagParser {
 
@@ -558,7 +556,7 @@ vector<std::uint64_t> Mp4Track::readChunkSizes(Diagnostics &diag)
  * \sa mpeg4ElementaryStreamInfo()
  */
 std::unique_ptr<Mpeg4ElementaryStreamInfo> Mp4Track::parseMpeg4ElementaryStreamInfo(
-    IoUtilities::BinaryReader &reader, Mp4Atom *esDescAtom, Diagnostics &diag)
+    CppUtilities::BinaryReader &reader, Mp4Atom *esDescAtom, Diagnostics &diag)
 {
     static const string context("parsing MPEG-4 elementary stream descriptor");
     using namespace Mpeg4ElementaryStreamObjectIds;

mp4/mp4track.h

@@ -133,11 +133,11 @@ public:
 
     // methods to parse configuration details from the track header
     static std::unique_ptr<Mpeg4ElementaryStreamInfo> parseMpeg4ElementaryStreamInfo(
-        IoUtilities::BinaryReader &reader, Mp4Atom *esDescAtom, Diagnostics &diag);
+        CppUtilities::BinaryReader &reader, Mp4Atom *esDescAtom, Diagnostics &diag);
     static std::unique_ptr<Mpeg4AudioSpecificConfig> parseAudioSpecificConfig(
         std::istream &stream, std::uint64_t startOffset, std::uint64_t size, Diagnostics &diag);
     static std::unique_ptr<Mpeg4VideoSpecificConfig> parseVideoSpecificConfig(
-        IoUtilities::BinaryReader &reader, std::uint64_t startOffset, std::uint64_t size, Diagnostics &diag);
+        CppUtilities::BinaryReader &reader, std::uint64_t startOffset, std::uint64_t size, Diagnostics &diag);
 
     // methods to read the "index" (chunk offsets and sizes)
     std::vector<std::uint64_t> readChunkOffsets(bool parseFragments, Diagnostics &diag);

mp4/mpeg4descriptor.cpp

@@ -7,7 +7,7 @@
 #include <c++utilities/io/binaryreader.h>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 
@@ -46,7 +46,7 @@ string Mpeg4Descriptor::parsingContext() const
  */
 std::string Mpeg4Descriptor::idToString() const
 {
-    return "0x" + ConversionUtilities::numberToString(id(), 16);
+    return "0x" + numberToString(id(), 16);
 }
 
 /*!

mpegaudio/mpegaudioframe.cpp

@@ -5,7 +5,7 @@
 #include <c++utilities/io/binaryreader.h>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

mpegaudio/mpegaudioframe.h

@@ -6,7 +6,7 @@
 #include <cstdint>
 #include <iostream>
 
-namespace IoUtilities {
+namespace CppUtilities {
 class BinaryReader;
 }
 
@@ -37,7 +37,7 @@ class TAG_PARSER_EXPORT MpegAudioFrame {
 public:
     constexpr MpegAudioFrame();
 
-    void parseHeader(IoUtilities::BinaryReader &reader, Diagnostics &diag);
+    void parseHeader(CppUtilities::BinaryReader &reader, Diagnostics &diag);
 
     constexpr bool isValid() const;
     double mpegVersion() const;

mpegaudio/mpegaudioframestream.cpp

@@ -6,9 +6,7 @@
 #include <sstream>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
-using namespace ChronoUtilities;
 
 namespace TagParser {
 

ogg/oggcontainer.cpp

@@ -12,8 +12,7 @@
 #include <memory>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
 
 namespace TagParser {
 
@@ -333,7 +332,7 @@ void OggContainer::makeVorbisCommentSegment(stringstream &buffer, CopyHelper<653
         comment->make(buffer, VorbisCommentFlags::None, diag);
         break;
     case GeneralMediaFormat::Opus:
-        ConversionUtilities::BE::getBytes(static_cast<std::uint64_t>(0x4F70757354616773u), copyHelper.buffer());
+        BE::getBytes(static_cast<std::uint64_t>(0x4F70757354616773u), copyHelper.buffer());
         buffer.write(copyHelper.buffer(), 8);
         comment->make(buffer, VorbisCommentFlags::NoSignature | VorbisCommentFlags::NoFramingByte, diag);
         break;

ogg/oggcontainer.h

@@ -12,7 +12,7 @@
 #include <tuple>
 #include <unordered_map>
 
-namespace IoUtilities {
+namespace CppUtilities {
 template <std::size_t bufferSize> class CopyHelper;
 }
 
@@ -152,7 +152,7 @@ protected:
 private:
     void announceComment(
         std::size_t pageIndex, std::size_t segmentIndex, bool lastMetaDataBlock, GeneralMediaFormat mediaFormat = GeneralMediaFormat::Vorbis);
-    void makeVorbisCommentSegment(std::stringstream &buffer, IoUtilities::CopyHelper<65307> &copyHelper, std::vector<std::uint32_t> &newSegmentSizes,
+    void makeVorbisCommentSegment(std::stringstream &buffer, CppUtilities::CopyHelper<65307> &copyHelper, std::vector<std::uint32_t> &newSegmentSizes,
         VorbisComment *comment, OggParameter *params, Diagnostics &diag);
 
     std::unordered_map<std::uint32_t, std::vector<std::unique_ptr<OggStream>>::size_type> m_streamsBySerialNo;

ogg/oggiterator.cpp

@@ -8,7 +8,7 @@
 #include <limits>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

ogg/oggpage.cpp

@@ -6,8 +6,7 @@
 #include <c++utilities/io/binaryreader.h>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
 
 namespace TagParser {
 

ogg/oggstream.cpp

@@ -19,7 +19,7 @@
 
 using namespace std;
 using namespace std::placeholders;
-using namespace ChronoUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

opus/opusidentificationheader.cpp

@@ -7,7 +7,7 @@
 #include <c++utilities/conversion/binaryconversion.h>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

positioninset.h

@@ -21,7 +21,7 @@ namespace TagParser {
 class TAG_PARSER_EXPORT PositionInSet {
 public:
     constexpr PositionInSet(std::int32_t position = 0, std::int32_t total = 0);
-    template <typename StringType = std::string, Traits::EnableIfAny<Traits::IsSpecializationOf<StringType, std::basic_string>> * = nullptr>
+    template <typename StringType = std::string, CppUtilities::Traits::EnableIfAny<CppUtilities::Traits::IsSpecializationOf<StringType, std::basic_string>> * = nullptr>
     PositionInSet(const StringType &numericString);
 
     constexpr std::int32_t position() const;
@@ -29,7 +29,7 @@ public:
     constexpr bool isNull() const;
     constexpr bool operator==(const PositionInSet &other) const;
 
-    template <typename StringType = std::string, Traits::EnableIfAny<Traits::IsSpecializationOf<StringType, std::basic_string>> * = nullptr>
+    template <typename StringType = std::string, CppUtilities::Traits::EnableIfAny<CppUtilities::Traits::IsSpecializationOf<StringType, std::basic_string>> * = nullptr>
     StringType toString() const;
 
 private:
@@ -43,19 +43,19 @@ private:
  * \param numericString Specifies the string containing the position and possibly
  *                      the total element count (separated by "/").
  */
-template <typename StringType, Traits::EnableIfAny<Traits::IsSpecializationOf<StringType, std::basic_string>> *>
+template <typename StringType, CppUtilities::Traits::EnableIfAny<CppUtilities::Traits::IsSpecializationOf<StringType, std::basic_string>> *>
 PositionInSet::PositionInSet(const StringType &numericString)
     : m_position(0)
     , m_total(0)
 {
     const auto separator = numericString.find('/');
     if (separator == StringType::npos || separator == numericString.length() - 1) {
-        m_position = ConversionUtilities::stringToNumber<std::int32_t, StringType>(numericString);
+        m_position = CppUtilities::stringToNumber<std::int32_t, StringType>(numericString);
     } else if (separator == 0) {
-        m_total = ConversionUtilities::stringToNumber<std::int32_t, StringType>(numericString.substr(1));
+        m_total = CppUtilities::stringToNumber<std::int32_t, StringType>(numericString.substr(1));
     } else {
-        m_position = ConversionUtilities::stringToNumber<std::int32_t, StringType>(numericString.substr(0, separator));
+        m_position = CppUtilities::stringToNumber<std::int32_t, StringType>(numericString.substr(0, separator));
-        m_total = ConversionUtilities::stringToNumber<std::int32_t, StringType>(numericString.substr(separator + 1));
+        m_total = CppUtilities::stringToNumber<std::int32_t, StringType>(numericString.substr(separator + 1));
     }
 }
 
@@ -105,7 +105,7 @@ constexpr inline bool PositionInSet::operator==(const PositionInSet &other) cons
 /*!
  * \brief Returns the string representation of the current PositionInSet.
  */
-template <typename StringType, Traits::EnableIfAny<Traits::IsSpecializationOf<StringType, std::basic_string>> *>
+template <typename StringType, CppUtilities::Traits::EnableIfAny<CppUtilities::Traits::IsSpecializationOf<StringType, std::basic_string>> *>
 StringType PositionInSet::toString() const
 {
     std::basic_stringstream<typename StringType::value_type> ss;

signature.cpp

@@ -5,7 +5,7 @@
 
 #include <cstdint>
 
-using namespace ConversionUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 
@@ -106,12 +106,12 @@ ContainerFormat parseSignature(const char *buffer, int bufferSize)
     // read signature
     std::uint64_t sig = 0;
     if (bufferSize >= 8) {
-        sig = ConversionUtilities::BE::toUInt64(buffer);
+        sig = BE::toUInt64(buffer);
     } else if (bufferSize >= 4) {
-        sig = ConversionUtilities::BE::toUInt32(buffer);
+        sig = BE::toUInt32(buffer);
         sig <<= 4;
     } else if (bufferSize >= 2) {
-        sig = ConversionUtilities::BE::toUInt16(buffer);
+        sig = BE::toUInt16(buffer);
         sig <<= 6;
     } else {
         return ContainerFormat::Unknown;
@@ -178,9 +178,9 @@ ContainerFormat parseSignature(const char *buffer, int bufferSize)
     case PhotoshopDocument:
         return ContainerFormat::PhotoshopDocument;
     case Riff:
-        if (bufferSize >= 16 && ConversionUtilities::BE::toUInt64(buffer + 8) == Sig64::RiffAvi) {
+        if (bufferSize >= 16 && BE::toUInt64(buffer + 8) == Sig64::RiffAvi) {
             return ContainerFormat::RiffAvi;
-        } else if (bufferSize >= 12 && ConversionUtilities::BE::toUInt32(buffer + 8) == RiffWave) {
+        } else if (bufferSize >= 12 && BE::toUInt32(buffer + 8) == RiffWave) {
             return ContainerFormat::RiffWave;
         } else {
             return ContainerFormat::Riff;

signature.h

@@ -7,7 +7,7 @@
 
 namespace TagParser {
 
-DECLARE_ENUM_CLASS(TagTargetLevel, std::uint8_t);
+enum class TagTargetLevel : std::uint8_t;
 
 /*!
  * \brief Specifies the container format.

size.h

@@ -123,7 +123,7 @@ constexpr bool Size::operator>=(const Size &other) const
  */
 inline std::string Size::toString() const
 {
-    return ConversionUtilities::argsToString("width: ", m_width, ", height: ", m_height);
+    return CppUtilities::argsToString("width: ", m_width, ", height: ", m_height);
 }
 
 } // namespace TagParser

tagtarget.cpp

@@ -7,7 +7,7 @@
 #include <list>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

tagvalue.cpp

@@ -13,8 +13,7 @@
 #include <utility>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
-using namespace ChronoUtilities;
 
 namespace TagParser {
 
@@ -324,12 +323,12 @@ std::int32_t TagValue::toInteger() const
         case TagTextEncoding::Unspecified:
         case TagTextEncoding::Latin1:
         case TagTextEncoding::Utf8:
-            return ConversionUtilities::bufferToNumber<std::int32_t>(m_ptr.get(), m_size);
+            return bufferToNumber<std::int32_t>(m_ptr.get(), m_size);
         case TagTextEncoding::Utf16LittleEndian:
         case TagTextEncoding::Utf16BigEndian:
             u16string u16str(reinterpret_cast<char16_t *>(m_ptr.get()), m_size / 2);
             ensureHostByteOrder(u16str, m_encoding);
-            return ConversionUtilities::stringToNumber<std::int32_t>(u16str);
+            return stringToNumber<std::int32_t>(u16str);
         }
     case TagDataType::PositionInSet:
         if (m_size == sizeof(PositionInSet)) {
@@ -634,7 +633,7 @@ void TagValue::toString(string &result, TagTextEncoding encoding) const
         }
         return;
     case TagDataType::Integer:
-        result = ConversionUtilities::numberToString(toInteger());
+        result = numberToString(toInteger());
         break;
     case TagDataType::PositionInSet:
         result = toPositionInSet().toString();
@@ -718,7 +717,7 @@ void TagValue::toWString(std::u16string &result, TagTextEncoding encoding) const
         }
         return;
     case TagDataType::Integer:
-        regularStrRes = ConversionUtilities::numberToString(toInteger());
+        regularStrRes = numberToString(toInteger());
         break;
     case TagDataType::PositionInSet:
         regularStrRes = toPositionInSet().toString();
@@ -870,19 +869,19 @@ void TagValue::stripBom(const char *&text, size_t &length, TagTextEncoding encod
 {
     switch (encoding) {
     case TagTextEncoding::Utf8:
-        if ((length >= 3) && (ConversionUtilities::BE::toUInt24(text) == 0x00EFBBBF)) {
+        if ((length >= 3) && (BE::toUInt24(text) == 0x00EFBBBF)) {
             text += 3;
             length -= 3;
         }
         break;
     case TagTextEncoding::Utf16LittleEndian:
-        if ((length >= 2) && (ConversionUtilities::LE::toUInt16(text) == 0xFEFF)) {
+        if ((length >= 2) && (LE::toUInt16(text) == 0xFEFF)) {
             text += 2;
             length -= 2;
         }
         break;
     case TagTextEncoding::Utf16BigEndian:
-        if ((length >= 2) && (ConversionUtilities::BE::toUInt16(text) == 0xFEFF)) {
+        if ((length >= 2) && (BE::toUInt16(text) == 0xFEFF)) {
             text += 2;
             length -= 2;
         }

tagvalue.h

@@ -76,8 +76,8 @@ public:
     TagValue(std::unique_ptr<char[]> &&data, std::size_t length, TagDataType type = TagDataType::Binary,
         TagTextEncoding encoding = TagTextEncoding::Latin1);
     TagValue(PositionInSet value);
-    TagValue(ChronoUtilities::DateTime value);
+    TagValue(CppUtilities::DateTime value);
-    TagValue(ChronoUtilities::TimeSpan value);
+    TagValue(CppUtilities::TimeSpan value);
     TagValue(const TagValue &other);
     TagValue(TagValue &&other) = default;
     ~TagValue();
@@ -102,8 +102,8 @@ public:
     std::int32_t toInteger() const;
     int toStandardGenreIndex() const;
     PositionInSet toPositionInSet() const;
-    ChronoUtilities::TimeSpan toTimeSpan() const;
+    CppUtilities::TimeSpan toTimeSpan() const;
-    ChronoUtilities::DateTime toDateTime() const;
+    CppUtilities::DateTime toDateTime() const;
     std::size_t dataSize() const;
     char *dataPointer();
     const char *dataPointer() const;
@@ -132,13 +132,13 @@ public:
     void assignData(std::unique_ptr<char[]> &&data, std::size_t length, TagDataType type = TagDataType::Binary,
         TagTextEncoding encoding = TagTextEncoding::Latin1);
     void assignPosition(PositionInSet value);
-    void assignTimeSpan(ChronoUtilities::TimeSpan value);
+    void assignTimeSpan(CppUtilities::TimeSpan value);
-    void assignDateTime(ChronoUtilities::DateTime value);
+    void assignDateTime(CppUtilities::DateTime value);
 
     static void stripBom(const char *&text, std::size_t &length, TagTextEncoding encoding);
     static void ensureHostByteOrder(std::u16string &u16str, TagTextEncoding currentEncoding);
     template <typename ContainerType,
-        Traits::EnableIf<Traits::IsIteratable<ContainerType>,
+       CppUtilities:: Traits::EnableIf<CppUtilities::Traits::IsIteratable<ContainerType>,
             std::is_same<typename std::add_const<typename std::remove_pointer<typename ContainerType::value_type>::type>::type, const TagValue>>
             * = nullptr>
     static std::vector<std::string> toStrings(const ContainerType &values, TagTextEncoding encoding = TagTextEncoding::Utf8);
@@ -292,7 +292,7 @@ inline TagValue::TagValue(PositionInSet value)
 /*!
  * \brief Constructs a new TagValue holding a copy of the given DateTime \a value.
  */
-inline TagValue::TagValue(ChronoUtilities::DateTime value)
+inline TagValue::TagValue(CppUtilities::DateTime value)
     : TagValue(reinterpret_cast<const char *>(&value), sizeof(value), TagDataType::DateTime)
 {
 }
@@ -300,7 +300,7 @@ inline TagValue::TagValue(ChronoUtilities::DateTime value)
 /*!
  * \brief Constructs a new TagValue holding a copy of the given TimeSpan \a value.
  */
-inline TagValue::TagValue(ChronoUtilities::TimeSpan value)
+inline TagValue::TagValue(CppUtilities::TimeSpan value)
     : TagValue(reinterpret_cast<const char *>(&value), sizeof(value), TagDataType::TimeSpan)
 {
 }
@@ -344,7 +344,7 @@ inline void TagValue::assignPosition(PositionInSet value)
 /*!
  * \brief Assigns the given TimeSpan \a value.
  */
-inline void TagValue::assignTimeSpan(ChronoUtilities::TimeSpan value)
+inline void TagValue::assignTimeSpan(CppUtilities::TimeSpan value)
 {
     assignData(reinterpret_cast<const char *>(&value), sizeof(value), TagDataType::TimeSpan);
 }
@@ -352,7 +352,7 @@ inline void TagValue::assignTimeSpan(ChronoUtilities::TimeSpan value)
 /*!
  * \brief Assigns the given DateTime \a value.
  */
-inline void TagValue::assignDateTime(ChronoUtilities::DateTime value)
+inline void TagValue::assignDateTime(CppUtilities::DateTime value)
 {
     assignData(reinterpret_cast<const char *>(&value), sizeof(value), TagDataType::DateTime);
 }
@@ -600,14 +600,14 @@ inline TagTextEncoding TagValue::descriptionEncoding() const
  * \sa toString()
  */
 template <typename ContainerType,
-    Traits::EnableIf<Traits::IsIteratable<ContainerType>,
+   CppUtilities:: Traits::EnableIf<CppUtilities::Traits::IsIteratable<ContainerType>,
         std::is_same<typename std::add_const<typename std::remove_pointer<typename ContainerType::value_type>::type>::type, const TagValue>> *>
 std::vector<std::string> TagValue::toStrings(const ContainerType &values, TagTextEncoding encoding)
 {
     std::vector<std::string> res;
     res.reserve(values.size());
     for (const auto &value : values) {
-        res.emplace_back(Traits::dereferenceMaybe(value).toString(encoding));
+        res.emplace_back(CppUtilities::Traits::dereferenceMaybe(value).toString(encoding));
     }
     return res;
 }

tests/helper.cpp

@@ -1,6 +1,6 @@
 #include "./helper.h"
 
-namespace TestUtilities {
+namespace CppUtilities {
 
 /*!
  * \brief Prints a TagTextEncoding to enable CPPUNIT_ASSERT_EQUAL for tag values.

tests/helper.h

@@ -7,7 +7,7 @@
 
 #include <ostream>
 
-namespace TestUtilities {
+namespace CppUtilities {
 
 std::ostream &operator<<(std::ostream &os, const TagParser::TagTextEncoding &encoding);
 

tests/mediafileinfo.cpp

@@ -5,7 +5,7 @@
 #include "../tag.h"
 
 #include <c++utilities/tests/testutils.h>
-using namespace TestUtilities;
+using namespace CppUtilities;
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
@@ -13,9 +13,8 @@ using namespace TestUtilities;
 #include <cstdio>
 
 using namespace std;
+using namespace CppUtilities::Literals;
 using namespace TagParser;
-using namespace IoUtilities;
-using namespace TestUtilities::Literals;
 
 using namespace CPPUNIT_NS;
 

tests/overall.h

@@ -12,7 +12,7 @@
 #include <c++utilities/chrono/format.h>
 #include <c++utilities/conversion/stringconversion.h>
 #include <c++utilities/tests/testutils.h>
-using namespace TestUtilities;
+using namespace CppUtilities;
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
@@ -21,12 +21,8 @@ using namespace TestUtilities;
 #include <string>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities::Literals;
-using namespace IoUtilities;
-using namespace TestUtilities;
-using namespace TestUtilities::Literals;
 using namespace TagParser;
-
 using namespace CPPUNIT_NS;
 
 enum class TagStatus { Original, TestMetaDataPresent, Removed };

tests/overallflac.cpp

@@ -103,8 +103,8 @@ void OverallTests::testFlacParsing()
     cerr << endl << "FLAC parser" << endl;
     m_fileInfo.setForceFullParse(false);
     m_tagStatus = TagStatus::Original;
-    parseFile(TestUtilities::testFilePath("flac/test.flac"), &OverallTests::checkFlacTestfile1);
+    parseFile(testFilePath("flac/test.flac"), &OverallTests::checkFlacTestfile1);
-    parseFile(TestUtilities::testFilePath("flac/test.ogg"), &OverallTests::checkFlacTestfile2);
+    parseFile(testFilePath("flac/test.ogg"), &OverallTests::checkFlacTestfile2);
 }
 
 /*!
@@ -134,7 +134,7 @@ void OverallTests::testFlacMaking()
         // do actual tests
         m_tagStatus = (m_mode & RemoveTag) ? TagStatus::Removed : TagStatus::TestMetaDataPresent;
         void (OverallTests::*modifyRoutine)(void) = (m_mode & RemoveTag) ? &OverallTests::removeAllTags : &OverallTests::setOggTestMetaData;
-        makeFile(TestUtilities::workingCopyPath("flac/test.flac"), modifyRoutine, &OverallTests::checkFlacTestfile1);
+        makeFile(workingCopyPath("flac/test.flac"), modifyRoutine, &OverallTests::checkFlacTestfile1);
-        makeFile(TestUtilities::workingCopyPath("flac/test.ogg"), modifyRoutine, &OverallTests::checkFlacTestfile2);
+        makeFile(workingCopyPath("flac/test.ogg"), modifyRoutine, &OverallTests::checkFlacTestfile2);
     }
 }

tests/overallmkv.cpp

@@ -15,7 +15,7 @@
 #include <cstring>
 #include <fstream>
 
-using namespace ChronoUtilities;
+using namespace CppUtilities;
 
 namespace MkvTestFlags {
 enum TestFlag {
@@ -622,7 +622,7 @@ void OverallTests::setMkvTestMetaData()
     // assign an attachment
     AbstractAttachment *const attachment = container->createAttachment();
     CPPUNIT_ASSERT_MESSAGE("create attachment", attachment);
-    attachment->setFile(TestUtilities::testFilePath("matroska_wave1/logo3_256x256.png"), m_diag);
+    attachment->setFile(testFilePath("matroska_wave1/logo3_256x256.png"), m_diag);
     attachment->setMimeType("image/png");
     attachment->setName("cover.jpg");
 }
@@ -721,15 +721,15 @@ void OverallTests::testMkvMakingWithDifferentSettings()
         // do actual tests
         m_tagStatus = (m_mode & RemoveTag) ? TagStatus::Removed : TagStatus::TestMetaDataPresent;
         void (OverallTests::*modifyRoutine)(void) = (m_mode & RemoveTag) ? &OverallTests::removeAllTags : &OverallTests::setMkvTestMetaData;
-        makeFile(TestUtilities::workingCopyPath("matroska_wave1/test1.mkv"), modifyRoutine, &OverallTests::checkMkvTestfile1);
+        makeFile(workingCopyPath("matroska_wave1/test1.mkv"), modifyRoutine, &OverallTests::checkMkvTestfile1);
-        makeFile(TestUtilities::workingCopyPath("matroska_wave1/test2.mkv"), modifyRoutine, &OverallTests::checkMkvTestfile2);
+        makeFile(workingCopyPath("matroska_wave1/test2.mkv"), modifyRoutine, &OverallTests::checkMkvTestfile2);
-        makeFile(TestUtilities::workingCopyPath("matroska_wave1/test3.mkv"), modifyRoutine, &OverallTests::checkMkvTestfile3);
+        makeFile(workingCopyPath("matroska_wave1/test3.mkv"), modifyRoutine, &OverallTests::checkMkvTestfile3);
-        makeFile(TestUtilities::workingCopyPath("matroska_wave1/test4.mkv"), modifyRoutine, &OverallTests::checkMkvTestfile4);
+        makeFile(workingCopyPath("matroska_wave1/test4.mkv"), modifyRoutine, &OverallTests::checkMkvTestfile4);
-        makeFile(TestUtilities::workingCopyPath("matroska_wave1/test5.mkv"), modifyRoutine, &OverallTests::checkMkvTestfile5);
+        makeFile(workingCopyPath("matroska_wave1/test5.mkv"), modifyRoutine, &OverallTests::checkMkvTestfile5);
-        makeFile(TestUtilities::workingCopyPath("matroska_wave1/test6.mkv"), modifyRoutine, &OverallTests::checkMkvTestfile6);
+        makeFile(workingCopyPath("matroska_wave1/test6.mkv"), modifyRoutine, &OverallTests::checkMkvTestfile6);
-        makeFile(TestUtilities::workingCopyPath("matroska_wave1/test7.mkv"), modifyRoutine, &OverallTests::checkMkvTestfile7);
+        makeFile(workingCopyPath("matroska_wave1/test7.mkv"), modifyRoutine, &OverallTests::checkMkvTestfile7);
-        makeFile(TestUtilities::workingCopyPath("matroska_wave1/test8.mkv"), modifyRoutine, &OverallTests::checkMkvTestfile8);
+        makeFile(workingCopyPath("matroska_wave1/test8.mkv"), modifyRoutine, &OverallTests::checkMkvTestfile8);
-        makeFile(TestUtilities::workingCopyPath("mtx-test-data/mkv/handbrake-chapters-2.mkv"), modifyRoutine,
+        makeFile(workingCopyPath("mtx-test-data/mkv/handbrake-chapters-2.mkv"), modifyRoutine,
             &OverallTests::checkMkvTestfileHandbrakeChapters);
     }
 }

tests/overallmp3.cpp

@@ -367,8 +367,8 @@ void OverallTests::testMp3Parsing()
     cerr << endl << "MP3 parser" << endl;
     m_fileInfo.setForceFullParse(false);
     m_tagStatus = TagStatus::Original;
-    parseFile(TestUtilities::testFilePath("mtx-test-data/mp3/id3-tag-and-xing-header.mp3"), &OverallTests::checkMp3Testfile1);
+    parseFile(testFilePath("mtx-test-data/mp3/id3-tag-and-xing-header.mp3"), &OverallTests::checkMp3Testfile1);
-    parseFile(TestUtilities::testFilePath("misc/multiple_id3v2_4_values.mp3"), &OverallTests::checkMp3Testfile2);
+    parseFile(testFilePath("misc/multiple_id3v2_4_values.mp3"), &OverallTests::checkMp3Testfile2);
 }
 
 /*!
@@ -425,9 +425,9 @@ void OverallTests::testMp3Making()
 
         // do actual tests
         m_tagStatus = (m_mode & RemoveTag) ? TagStatus::Removed : TagStatus::TestMetaDataPresent;
-        makeFile(TestUtilities::workingCopyPath("mtx-test-data/mp3/id3-tag-and-xing-header.mp3"),
+        makeFile(workingCopyPath("mtx-test-data/mp3/id3-tag-and-xing-header.mp3"),
             (m_mode & RemoveTag) ? &OverallTests::removeAllTags : &OverallTests::setMp3TestMetaData1, &OverallTests::checkMp3Testfile1);
-        makeFile(TestUtilities::workingCopyPath("misc/multiple_id3v2_4_values.mp3"),
+        makeFile(workingCopyPath("misc/multiple_id3v2_4_values.mp3"),
             (m_mode & RemoveTag) ? &OverallTests::removeAllTags : &OverallTests::setMp3TestMetaData2, &OverallTests::checkMp3Testfile2);
     }
 }

tests/overallmp4.cpp

@@ -6,7 +6,7 @@
 #include "../mp4/mp4ids.h"
 #include "../mp4/mp4tag.h"
 
-using namespace ChronoUtilities;
+using namespace CppUtilities;
 
 namespace Mp4TestFlags {
 enum TestFlag {
@@ -495,7 +495,7 @@ void OverallTests::setMp4TestMetaData()
  */
 void OverallTests::alterMp4Tracks()
 {
-    m_additionalFileInfo.setPath(TestUtilities::testFilePath("mtx-test-data/mp4/10-DanseMacabreOp.40.m4a"));
+    m_additionalFileInfo.setPath(testFilePath("mtx-test-data/mp4/10-DanseMacabreOp.40.m4a"));
     m_additionalFileInfo.reopen(true);
     m_additionalFileInfo.parseContainerFormat(m_diag);
     m_additionalFileInfo.parseTracks(m_diag);
@@ -525,12 +525,12 @@ void OverallTests::testMp4Parsing()
     cerr << endl << "MP4 parser" << endl;
     m_fileInfo.setForceFullParse(false);
     m_tagStatus = TagStatus::Original;
-    parseFile(TestUtilities::testFilePath("mtx-test-data/mp4/10-DanseMacabreOp.40.m4a"), &OverallTests::checkMp4Testfile1);
+    parseFile(testFilePath("mtx-test-data/mp4/10-DanseMacabreOp.40.m4a"), &OverallTests::checkMp4Testfile1);
-    parseFile(TestUtilities::testFilePath("mtx-test-data/mp4/1080p-DTS-HD-7.1.mp4"), &OverallTests::checkMp4Testfile2);
+    parseFile(testFilePath("mtx-test-data/mp4/1080p-DTS-HD-7.1.mp4"), &OverallTests::checkMp4Testfile2);
-    parseFile(TestUtilities::testFilePath("mtx-test-data/mp4/dash/dragon-age-inquisition-H1LkM6IVlm4-video.mp4"), &OverallTests::checkMp4Testfile3);
+    parseFile(testFilePath("mtx-test-data/mp4/dash/dragon-age-inquisition-H1LkM6IVlm4-video.mp4"), &OverallTests::checkMp4Testfile3);
-    parseFile(TestUtilities::testFilePath("mtx-test-data/alac/othertest-itunes.m4a"), &OverallTests::checkMp4Testfile4);
+    parseFile(testFilePath("mtx-test-data/alac/othertest-itunes.m4a"), &OverallTests::checkMp4Testfile4);
-    parseFile(TestUtilities::testFilePath("mtx-test-data/aac/he-aacv2-ps.m4a"), &OverallTests::checkMp4Testfile5);
+    parseFile(testFilePath("mtx-test-data/aac/he-aacv2-ps.m4a"), &OverallTests::checkMp4Testfile5);
-    parseFile(TestUtilities::testFilePath("mp4/android-8.1-camera-recoding.mp4"), &OverallTests::checkMp4Testfile7);
+    parseFile(testFilePath("mp4/android-8.1-camera-recoding.mp4"), &OverallTests::checkMp4Testfile7);
 }
 
 /*!
@@ -589,16 +589,16 @@ void OverallTests::testMp4Making()
         // -> either remove tags or set test meta data
         m_tagStatus = (m_mode & RemoveTagOrTrack) ? TagStatus::Removed : TagStatus::TestMetaDataPresent;
         void (OverallTests::*modifyRoutine)(void) = (m_mode & RemoveTagOrTrack) ? &OverallTests::removeAllTags : &OverallTests::setMp4TestMetaData;
-        makeFile(TestUtilities::workingCopyPath("mtx-test-data/mp4/10-DanseMacabreOp.40.m4a"), modifyRoutine, &OverallTests::checkMp4Testfile1);
+        makeFile(workingCopyPath("mtx-test-data/mp4/10-DanseMacabreOp.40.m4a"), modifyRoutine, &OverallTests::checkMp4Testfile1);
-        makeFile(TestUtilities::workingCopyPath("mtx-test-data/mp4/1080p-DTS-HD-7.1.mp4"), modifyRoutine, &OverallTests::checkMp4Testfile2);
+        makeFile(workingCopyPath("mtx-test-data/mp4/1080p-DTS-HD-7.1.mp4"), modifyRoutine, &OverallTests::checkMp4Testfile2);
-        makeFile(TestUtilities::workingCopyPath("mtx-test-data/mp4/dash/dragon-age-inquisition-H1LkM6IVlm4-video.mp4"), modifyRoutine,
+        makeFile(workingCopyPath("mtx-test-data/mp4/dash/dragon-age-inquisition-H1LkM6IVlm4-video.mp4"), modifyRoutine,
             &OverallTests::checkMp4Testfile3);
-        makeFile(TestUtilities::workingCopyPath("mtx-test-data/alac/othertest-itunes.m4a"), modifyRoutine, &OverallTests::checkMp4Testfile4);
+        makeFile(workingCopyPath("mtx-test-data/alac/othertest-itunes.m4a"), modifyRoutine, &OverallTests::checkMp4Testfile4);
-        makeFile(TestUtilities::workingCopyPath("mtx-test-data/aac/he-aacv2-ps.m4a"), modifyRoutine, &OverallTests::checkMp4Testfile5);
+        makeFile(workingCopyPath("mtx-test-data/aac/he-aacv2-ps.m4a"), modifyRoutine, &OverallTests::checkMp4Testfile5);
-        makeFile(TestUtilities::workingCopyPath("mp4/android-8.1-camera-recoding.mp4"), modifyRoutine, &OverallTests::checkMp4Testfile7);
+        makeFile(workingCopyPath("mp4/android-8.1-camera-recoding.mp4"), modifyRoutine, &OverallTests::checkMp4Testfile7);
         // -> add/remove tracks
         modifyRoutine = (m_mode & RemoveTagOrTrack) ? &OverallTests::removeSecondTrack : &OverallTests::alterMp4Tracks;
         m_fileInfo.setTagPosition(ElementPosition::Keep);
-        makeFile(TestUtilities::workingCopyPath("mtx-test-data/mp4/1080p-DTS-HD-7.1.mp4"), modifyRoutine, &OverallTests::checkMp4Testfile6);
+        makeFile(workingCopyPath("mtx-test-data/mp4/1080p-DTS-HD-7.1.mp4"), modifyRoutine, &OverallTests::checkMp4Testfile6);
     }
 }

tests/overallogg.cpp

@@ -133,8 +133,8 @@ void OverallTests::testOggParsing()
     cerr << endl << "OGG parser" << endl;
     m_fileInfo.setForceFullParse(false);
     m_tagStatus = TagStatus::Original;
-    parseFile(TestUtilities::testFilePath("mtx-test-data/ogg/qt4dance_medium.ogg"), &OverallTests::checkOggTestfile1);
+    parseFile(testFilePath("mtx-test-data/ogg/qt4dance_medium.ogg"), &OverallTests::checkOggTestfile1);
-    parseFile(TestUtilities::testFilePath("mtx-test-data/opus/v-opus.ogg"), &OverallTests::checkOggTestfile2);
+    parseFile(testFilePath("mtx-test-data/opus/v-opus.ogg"), &OverallTests::checkOggTestfile2);
 }
 
 /*!
@@ -167,7 +167,7 @@ void OverallTests::testOggMaking()
         // do actual tests
         m_tagStatus = (m_mode & RemoveTag) ? TagStatus::Removed : TagStatus::TestMetaDataPresent;
         void (OverallTests::*modifyRoutine)(void) = (m_mode & RemoveTag) ? &OverallTests::removeAllTags : &OverallTests::setOggTestMetaData;
-        makeFile(TestUtilities::workingCopyPath("mtx-test-data/ogg/qt4dance_medium.ogg"), modifyRoutine, &OverallTests::checkOggTestfile1);
+        makeFile(workingCopyPath("mtx-test-data/ogg/qt4dance_medium.ogg"), modifyRoutine, &OverallTests::checkOggTestfile1);
-        makeFile(TestUtilities::workingCopyPath("mtx-test-data/opus/v-opus.ogg"), modifyRoutine, &OverallTests::checkOggTestfile2);
+        makeFile(workingCopyPath("mtx-test-data/opus/v-opus.ogg"), modifyRoutine, &OverallTests::checkOggTestfile2);
     }
 }

tests/tagvalue.cpp

@@ -6,16 +6,14 @@
 #include <c++utilities/chrono/format.h>
 #include <c++utilities/conversion/conversionexception.h>
 
-using namespace TestUtilities;
+using namespace CppUtilities;
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
+using namespace CppUtilities;
 using namespace TagParser;
-using namespace ConversionUtilities;
-using namespace ChronoUtilities;
-
 using namespace CPPUNIT_NS;
 
 /*!

tests/testfilecheck.cpp

@@ -11,10 +11,8 @@
 #include <fstream>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
-using namespace TestUtilities;
 using namespace TagParser;
-
 using namespace CPPUNIT_NS;
 
 /*!

tests/utils.cpp

@@ -15,7 +15,7 @@
 
 #include <c++utilities/conversion/stringbuilder.h>
 #include <c++utilities/tests/testutils.h>
-using namespace TestUtilities;
+using namespace CppUtilities;
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
@@ -26,11 +26,8 @@ using namespace TestUtilities;
 #include <unistd.h>
 
 using namespace std;
+using namespace CppUtilities::Literals;
 using namespace TagParser;
-using namespace ConversionUtilities;
-using namespace IoUtilities;
-using namespace TestUtilities::Literals;
-
 using namespace CPPUNIT_NS;
 
 /*!

vorbis/vorbiscomment.cpp

@@ -14,8 +14,7 @@
 #include <memory>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
 
 namespace TagParser {
 
@@ -139,7 +138,7 @@ template <class StreamType> void VorbisComment::internalParse(StreamType &stream
         if (!skipSignature) {
             CHECK_MAX_SIZE(7);
             stream.read(sig, 7);
-            skipSignature = (ConversionUtilities::BE::toUInt64(sig) & 0xffffffffffffff00u) == 0x03766F7262697300u;
+            skipSignature = (BE::toUInt64(sig) & 0xffffffffffffff00u) == 0x03766F7262697300u;
         }
         if (skipSignature) {
             // read vendor (length prefixed string)

vorbis/vorbiscommentfield.cpp

@@ -20,8 +20,7 @@
 #include <memory>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
 
 namespace TagParser {
 

vorbis/vorbiscommentfield.h

@@ -3,7 +3,7 @@
 
 #include "../generictagfield.h"
 
-namespace IoUtilities {
+namespace CppUtilities {
 class BinaryReader;
 class BinaryWriter;
 } // namespace IoUtilities
@@ -54,7 +54,7 @@ public:
     void parse(OggIterator &iterator, Diagnostics &diag);
     void parse(OggIterator &iterator, std::uint64_t &maxSize, Diagnostics &diag);
     void parse(std::istream &stream, std::uint64_t &maxSize, Diagnostics &diag);
-    bool make(IoUtilities::BinaryWriter &writer, VorbisCommentFlags flags, Diagnostics &diag);
+    bool make(CppUtilities::BinaryWriter &writer, VorbisCommentFlags flags, Diagnostics &diag);
     bool isAdditionalTypeInfoUsed() const;
     bool supportsNestedFields() const;
 

vorbis/vorbisidentificationheader.cpp

@@ -8,7 +8,7 @@
 #include <c++utilities/conversion/binaryconversion.h>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 

wav/waveaudiostream.cpp

@@ -9,7 +9,7 @@
 #include <c++utilities/io/binaryreader.h>
 
 using namespace std;
-using namespace ChronoUtilities;
+using namespace CppUtilities;
 
 namespace TagParser {
 
@@ -22,7 +22,7 @@ namespace TagParser {
  * \brief Parses the WAVE "fmt " header segment using the specified \a reader.
  * \remarks Reads 16 bytes from the associated stream.
  */
-void WaveFormatHeader::parse(IoUtilities::BinaryReader &reader)
+void WaveFormatHeader::parse(CppUtilities::BinaryReader &reader)
 {
     Diagnostics diag;
     parseExt(reader, 16, diag);
@@ -36,7 +36,7 @@ void WaveFormatHeader::parse(IoUtilities::BinaryReader &reader)
  * - Make GUID a field of WaveFormatHeader instead of returning the MediaFormat in v9.
  * - Replace parse() function with this.
  */
-pair<MediaFormat, std::uint64_t> WaveFormatHeader::parseExt(IoUtilities::BinaryReader &reader, std::uint64_t maxSize, Diagnostics &diag)
+pair<MediaFormat, std::uint64_t> WaveFormatHeader::parseExt(CppUtilities::BinaryReader &reader, std::uint64_t maxSize, Diagnostics &diag)
 {
     auto result = make_pair<MediaFormat, std::uint64_t>(GeneralMediaFormat::Unknown, 0);
     if (maxSize < 16) {
@@ -152,7 +152,7 @@ TrackType WaveAudioStream::type() const
  */
 void WaveAudioStream::addInfo(const WaveFormatHeader &waveHeader, AbstractTrack &track)
 {
-    track.m_formatId = ConversionUtilities::numberToString(waveHeader.formatTag);
+    track.m_formatId = numberToString(waveHeader.formatTag);
     track.m_channelCount = waveHeader.channelCount;
     track.m_samplingFrequency = waveHeader.sampleRate;
     track.m_bytesPerSecond = waveHeader.bytesPerSecond;

wav/waveaudiostream.h

@@ -9,8 +9,8 @@ class TAG_PARSER_EXPORT WaveFormatHeader {
 public:
     constexpr WaveFormatHeader();
 
-    void parse(IoUtilities::BinaryReader &reader);
+    void parse(CppUtilities::BinaryReader &reader);
-    std::pair<MediaFormat, std::uint64_t> parseExt(IoUtilities::BinaryReader &reader, std::uint64_t maxSize, Diagnostics &diag);
+    std::pair<MediaFormat, std::uint64_t> parseExt(CppUtilities::BinaryReader &reader, std::uint64_t maxSize, Diagnostics &diag);
     MediaFormat format() const;
     constexpr std::uint32_t bitrate() const;