From 7d28f7772cd8f5aad63359ed0b9c57c12923dc85 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Wed, 30 May 2012 13:53:24 +0200
Subject: Use QPointer instead of QWeakPointer.

The use of QWeakPointer for tracking QObject pointers is to be
deprecated.

Change-Id: If460ca7f515db77af24030152f4bd56e1a5fae7c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/gui/kernel/qguiapplication_p.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/gui/kernel/qguiapplication_p.h')

diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index 8b7977e87a..e79c2afdf2 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -205,8 +205,8 @@ public:
         int touchPointId;
     };
     struct ActiveTouchPointsValue {
-        QWeakPointer<QWindow> window;
-        QWeakPointer<QObject> target;
+        QPointer<QWindow> window;
+        QPointer<QObject> target;
         QTouchEvent::TouchPoint touchPoint;
     };
     QHash<ActiveTouchPointsKey, ActiveTouchPointsValue> activeTouchPoints;
@@ -216,7 +216,7 @@ public:
             : pos(p), screenPos(sp), window(w) { }
         QPointF pos;
         QPointF screenPos;
-        QWeakPointer<QWindow> window;
+        QPointer<QWindow> window;
     };
     QHash<QWindow *, SynthesizedMouseData> synthesizedMousePoints;
 
-- 
cgit v1.2.3