From 33218bac1b81878944ab7f15a2ebac38dd0c317a Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Mon, 24 Aug 2020 11:45:35 +0200 Subject: QStringList: inherit the constructors from QList Otherwise it would be missing some, e.g. QStringList(qsizetype). Change-Id: I5214672e62c98514b37b09d283e6035c799eda99 Reviewed-by: Lars Knoll --- src/corelib/text/qstringlist.cpp | 23 ----------------------- src/corelib/text/qstringlist.h | 6 +----- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/src/corelib/text/qstringlist.cpp b/src/corelib/text/qstringlist.cpp index 33b49d26b6..233f765355 100644 --- a/src/corelib/text/qstringlist.cpp +++ b/src/corelib/text/qstringlist.cpp @@ -184,12 +184,6 @@ QT_BEGIN_NAMESPACE \sa QString */ -/*! - \fn QStringList::QStringList() - - Constructs an empty string list. -*/ - /*! \fn QStringList::QStringList(const QString &str) @@ -721,21 +715,4 @@ qsizetype QtPrivate::QStringList_removeDuplicates(QStringList *that) return n - j; } -/*! \fn QStringList::QStringList(std::initializer_list args) - \since 4.8 - - Construct a list from a std::initializer_list given by \a args. - - This constructor is only enabled if the compiler supports C++11 initializer - lists. -*/ - - /*! \fn template QStringList::QStringList(InputIterator first, InputIterator last) - \since 5.14 - - Constructs a QStringList with the contents in the iterator range [\a first, \a last). - - The value type of \c InputIterator must be convertible to \c QString. - */ - QT_END_NAMESPACE diff --git a/src/corelib/text/qstringlist.h b/src/corelib/text/qstringlist.h index 8e5672b139..2b5c960b75 100644 --- a/src/corelib/text/qstringlist.h +++ b/src/corelib/text/qstringlist.h @@ -105,14 +105,10 @@ class QStringList : public QList { #endif public: - inline QStringList() noexcept { } + using QList::QList; inline explicit QStringList(const QString &i) { append(i); } inline QStringList(const QList &l) : QList(l) { } inline QStringList(QList &&l) noexcept : QList(std::move(l)) { } - inline QStringList(std::initializer_list args) : QList(args) { } - template = true> - inline QStringList(InputIterator first, InputIterator last) - : QList(first, last) { } QStringList &operator=(const QList &other) { QList::operator=(other); return *this; } -- cgit v1.2.3