diff options
| author | miniak <milan.burda@gmail.com> | 2010-08-03 16:33:12 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-03 16:35:28 (GMT) |
| commit | 26f43dcc70a0bcc8aec96a0ca6f648c543b97b10 (patch) | |
| tree | a387f04203570a75e347abd78cf765e9903c9e36 /src/corelib/kernel/qobject.h | |
| parent | 02e5a6c9abe9562ce2b2057c0b89f65d371c5b40 (diff) | |
| download | Qt-26f43dcc70a0bcc8aec96a0ca6f648c543b97b10.zip Qt-26f43dcc70a0bcc8aec96a0ca6f648c543b97b10.tar.gz Qt-26f43dcc70a0bcc8aec96a0ca6f648c543b97b10.tar.bz2 | |
It is no longer necessary to check for QT_NO_MEMBER_TEMPLATES
Merge-request: 756
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qobject.h')
| -rw-r--r-- | src/corelib/kernel/qobject.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index 7f0084c..c8aa2b5 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -156,7 +156,6 @@ public: int startTimer(int interval); void killTimer(int id); -#ifndef QT_NO_MEMBER_TEMPLATES template<typename T> inline T findChild(const QString &aName = QString()) const { return qFindChild<T>(this, aName); } @@ -170,7 +169,6 @@ public: inline QList<T> findChildren(const QRegExp &re) const { return qFindChildren<T>(this, re); } #endif -#endif #ifdef QT3_SUPPORT QT3_SUPPORT QObject *child(const char *objName, const char *inheritsClass = 0, @@ -369,7 +367,7 @@ inline QList<T> qFindChildren(const QObject *o, const QRegExp &re) template <class T> inline T qobject_cast(QObject *object) { -#if !defined(QT_NO_MEMBER_TEMPLATES) && !defined(QT_NO_QOBJECT_CHECK) +#if !defined(QT_NO_QOBJECT_CHECK) reinterpret_cast<T>(0)->qt_check_for_QOBJECT_macro(*reinterpret_cast<T>(object)); #endif return static_cast<T>(reinterpret_cast<T>(0)->staticMetaObject.cast(object)); @@ -382,7 +380,7 @@ inline T qobject_cast(const QObject *object) register T ptr = static_cast<T>(object); Q_UNUSED(ptr); -#if !defined(QT_NO_MEMBER_TEMPLATES) && !defined(QT_NO_QOBJECT_CHECK) +#if !defined(QT_NO_QOBJECT_CHECK) reinterpret_cast<T>(0)->qt_check_for_QOBJECT_macro(*reinterpret_cast<T>(const_cast<QObject *>(object))); #endif return static_cast<T>(const_cast<QObject *>(reinterpret_cast<T>(0)->staticMetaObject.cast(const_cast<QObject *>(object)))); |