From 110a253ba35d222fbe9ad994729d2869bdf6efe3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 9 Sep 2023 21:40:24 -0700 Subject: [PATCH] use using declarations (#1139) Signed-off-by: Rosen Penev --- taglib/toolkit/tlist.tcc | 10 +++++----- taglib/xm/xmfile.cpp | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/taglib/toolkit/tlist.tcc b/taglib/toolkit/tlist.tcc index d344bd73..879dcde7 100644 --- a/taglib/toolkit/tlist.tcc +++ b/taglib/toolkit/tlist.tcc @@ -51,8 +51,8 @@ template template class List::ListPrivate : public ListPrivateBase { public: - ListPrivate() : ListPrivateBase() {} - ListPrivate(const std::list &l) : ListPrivateBase(), list(l) {} + using ListPrivateBase::ListPrivateBase; + ListPrivate(const std::list &l) : list(l) {} void clear() { list.clear(); } @@ -63,11 +63,11 @@ public: // setAutoDelete() functionality. template -template class List::ListPrivate : public ListPrivateBase +template class List::ListPrivate : public ListPrivateBase { public: - ListPrivate() : ListPrivateBase() {} - ListPrivate(const std::list &l) : ListPrivateBase(), list(l) {} + using ListPrivateBase::ListPrivateBase; + ListPrivate(const std::list &l) : list(l) {} ~ListPrivate() { clear(); } diff --git a/taglib/xm/xmfile.cpp b/taglib/xm/xmfile.cpp index 1dfbe1f9..f29d4100 100644 --- a/taglib/xm/xmfile.cpp +++ b/taglib/xm/xmfile.cpp @@ -154,8 +154,7 @@ private: class ByteReader : public ValueReader { public: - ByteReader(unsigned char &byte) : ValueReader(byte) {} - + using ValueReader::ValueReader; unsigned int read(TagLib::File &file, unsigned int limit) override { ByteVector data = file.readBlock(std::min(1U,limit));