diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-05-30 13:53:24 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-05 18:42:26 +0200 |
commit | 7d28f7772cd8f5aad63359ed0b9c57c12923dc85 (patch) | |
tree | 71e1cc4d972f7417b0d510451aacfce2e98eafa7 /src/gui/kernel/qguiapplication_p.h | |
parent | fa7c9bbe1cc71a16835c373095515513ab5949db (diff) |
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>
Diffstat (limited to 'src/gui/kernel/qguiapplication_p.h')
-rw-r--r-- | src/gui/kernel/qguiapplication_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
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; |