diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-20 12:10:18 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-14 09:58:51 +0200 |
| commit | 67ba2a5db89fb1964de00e91c3144ffecf0b72fe (patch) | |
| tree | 8248c68abc75c32c47cccb8526fe88c9afda8d06 /src/corelib/kernel/qobject.h | |
| parent | 80602ce2b34e6999706200f7dac02e0b5b05ff1c (diff) | |
QObject/Q_OBJECT: remove deprecated old API
Since 5.0, trUtf8(), qFindChild()
Change-Id: I7bc0d125f92faebf24a422c1aac528a3f4687434
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/kernel/qobject.h')
| -rw-r--r-- | src/corelib/kernel/qobject.h | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index 46ed2fc6f3..d1a0c3562c 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Copyright (C) 2013 Olivier Goffart <ogoffart@woboq.com> ** Contact: https://www.qt.io/licensing/ ** @@ -130,11 +130,7 @@ public: #if defined(QT_NO_TRANSLATION) || defined(Q_CLANG_QDOC) static QString tr(const char *sourceText, const char * = nullptr, int = -1) { return QString::fromUtf8(sourceText); } -#if QT_DEPRECATED_SINCE(5, 0) - QT_DEPRECATED static QString trUtf8(const char *sourceText, const char * = nullptr, int = -1) - { return QString::fromUtf8(sourceText); } -#endif -#endif //QT_NO_TRANSLATION +#endif // QT_NO_TRANSLATION QString objectName() const; void setObjectName(const QString &name); @@ -439,19 +435,6 @@ inline QMetaObject::Connection QObject::connect(const QObject *asender, const ch const char *amember, Qt::ConnectionType atype) const { return connect(asender, asignal, this, amember, atype); } -#if QT_DEPRECATED_SINCE(5, 0) -template<typename T> -inline QT_DEPRECATED T qFindChild(const QObject *o, const QString &name = QString()) -{ return o->findChild<T>(name); } - -template<typename T> -inline QT_DEPRECATED QList<T> qFindChildren(const QObject *o, const QString &name = QString()) -{ - return o->findChildren<T>(name); -} - -#endif //QT_DEPRECATED - template <class T> inline T qobject_cast(QObject *object) { |