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/widgets | |
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/widgets')
-rw-r--r-- | src/widgets/graphicsview/qgraph_p.h | 6 | ||||
-rw-r--r-- | src/widgets/kernel/qformlayout.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/graphicsview/qgraph_p.h b/src/widgets/graphicsview/qgraph_p.h index 7c5b07f05d..676000ac3e 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<Vertex *, QHash<Vertex *, EdgeData *> * >::const_iterator row; - Q_TYPENAME QHash<Vertex *, EdgeData *>::const_iterator column; + typename QHash<Vertex *, QHash<Vertex *, EdgeData *> * >::const_iterator row; + typename QHash<Vertex *, EdgeData *>::const_iterator column; }; const_iterator constBegin() const { @@ -228,7 +228,7 @@ public: QString edges; QSet<Vertex *> setOfVertices = vertices(); - for (Q_TYPENAME QSet<Vertex*>::const_iterator it = setOfVertices.begin(); it != setOfVertices.end(); ++it) { + for (typename QSet<Vertex*>::const_iterator it = setOfVertices.begin(); it != setOfVertices.end(); ++it) { Vertex *v = *it; QList<Vertex*> 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 e902e4c9ac..955ef4e3c7 100644 --- a/src/widgets/kernel/qformlayout.cpp +++ b/src/widgets/kernel/qformlayout.cpp @@ -93,7 +93,7 @@ void FixedColumnMatrix<T, NumColumns>::addRow(const T &value) template <class T, int NumColumns> void FixedColumnMatrix<T, NumColumns>::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); } |