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/util | |
| 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/util')
| -rw-r--r-- | src/quick/util/qquickbehavior.cpp | 3 | ||||
| -rw-r--r-- | src/quick/util/qquickpropertychanges.cpp | 3 | ||||
| -rw-r--r-- | src/quick/util/qquickstatechangescript.cpp | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp index 1e77084e42..2d765dc5ee 100644 --- a/src/quick/util/qquickbehavior.cpp +++ b/src/quick/util/qquickbehavior.cpp @@ -45,7 +45,6 @@ #include <qqmlcontext.h> #include <qqmlinfo.h> #include <private/qqmlproperty_p.h> -#include <private/qqmlguard_p.h> #include <private/qqmlengine_p.h> #include <private/qabstractanimationjob_p.h> #include <private/qquicktransition_p.h> @@ -65,7 +64,7 @@ public: QQmlProperty property; QVariant targetValue; - QQmlGuard<QQuickAbstractAnimation> animation; + QPointer<QQuickAbstractAnimation> animation; QAbstractAnimationJob *animationInstance; bool enabled; bool finalized; diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp index b2aa004e4f..e6f89b9b89 100644 --- a/src/quick/util/qquickpropertychanges.cpp +++ b/src/quick/util/qquickpropertychanges.cpp @@ -50,7 +50,6 @@ #include <qqmlexpression.h> #include <private/qqmlbinding_p.h> #include <qqmlcontext.h> -#include <private/qqmlguard_p.h> #include <private/qqmlproperty_p.h> #include <private/qqmlcontext_p.h> #include <private/qquickstate_p_p.h> @@ -199,7 +198,7 @@ public: QQuickPropertyChangesPrivate() : decoded(true), restore(true), isExplicit(false) {} - QQmlGuard<QObject> object; + QPointer<QObject> object; QByteArray data; bool decoded : 1; diff --git a/src/quick/util/qquickstatechangescript.cpp b/src/quick/util/qquickstatechangescript.cpp index 3e89934478..2ad42f68fb 100644 --- a/src/quick/util/qquickstatechangescript.cpp +++ b/src/quick/util/qquickstatechangescript.cpp @@ -45,7 +45,6 @@ #include <qqmlcontext.h> #include <qqmlexpression.h> #include <qqmlinfo.h> -#include <private/qqmlguard_p.h> #include <private/qqmlcontext_p.h> #include <private/qqmlproperty_p.h> #include <private/qqmlbinding_p.h> |