1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecate QObject::findChildren(const QRegExp &, ...)

Browse Source 
Use the overload using QRegularExpression instead.

Change-Id: I1bf468b248c0a3f5b2304b1831379a127093df06
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
This commit is contained in:
Lars Knoll 2018-12-10 14:58:18 +01:00
parent 13ba85a70d
commit 43720ec200
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/kernel/qobject.cpp
View File

@ -1820,12 +1820,15 @@ void QObject::killTimer(int id)
/*! /*!
\fn template<typename T> QList<T> QObject::findChildren(const QRegExp &regExp, Qt::FindChildOptions options) const \fn template<typename T> QList<T> QObject::findChildren(const QRegExp &regExp, Qt::FindChildOptions options) const
\overload findChildren() \overload findChildren()
\obsolete
Returns the children of this object that can be cast to type T Returns the children of this object that can be cast to type T
and that have names matching the regular expression \a regExp, and that have names matching the regular expression \a regExp,
or an empty list if there are no such objects. or an empty list if there are no such objects.
The search is performed recursively, unless \a options specifies the The search is performed recursively, unless \a options specifies the
option FindDirectChildrenOnly. option FindDirectChildrenOnly.
Use the findChildren overload taking a QRegularExpression instead.
*/ */
/*! /*!

3
src/corelib/kernel/qobject.h
View File

@ -176,7 +176,9 @@ public:
} }
#ifndef QT_NO_REGEXP #ifndef QT_NO_REGEXP
#if QT_DEPRECATED_SINCE(5, 13)
template<typename T> template<typename T>
QT_DEPRECATED_X("Use findChildren(const RegularExpression &, ...) instead.")
inline QList<T> findChildren(const QRegExp &re, Qt::FindChildOptions options = Qt::FindChildrenRecursively) const inline QList<T> findChildren(const QRegExp &re, Qt::FindChildOptions options = Qt::FindChildrenRecursively) const
{ {
typedef typename std::remove_cv<typename std::remove_pointer<T>::type>::type ObjType; typedef typename std::remove_cv<typename std::remove_pointer<T>::type>::type ObjType;
@ -186,6 +188,7 @@ public:
return list; return list;
} }
#endif #endif
#endif
#if QT_CONFIG(regularexpression) #if QT_CONFIG(regularexpression)
template<typename T> template<typename T>