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

Remove QRegExp based functionality from QObject

Browse Source 
QRegExp is going away for Qt6.

Change-Id: I04d6331379dc769394b160d976eb9f21fe649a22
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
This commit is contained in:
Lars Knoll 2020-04-02 14:47:25 +02:00
parent eb349930ee
commit dd152c8404
2 changed files with 0 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,6 @@
#include "qloggingcategory.h" #include "qloggingcategory.h"
#include "qvariant.h" #include "qvariant.h"
#include "qmetaobject.h" #include "qmetaobject.h"
#include <qregexp.h>
#if QT_CONFIG(regularexpression) #if QT_CONFIG(regularexpression)
# include <qregularexpression.h> # include <qregularexpression.h>
#endif #endif
@ -1900,20 +1899,6 @@ void QObject::killTimer(int id)
\sa findChild() \sa findChild()
*/ */
/*!
\fn template<typename T> QList<T> QObject::findChildren(const QRegExp &regExp, Qt::FindChildOptions options) const
\overload findChildren()
\obsolete
Returns the children of this object that can be cast to type T
and that have names matching the regular expression \a regExp,
or an empty list if there are no such objects.
The search is performed recursively, unless \a options specifies the
option FindDirectChildrenOnly.
Use the findChildren overload taking a QRegularExpression instead.
*/
/*! /*!
\fn QList<T> QObject::findChildren(const QRegularExpression &re, Qt::FindChildOptions options) const \fn QList<T> QObject::findChildren(const QRegularExpression &re, Qt::FindChildOptions options) const
\overload findChildren() \overload findChildren()
@ -1959,21 +1944,6 @@ void QObject::killTimer(int id)
\sa QObject::findChildren() \sa QObject::findChildren()
*/ */
/*!
\fn template<typename T> QList<T> qFindChildren(const QObject *obj, const QRegExp &regExp)
\relates QObject
\overload qFindChildren()
This function is equivalent to
\a{obj}->\l{QObject::findChildren()}{findChildren}<T>(\a regExp).
\note This function was provided as a workaround for MSVC 6
which did not support member template functions. It is advised
to use the other form in new code.
\sa QObject::findChildren()
*/
/*! /*!
\internal \internal
*/ */
@ -1995,29 +1965,6 @@ void qt_qFindChildren_helper(const QObject *parent, const QString &name,
} }
} }
#ifndef QT_NO_REGEXP
/*!
\internal
*/
void qt_qFindChildren_helper(const QObject *parent, const QRegExp &re,
const QMetaObject &mo, QList<void*> *list, Qt::FindChildOptions options)
{
if (!parent || !list)
return;
const QObjectList &children = parent->children();
QRegExp reCopy = re;
QObject *obj;
for (int i = 0; i < children.size(); ++i) {
obj = children.at(i);
if (mo.cast(obj) && reCopy.indexIn(obj->objectName()) != -1)
list->append(obj);
if (options & Qt::FindChildrenRecursively)
qt_qFindChildren_helper(obj, re, mo, list, options);
}
}
#endif // QT_NO_REGEXP
#if QT_CONFIG(regularexpression) #if QT_CONFIG(regularexpression)
/*! /*!
\internal \internal

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

@ -72,9 +72,6 @@ class QObject;
class QThread; class QThread;
class QWidget; class QWidget;
class QAccessibleWidget; class QAccessibleWidget;
#ifndef QT_NO_REGEXP
class QRegExp;
#endif
#if QT_CONFIG(regularexpression) #if QT_CONFIG(regularexpression)
class QRegularExpression; class QRegularExpression;
#endif #endif
@ -84,8 +81,6 @@ typedef QList<QObject*> QObjectList;
Q_CORE_EXPORT void qt_qFindChildren_helper(const QObject *parent, const QString &name, Q_CORE_EXPORT void qt_qFindChildren_helper(const QObject *parent, const QString &name,
const QMetaObject &mo, QList<void *> *list, Qt::FindChildOptions options); const QMetaObject &mo, QList<void *> *list, Qt::FindChildOptions options);
Q_CORE_EXPORT void qt_qFindChildren_helper(const QObject *parent, const QRegExp &re,
const QMetaObject &mo, QList<void *> *list, Qt::FindChildOptions options);
Q_CORE_EXPORT void qt_qFindChildren_helper(const QObject *parent, const QRegularExpression &re, Q_CORE_EXPORT void qt_qFindChildren_helper(const QObject *parent, const QRegularExpression &re,
const QMetaObject &mo, QList<void *> *list, Qt::FindChildOptions options); const QMetaObject &mo, QList<void *> *list, Qt::FindChildOptions options);
Q_CORE_EXPORT QObject *qt_qFindChild_helper(const QObject *parent, const QString &name, const QMetaObject &mo, Qt::FindChildOptions options); Q_CORE_EXPORT QObject *qt_qFindChild_helper(const QObject *parent, const QString &name, const QMetaObject &mo, Qt::FindChildOptions options);
@ -180,21 +175,6 @@ public:
return list; return list;
} }
#ifndef QT_NO_REGEXP
#if QT_DEPRECATED_SINCE(5, 13)
template<typename T>
QT_DEPRECATED_X("Use findChildren(const QRegularExpression &, ...) instead.")
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;
QList<T> list;
qt_qFindChildren_helper(this, re, ObjType::staticMetaObject,
reinterpret_cast<QList<void *> *>(&list), options);
return list;
}
#endif
#endif
#if QT_CONFIG(regularexpression) #if QT_CONFIG(regularexpression)
template<typename T> template<typename T>
inline QList<T> findChildren(const QRegularExpression &re, Qt::FindChildOptions options = Qt::FindChildrenRecursively) const inline QList<T> findChildren(const QRegularExpression &re, Qt::FindChildOptions options = Qt::FindChildrenRecursively) const
@ -475,14 +455,6 @@ inline QT_DEPRECATED QList<T> qFindChildren(const QObject *o, const QString &nam
return o->findChildren<T>(name); return o->findChildren<T>(name);
} }
#if !defined(QT_NO_REGEXP) || defined(Q_CLANG_QDOC)
template<typename T>
inline QT_DEPRECATED QList<T> qFindChildren(const QObject *o, const QRegExp &re)
{
return o->findChildren<T>(re);
}
#endif
#endif //QT_DEPRECATED #endif //QT_DEPRECATED
template <class T> template <class T>