diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /src/quick/items/qquickpositioners.cpp | |
parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) |
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.
Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.
Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquickpositioners.cpp')
-rw-r--r-- | src/quick/items/qquickpositioners.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp index 77d2a360b8..739f74d69a 100644 --- a/src/quick/items/qquickpositioners.cpp +++ b/src/quick/items/qquickpositioners.cpp @@ -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 @@ -42,15 +42,15 @@ #include "qquickpositioners_p.h" #include "qquickpositioners_p_p.h" -#include <QtDeclarative/qdeclarative.h> -#include <QtDeclarative/qdeclarativeinfo.h> +#include <QtQml/qqml.h> +#include <QtQml/qqmlinfo.h> #include <QtCore/qmath.h> #include <QtCore/qcoreapplication.h> -#include <QtQuick/private/qdeclarativestate_p.h> -#include <QtQuick/private/qdeclarativestategroup_p.h> -#include <private/qdeclarativestateoperations_p.h> -#include <QtQuick/private/qdeclarativetransition_p.h> +#include <QtQuick/private/qquickstate_p.h> +#include <QtQuick/private/qquickstategroup_p.h> +#include <private/qquickstatechangescript_p.h> +#include <QtQuick/private/qquicktransition_p.h> QT_BEGIN_NAMESPACE @@ -137,13 +137,13 @@ void QQuickBasePositioner::setSpacing(qreal s) emit spacingChanged(); } -QDeclarativeTransition *QQuickBasePositioner::move() const +QQuickTransition *QQuickBasePositioner::move() const { Q_D(const QQuickBasePositioner); return d->moveTransition; } -void QQuickBasePositioner::setMove(QDeclarativeTransition *mt) +void QQuickBasePositioner::setMove(QQuickTransition *mt) { Q_D(QQuickBasePositioner); if (mt == d->moveTransition) @@ -152,13 +152,13 @@ void QQuickBasePositioner::setMove(QDeclarativeTransition *mt) emit moveChanged(); } -QDeclarativeTransition *QQuickBasePositioner::add() const +QQuickTransition *QQuickBasePositioner::add() const { Q_D(const QQuickBasePositioner); return d->addTransition; } -void QQuickBasePositioner::setAdd(QDeclarativeTransition *add) +void QQuickBasePositioner::setAdd(QQuickTransition *add) { Q_D(QQuickBasePositioner); if (add == d->addTransition) @@ -266,12 +266,12 @@ void QQuickBasePositioner::positionX(qreal x, const PositionedItem &target) if (!d->addTransition || !d->addTransition->enabled()) target.item->setX(x); else - d->addActions << QDeclarativeAction(target.item, QLatin1String("x"), QVariant(x)); + d->addActions << QQuickAction(target.item, QLatin1String("x"), QVariant(x)); } else if (x != target.item->x()) { if (!d->moveTransition || !d->moveTransition->enabled()) target.item->setX(x); else - d->moveActions << QDeclarativeAction(target.item, QLatin1String("x"), QVariant(x)); + d->moveActions << QQuickAction(target.item, QLatin1String("x"), QVariant(x)); } } } @@ -284,12 +284,12 @@ void QQuickBasePositioner::positionY(qreal y, const PositionedItem &target) if (!d->addTransition || !d->addTransition->enabled()) target.item->setY(y); else - d->addActions << QDeclarativeAction(target.item, QLatin1String("y"), QVariant(y)); + d->addActions << QQuickAction(target.item, QLatin1String("y"), QVariant(y)); } else if (y != target.item->y()) { if (!d->moveTransition || !d->moveTransition->enabled()) target.item->setY(y); else - d->moveActions << QDeclarativeAction(target.item, QLatin1String("y"), QVariant(y)); + d->moveActions << QQuickAction(target.item, QLatin1String("y"), QVariant(y)); } } } @@ -454,7 +454,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem) Below is a Column that contains three rectangles of various sizes: - \snippet doc/src/snippets/declarative/column/vertical-positioner.qml document + \snippet doc/src/snippets/qml/column/vertical-positioner.qml document The Column automatically positions these items in a vertical formation, like this: @@ -483,7 +483,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem) For example, the Column below sets the \l move property to a specific \l Transition: - \snippet doc/src/snippets/declarative/column/column-transitions.qml document + \snippet doc/src/snippets/qml/column/column-transitions.qml document When the Space key is pressed, the \l {Item::visible}{visible} value of the green \l Rectangle is toggled. As it appears and disappears, the blue \l Rectangle moves within @@ -491,7 +491,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem) \image verticalpositioner_transition.gif - \sa Row, Grid, Flow, Positioner, {declarative/positioners}{Positioners example} + \sa Row, Grid, Flow, Positioner, {qml/positioners}{Positioners example} */ /*! \qmlproperty Transition QtQuick2::Column::add @@ -519,7 +519,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem) addition or removal of other items in the positioner, or when items move due to a move operation in a related model, or when items resize themselves. - \sa add, {declarative/positioners}{Positioners example} + \sa add, {qml/positioners}{Positioners example} */ /*! \qmlproperty real QtQuick2::Column::spacing @@ -593,7 +593,7 @@ void QQuickColumn::reportConflictingAnchors() Below is a Row that contains three rectangles of various sizes: - \snippet doc/src/snippets/declarative/row/row.qml document + \snippet doc/src/snippets/qml/row/row.qml document The Row automatically positions these items in a horizontal formation, like this: @@ -615,7 +615,7 @@ void QQuickColumn::reportConflictingAnchors() \l{Item Layouts}. - \sa Column, Grid, Flow, Positioner, {declarative/positioners}{Positioners example} + \sa Column, Grid, Flow, Positioner, {qml/positioners}{Positioners example} */ /*! \qmlproperty Transition QtQuick2::Row::add @@ -655,7 +655,7 @@ void QQuickColumn::reportConflictingAnchors() } \endqml - \sa add, {declarative/positioners}{Positioners example} + \sa add, {qml/positioners}{Positioners example} */ /*! \qmlproperty real QtQuick2::Row::spacing @@ -684,7 +684,7 @@ QQuickRow::QQuickRow(QQuickItem *parent) the right anchor remains to the right of the row. \endlist - \sa Grid::layoutDirection, Flow::layoutDirection, {declarative/righttoleft/layoutdirection}{Layout directions example} + \sa Grid::layoutDirection, Flow::layoutDirection, {qml/righttoleft/layoutdirection}{Layout directions example} */ Qt::LayoutDirection QQuickRow::layoutDirection() const @@ -813,7 +813,7 @@ void QQuickRow::reportConflictingAnchors() For example, below is a Grid that contains five rectangles of various sizes: - \snippet doc/src/snippets/declarative/grid/grid.qml document + \snippet doc/src/snippets/qml/grid/grid.qml document The Grid automatically positions the child items in a grid formation: @@ -829,7 +829,7 @@ void QQuickRow::reportConflictingAnchors() \l{Item Layouts}. - \sa Flow, Row, Column, Positioner, {declarative/positioners}{Positioners example} + \sa Flow, Row, Column, Positioner, {qml/positioners}{Positioners example} */ /*! \qmlproperty Transition QtQuick2::Grid::add @@ -868,7 +868,7 @@ void QQuickRow::reportConflictingAnchors() } \endqml - \sa add, {declarative/positioners}{Positioners example} + \sa add, {qml/positioners}{Positioners example} */ /*! \qmlproperty qreal QtQuick2::Grid::spacing @@ -1023,7 +1023,7 @@ void QQuickGrid::setColumnSpacing(const qreal columnSpacing) \l Grid::flow property. \endlist - \sa Flow::layoutDirection, Row::layoutDirection, {declarative/righttoleft/layoutdirection}{Layout directions example} + \sa Flow::layoutDirection, Row::layoutDirection, {qml/righttoleft/layoutdirection}{Layout directions example} */ Qt::LayoutDirection QQuickGrid::layoutDirection() const { @@ -1228,7 +1228,7 @@ void QQuickGrid::reportConflictingAnchors() Below is a Flow that contains various \l Text items: - \snippet doc/src/snippets/declarative/flow.qml flow item + \snippet doc/src/snippets/qml/flow.qml flow item The Flow item automatically positions the child \l Text items side by side, wrapping as necessary: @@ -1244,7 +1244,7 @@ void QQuickGrid::reportConflictingAnchors() For more information on using Flow and other related positioner-type elements, see \l{Item Layouts}. - \sa Column, Row, Grid, Positioner, {declarative/positioners}{Positioners example} + \sa Column, Row, Grid, Positioner, {qml/positioners}{Positioners example} */ /*! \qmlproperty Transition QtQuick2::Flow::add @@ -1284,7 +1284,7 @@ void QQuickGrid::reportConflictingAnchors() } \endqml - \sa add, {declarative/positioners}{Positioners example} + \sa add, {qml/positioners}{Positioners example} */ /*! \qmlproperty real QtQuick2::Flow::spacing @@ -1362,7 +1362,7 @@ void QQuickFlow::setFlow(Flow flow) \l Flow::flow property. \endlist - \sa Grid::layoutDirection, Row::layoutDirection, {declarative/righttoleft/layoutdirection}{Layout directions example} + \sa Grid::layoutDirection, Row::layoutDirection, {qml/righttoleft/layoutdirection}{Layout directions example} */ Qt::LayoutDirection QQuickFlow::layoutDirection() const |