diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-07-05 13:29:57 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-05 15:02:58 +0200 |
| commit | 5d6f8b18fe77d2fc17a3c1d77d1c4baeff0e9704 (patch) | |
| tree | 507f652c897825a7f6b3a09a5dd2c09d6c1797f4 /src/quick/items/qquickpathview_p_p.h | |
| parent | 2e4d1ccb18aba13f94670d3d1104839fecf2ab5c (diff) | |
Get rid of the first half of QQmlGuard usage
QQmlGuard was being used as a more performant replacement
for QPointer. QPointer got now fixed in Qt 5.0, making this
class obsolete.
Change-Id: I77eef066c4823af4b074ef32d4d78dbd67c36cd0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/quick/items/qquickpathview_p_p.h')
| -rw-r--r-- | src/quick/items/qquickpathview_p_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/quick/items/qquickpathview_p_p.h b/src/quick/items/qquickpathview_p_p.h index 26533057d1..aa539e7cfc 100644 --- a/src/quick/items/qquickpathview_p_p.h +++ b/src/quick/items/qquickpathview_p_p.h @@ -61,7 +61,6 @@ #include <QtCore/qcoreapplication.h> #include <private/qquickanimation_p_p.h> -#include <private/qqmlguard_p.h> #include <private/qqmldelegatemodel_p.h> #include <private/qquicktimeline_p_p.h> @@ -132,7 +131,7 @@ public: QQuickPath *path; int currentIndex; - QQmlGuard<QQuickItem> currentItem; + QPointer<QQuickItem> currentItem; qreal currentItemOffset; qreal startPc; QPointF startPoint; @@ -169,7 +168,7 @@ public: qreal requestedZ; QList<QQuickItem *> items; QList<QQuickItem *> itemCache; - QQmlGuard<QQmlInstanceModel> model; + QPointer<QQmlInstanceModel> model; QVariant modelVariant; enum MovementReason { Other, SetIndex, Mouse }; MovementReason moveReason; |