diff options
Diffstat (limited to 'src/corelib/kernel/qobject.h')
-rw-r--r-- | src/corelib/kernel/qobject.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index 8d9cc3ab83..556d975786 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -72,9 +72,6 @@ class QObject; class QThread; class QWidget; class QAccessibleWidget; -#ifndef QT_NO_REGEXP -class QRegExp; -#endif #if QT_CONFIG(regularexpression) class QRegularExpression; #endif @@ -84,8 +81,6 @@ typedef QList<QObject*> QObjectList; Q_CORE_EXPORT void qt_qFindChildren_helper(const QObject *parent, const QString &name, 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, 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); @@ -180,21 +175,6 @@ public: 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) template<typename T> 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); } -#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 template <class T> |