diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index f07a48eca4b..b1bd4258526 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 ecef792e703..0654bf6f254 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -159,7 +159,7 @@ inline QDebug operator<<(QDebug debug, const QList &list) #endif { debug.nospace() << '('; - for (Q_TYPENAME QList::size_type i = 0; i < list.count(); ++i) { + for (typename QList::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 17f51fb5752..2e8abcad25b 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -591,7 +591,7 @@ void QVector::append(const T &t) } template -Q_TYPENAME QVector::iterator QVector::insert(iterator before, size_type n, const T &t) +typename QVector::iterator QVector::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::iterator QVector::insert(iterator before, size_type n, } template -Q_TYPENAME QVector::iterator QVector::erase(iterator abegin, iterator aend) +typename QVector::iterator QVector::erase(iterator abegin, iterator aend) { int f = int(abegin - p->array); int l = int(aend - p->array); diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp index 02644f7dc34..b637a6e3372 100644 --- a/src/testlib/qbenchmark.cpp +++ b/src/testlib/qbenchmark.cpp @@ -285,11 +285,11 @@ void QTest::setBenchmarkResult(qreal result, QTest::QBenchmarkMetric metric) } template -Q_TYPENAME T::value_type qAverage(const T &container) +typename T::value_type qAverage(const T &container) { - Q_TYPENAME T::const_iterator it = container.constBegin(); - Q_TYPENAME T::const_iterator end = container.constEnd(); - Q_TYPENAME T::value_type acc = Q_TYPENAME T::value_type(); + typename T::const_iterator it = container.constBegin(); + typename T::const_iterator end = container.constEnd(); + typename T::value_type acc = typename T::value_type(); int count = 0; while (it != end) { acc += *it; diff --git a/src/widgets/graphicsview/qgraph_p.h b/src/widgets/graphicsview/qgraph_p.h index 7c5b07f05d0..676000ac3e3 100644 --- a/src/widgets/graphicsview/qgraph_p.h +++ b/src/widgets/graphicsview/qgraph_p.h @@ -121,8 +121,8 @@ public: private: const Graph *g; - Q_TYPENAME QHash * >::const_iterator row; - Q_TYPENAME QHash::const_iterator column; + typename QHash * >::const_iterator row; + typename QHash::const_iterator column; }; const_iterator constBegin() const { @@ -228,7 +228,7 @@ public: QString edges; QSet setOfVertices = vertices(); - for (Q_TYPENAME QSet::const_iterator it = setOfVertices.begin(); it != setOfVertices.end(); ++it) { + for (typename QSet::const_iterator it = setOfVertices.begin(); it != setOfVertices.end(); ++it) { Vertex *v = *it; QList adjacents = adjacentVertices(v); for (int i = 0; i < adjacents.count(); ++i) { diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp index e902e4c9acb..955ef4e3c76 100644 --- a/src/widgets/kernel/qformlayout.cpp +++ b/src/widgets/kernel/qformlayout.cpp @@ -93,7 +93,7 @@ void FixedColumnMatrix::addRow(const T &value) template void FixedColumnMatrix::insertRow(int r, const T &value) { - Q_TYPENAME Storage::iterator it = m_storage.begin(); + typename Storage::iterator it = m_storage.begin(); it += r * NumColumns; m_storage.insert(it, NumColumns, value); } diff --git a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp index 9fce79eef36..5735c4043b0 100644 --- a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp +++ b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp @@ -174,7 +174,7 @@ bool isSorted(ContainerType &container, LessThan lessThan) template bool isSorted(ContainerType &container) { - return isSorted(container, qLess()); + return isSorted(container, qLess()); } diff --git a/tests/benchmarks/corelib/tools/qvector/qrawvector.h b/tests/benchmarks/corelib/tools/qvector/qrawvector.h index 05375f98454..14fe9ca6c11 100644 --- a/tests/benchmarks/corelib/tools/qvector/qrawvector.h +++ b/tests/benchmarks/corelib/tools/qvector/qrawvector.h @@ -528,7 +528,7 @@ void QRawVector::append(const T &t) } template -Q_TYPENAME QRawVector::iterator QRawVector::insert(iterator before, size_type n, const T &t) +typename QRawVector::iterator QRawVector::insert(iterator before, size_type n, const T &t) { int offset = int(before - m_begin); if (n != 0) { @@ -562,7 +562,7 @@ Q_TYPENAME QRawVector::iterator QRawVector::insert(iterator before, size_t } template -Q_TYPENAME QRawVector::iterator QRawVector::erase(iterator abegin, iterator aend) +typename QRawVector::iterator QRawVector::erase(iterator abegin, iterator aend) { int f = int(abegin - m_begin); int l = int(aend - m_begin);