summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxpositioners_p.h
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-08-13 08:10:16 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-08-13 08:10:16 (GMT)
commitab4920a8fd23613da010d45e4f7be1bdc40d7c9a (patch)
tree6238e630fe30caeb1e9d055bc218de1b58b30883 /src/declarative/fx/qfxpositioners_p.h
parentb1e221a249adbcec7e37e475fdd14ff636c18b2c (diff)
downloadQt-ab4920a8fd23613da010d45e4f7be1bdc40d7c9a.zip
Qt-ab4920a8fd23613da010d45e4f7be1bdc40d7c9a.tar.gz
Qt-ab4920a8fd23613da010d45e4f7be1bdc40d7c9a.tar.bz2
Cleanup and example for positioners
Interim progress on fixing up the positioners. - Removes margins and setting and implicit size - Purges the word 'layout' from the source files - Fixes a bug with the grid positioner, it works now - Cleaned up the code somewhat. Also adds some basic examples which demonstrate that it (mostly) works. Be warned that practically all the comments are woefully out of date.
Diffstat (limited to 'src/declarative/fx/qfxpositioners_p.h')
-rw-r--r--src/declarative/fx/qfxpositioners_p.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/declarative/fx/qfxpositioners_p.h b/src/declarative/fx/qfxpositioners_p.h
index 53f5dcd..8960952 100644
--- a/src/declarative/fx/qfxpositioners_p.h
+++ b/src/declarative/fx/qfxpositioners_p.h
@@ -69,8 +69,8 @@ class QFxBasePositionerPrivate : public QFxItemPrivate
public:
QFxBasePositionerPrivate()
: _ep(false), _componentComplete(false), _spacing(0),
- _margin(0), aut(QFxBasePositioner::None), moveTransition(0), addTransition(0),
- removeTransition(0), _layoutItem(0), _movingItem(0)
+ aut(QFxBasePositioner::None), moveTransition(0), addTransition(0),
+ removeTransition(0), _movingItem(0)
{
}
@@ -82,7 +82,6 @@ public:
bool _ep;
bool _componentComplete;
int _spacing;
- int _margin;
QFxBasePositioner::AutoUpdateType aut;
QmlTransition *moveTransition;
QmlTransition *addTransition;
@@ -92,7 +91,6 @@ public:
QSet<QFxItem *> _stableItems;
QSet<QFxItem *> _newItems;
QSet<QFxItem *> _animated;
- QFxItem *_layoutItem;
QmlStateOperation::ActionList addActions;
QmlStateOperation::ActionList moveActions;
QmlStateOperation::ActionList removeActions;