diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-01-06 07:33:17 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-08 23:54:56 +0100 |
| commit | 7aeccb183a827e8504d7dd8614d1ca555caf61d9 (patch) | |
| tree | f8b300daa82ffe59bb8007891be05c04ab625af4 /src/corelib | |
| parent | 7e40ea4499ff9a6a96bf71019428dbb08876a2cd (diff) | |
Remove the Q_TYPENAME define.
It is mostly not used (most places in Qt use typename directly), so
is already not very useful.
For example typename is used in:
QDataStream& operator<<(QDataStream& s, const QVector<T>& v)
Change-Id: I85337ad7d8d4ebbb424bfa2ab9a356456ff3e90f
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.h | 6 | ||||
| -rw-r--r-- | src/corelib/io/qdebug.h | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qvector.h | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index f07a48eca4..b1bd425852 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -552,7 +552,6 @@ namespace QT_NAMESPACE {} # define Q_NO_BOOL_TYPE # define Q_NO_EXPLICIT_KEYWORD # define Q_NO_USING_KEYWORD -# define Q_TYPENAME # define Q_OUTOFLINE_TEMPLATE inline # define Q_BROKEN_TEMPLATE_SPECIALIZATION # define Q_CANNOT_DELETE_CONSTANT @@ -586,7 +585,6 @@ namespace QT_NAMESPACE {} /* Apply to all versions prior to Compaq C++ V6.0-000 - observed on DEC C++ V5.5-004. */ # if __DECCXX_VER < 60060000 -# define Q_TYPENAME # define Q_BROKEN_TEMPLATE_SPECIALIZATION # define Q_CANNOT_DELETE_CONSTANT # endif @@ -1619,10 +1617,6 @@ inline int qMacVersion() { return QSysInfo::MacintoshVersion; } # define Q_INLINE_TEMPLATE inline #endif -#ifndef Q_TYPENAME -# define Q_TYPENAME typename -#endif - /* Avoid "unused parameter" warnings */ diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index ecef792e70..0654bf6f25 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -159,7 +159,7 @@ inline QDebug operator<<(QDebug debug, const QList<T> &list) #endif { debug.nospace() << '('; - for (Q_TYPENAME QList<T>::size_type i = 0; i < list.count(); ++i) { + for (typename QList<T>::size_type i = 0; i < list.count(); ++i) { if (i) debug << ", "; debug << list.at(i); diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 17f51fb575..2e8abcad25 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -591,7 +591,7 @@ void QVector<T>::append(const T &t) } template <typename T> -Q_TYPENAME QVector<T>::iterator QVector<T>::insert(iterator before, size_type n, const T &t) +typename QVector<T>::iterator QVector<T>::insert(iterator before, size_type n, const T &t) { int offset = int(before - p->array); if (n != 0) { @@ -625,7 +625,7 @@ Q_TYPENAME QVector<T>::iterator QVector<T>::insert(iterator before, size_type n, } template <typename T> -Q_TYPENAME QVector<T>::iterator QVector<T>::erase(iterator abegin, iterator aend) +typename QVector<T>::iterator QVector<T>::erase(iterator abegin, iterator aend) { int f = int(abegin - p->array); int l = int(aend - p->array); |