From eff09a2794bcb4b5373fcee85faa498b36fac27c Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Mon, 19 Dec 2011 12:50:51 +0100
Subject: Fix for -Werror -Wshadow

qevent.h:792:49: error: declaration of 'device' shadows a member of 'this' [-Werror=shadow]

Change-Id: Iccb7e79dd97d55b17fbd4dfaf3503b9e251adcfc
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/gui/kernel/qevent.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gui')

diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 4296078cfd..a4d287f16e 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -789,7 +789,7 @@ public:
     inline void setTarget(QObject *atarget) { _target = atarget; }
     inline void setTouchPointStates(Qt::TouchPointStates aTouchPointStates) { _touchPointStates = aTouchPointStates; }
     inline void setTouchPoints(const QList<QTouchEvent::TouchPoint> &atouchPoints) { _touchPoints = atouchPoints; }
-    inline void setDevice(QTouchDevice *device) { _device = device; }
+    inline void setDevice(QTouchDevice *adevice) { _device = adevice; }
 
 protected:
     QWindow *_window;
-- 
cgit v1.2.3