From 22225b1b06eca6b325e609da94715f9dbc79ff4d Mon Sep 17 00:00:00 2001 From: David Faure Date: Thu, 12 Jan 2012 18:00:42 +0100 Subject: Fix compilation of public headers with -Werror=shadow Change-Id: Id47623002abca1e03fdfb9e9bd9cbc1b5542a2db Reviewed-by: Thiago Macieira --- src/corelib/kernel/qtimer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/kernel/qtimer.h') diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index b1bbfa4241..6fb32f9bde 100644 --- a/src/corelib/kernel/qtimer.h +++ b/src/corelib/kernel/qtimer.h @@ -70,7 +70,7 @@ public: void setInterval(int msec); int interval() const { return inter; } - void setTimerType(Qt::TimerType type) { this->type = type; } + void setTimerType(Qt::TimerType atype) { this->type = atype; } Qt::TimerType timerType() const { return Qt::TimerType(type); } inline void setSingleShot(bool singleShot); -- cgit v1.2.3