diff --git a/backuphelper.cpp b/backuphelper.cpp index 38e9dc4..16122f6 100644 --- a/backuphelper.cpp +++ b/backuphelper.cpp @@ -128,7 +128,7 @@ void createBackupFile(const std::string &originalPath, std::string &backupPath, for(unsigned int i = 0; ; ++i) { if(backupDir.empty()) { if(i) { - backupPath = originalPath % '.' % numberToString(i) + ".bak"; + backupPath = originalPath % '.' % i + ".bak"; } else { backupPath = originalPath + ".bak"; } diff --git a/id3/id3v2tag.cpp b/id3/id3v2tag.cpp index ace4c77..510e021 100644 --- a/id3/id3v2tag.cpp +++ b/id3/id3v2tag.cpp @@ -313,7 +313,7 @@ void Id3v2Tag::setVersion(byte majorVersion, byte revisionVersion) { m_majorVersion = majorVersion; m_revisionVersion = revisionVersion; - m_version = '2' % '.' % numberToString(majorVersion) % '.' + numberToString(revisionVersion); + m_version = argsToString('2', '.', majorVersion, '.', revisionVersion); } /*! diff --git a/margin.h b/margin.h index 6908267..43ce92b 100644 --- a/margin.h +++ b/margin.h @@ -4,7 +4,6 @@ #include "./global.h" #include -#include #include #include @@ -123,11 +122,7 @@ inline constexpr bool Margin::isNull() const */ inline std::string Margin::toString() const { - using namespace ConversionUtilities; - return "top: " % numberToString(m_top) - % "; left: " % numberToString(m_left) - % "; bottom: " % numberToString(m_bottom) - % "; right: " + numberToString(m_right); + return ConversionUtilities::argsToString("top: ", m_top, "; left: ", m_left, "; bottom: ", m_bottom, "; right: ", m_right); } } diff --git a/matroska/ebmlelement.cpp b/matroska/ebmlelement.cpp index 02e1b3f..27d9917 100644 --- a/matroska/ebmlelement.cpp +++ b/matroska/ebmlelement.cpp @@ -68,7 +68,7 @@ void EbmlElement::internalParse() for(skipped = 0; /* TODO: add a sane limit here */; ++m_startOffset, --m_maxSize, ++skipped) { // check whether max size is valid if(maxTotalSize() < 2) { - addNotification(NotificationType::Critical, "The EBML element at " % numberToString(startOffset()) + " is truncated or does not exist.", context); + addNotification(NotificationType::Critical, argsToString("The EBML element at ", startOffset(), " is truncated or does not exist."), context); throw TruncatedDataException(); } stream().seekg(startOffset()); diff --git a/mp4/mp4atom.cpp b/mp4/mp4atom.cpp index 46be2eb..71a3b41 100644 --- a/mp4/mp4atom.cpp +++ b/mp4/mp4atom.cpp @@ -49,7 +49,7 @@ Mp4Atom::Mp4Atom(GenericFileElement::implementationType &parent, uint64 startOff */ string Mp4Atom::parsingContext() const { - return "parsing " % idToString() % " atom at " + numberToString(startOffset()); + return "parsing " % idToString() % " atom at " + startOffset(); } /*! diff --git a/mp4/mpeg4descriptor.cpp b/mp4/mpeg4descriptor.cpp index 53a5faf..06bae9c 100644 --- a/mp4/mpeg4descriptor.cpp +++ b/mp4/mpeg4descriptor.cpp @@ -36,7 +36,7 @@ Mpeg4Descriptor::Mpeg4Descriptor(implementationType &parent, uint64 startOffset) */ string Mpeg4Descriptor::parsingContext() const { - return "parsing " % idToString() % " descriptor at " + numberToString(startOffset()); + return "parsing " % idToString() % " descriptor at " + startOffset(); } /*! diff --git a/size.h b/size.h index 7f75185..7700967 100644 --- a/size.h +++ b/size.h @@ -4,7 +4,6 @@ #include "./global.h" #include -#include #include #include @@ -103,8 +102,7 @@ inline constexpr bool Size::operator==(const Size &other) const */ inline std::string Size::toString() const { - using namespace ConversionUtilities; - return "width: " % numberToString(m_width) % ", height: " + numberToString(m_height); + return ConversionUtilities::argsToString("width: ", m_width, ", height: ", m_height); } }