summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-12-14 09:31:21 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-12-14 09:38:35 (GMT)
commit76213ac8028079a9933548625bd917f49862f4c1 (patch)
tree5fe04286a2b18434da733d04eff7d16e7c6620f7 /src/corelib/tools
parent39ca4450e0c2ca16ba253f1a3ac3ea5bdd23f290 (diff)
downloadQt-76213ac8028079a9933548625bd917f49862f4c1.zip
Qt-76213ac8028079a9933548625bd917f49862f4c1.tar.gz
Qt-76213ac8028079a9933548625bd917f49862f4c1.tar.bz2
Fix warning in public header
qcache.h:73: warning: declaration of 'object' shadows a member of this Spotted by compilerwarnings autotest Reviewed-by: Thiago
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qcache.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h
index 086a52f..66f9f73 100644
--- a/src/corelib/tools/qcache.h
+++ b/src/corelib/tools/qcache.h
@@ -70,9 +70,9 @@ class QCache
if (l == &n) l = n.p;
if (f == &n) f = n.n;
total -= n.c;
- T *object = n.t;
+ T *obj = n.t;
hash.remove(*n.keyPtr);
- delete object;
+ delete obj;
}
inline T *relink(const Key &key) {
typename QHash<Key, Node>::iterator i = hash.find(key);