summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2020-08-24 11:45:35 +0200
committerGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2020-08-25 01:38:51 +0200
commit33218bac1b81878944ab7f15a2ebac38dd0c317a (patch)
tree25c4fe225c423da0655d0d2901f06f5ef4a5e52e /src
parentaed0f34786100c9e113d0bb31779b3a6a0d5ba33 (diff)
QStringList: inherit the constructors from QList
Otherwise it would be missing some, e.g. QStringList(qsizetype). Change-Id: I5214672e62c98514b37b09d283e6035c799eda99 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/text/qstringlist.cpp23
-rw-r--r--src/corelib/text/qstringlist.h6
2 files changed, 1 insertions, 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
@@ -185,12 +185,6 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \fn QStringList::QStringList()
-
- Constructs an empty string list.
-*/
-
-/*!
\fn QStringList::QStringList(const QString &str)
Constructs a string list that contains the given string, \a
@@ -721,21 +715,4 @@ qsizetype QtPrivate::QStringList_removeDuplicates(QStringList *that)
return n - j;
}
-/*! \fn QStringList::QStringList(std::initializer_list<QString> 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<typename InputIterator> 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<QString>
{
#endif
public:
- inline QStringList() noexcept { }
+ using QList<QString>::QList;
inline explicit QStringList(const QString &i) { append(i); }
inline QStringList(const QList<QString> &l) : QList<QString>(l) { }
inline QStringList(QList<QString> &&l) noexcept : QList<QString>(std::move(l)) { }
- inline QStringList(std::initializer_list<QString> args) : QList<QString>(args) { }
- template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true>
- inline QStringList(InputIterator first, InputIterator last)
- : QList<QString>(first, last) { }
QStringList &operator=(const QList<QString> &other)
{ QList<QString>::operator=(other); return *this; }