diff options
Diffstat (limited to 'src/quick/items/qquickpositioners_p_p.h')
| -rw-r--r-- | src/quick/items/qquickpositioners_p_p.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/quick/items/qquickpositioners_p_p.h b/src/quick/items/qquickpositioners_p_p.h index d281f1a372..39ca806b5e 100644 --- a/src/quick/items/qquickpositioners_p_p.h +++ b/src/quick/items/qquickpositioners_p_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/ ** -** This file is part of the QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -56,9 +56,9 @@ #include "qquickpositioners_p.h" #include "qquickimplicitsizeitem_p_p.h" -#include <QtQuick/private/qdeclarativestate_p.h> -#include <private/qdeclarativetransitionmanager_p_p.h> -#include <private/qdeclarativestateoperations_p.h> +#include <QtQuick/private/qquickstate_p.h> +#include <private/qquicktransitionmanager_p_p.h> +#include <private/qquickstatechangescript_p.h> #include <QtCore/qobject.h> #include <QtCore/qstring.h> @@ -87,12 +87,12 @@ public: qreal spacing; QQuickBasePositioner::PositionerType type; - QDeclarativeTransition *moveTransition; - QDeclarativeTransition *addTransition; - QDeclarativeStateOperation::ActionList addActions; - QDeclarativeStateOperation::ActionList moveActions; - QDeclarativeTransitionManager addTransitionManager; - QDeclarativeTransitionManager moveTransitionManager; + QQuickTransition *moveTransition; + QQuickTransition *addTransition; + QQuickStateOperation::ActionList addActions; + QQuickStateOperation::ActionList moveActions; + QQuickTransitionManager addTransitionManager; + QQuickTransitionManager moveTransitionManager; void watchChanges(QQuickItem *other); void unwatchChanges(QQuickItem* other); |