summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-01-06 07:33:17 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-08 23:54:56 +0100
commit7aeccb183a827e8504d7dd8614d1ca555caf61d9 (patch)
treef8b300daa82ffe59bb8007891be05c04ab625af4 /src/testlib
parent7e40ea4499ff9a6a96bf71019428dbb08876a2cd (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/testlib')
-rw-r--r--src/testlib/qbenchmark.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp
index 02644f7dc3..b637a6e337 100644
--- a/src/testlib/qbenchmark.cpp
+++ b/src/testlib/qbenchmark.cpp
@@ -285,11 +285,11 @@ void QTest::setBenchmarkResult(qreal result, QTest::QBenchmarkMetric metric)
}
template <typename T>
-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;