diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-09-09 05:02:59 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-09-09 05:02:59 (GMT) |
| commit | 7688d668a2a8997d0bc6bac9094d8694e746391b (patch) | |
| tree | e5c03808ecf16030c866d8a216c477324eb9eb52 /src/declarative/fx/qfxitem.cpp | |
| parent | d2f5a32ff6c06e6a1cad9772f89d4b042eb0c9ef (diff) | |
| download | Qt-7688d668a2a8997d0bc6bac9094d8694e746391b.zip Qt-7688d668a2a8997d0bc6bac9094d8694e746391b.tar.gz Qt-7688d668a2a8997d0bc6bac9094d8694e746391b.tar.bz2 | |
Rename QFxItem::children() to QFxItem::fxChildren()
No more accidental hiding. Differently named functions for
QObject children: children()
QGraphicsItem children: childItems()
QFxItem children: fxChildren()
Diffstat (limited to 'src/declarative/fx/qfxitem.cpp')
| -rw-r--r-- | src/declarative/fx/qfxitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 3429010..a2c744e 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -1473,7 +1473,7 @@ void QFxItemPrivate::data_append(QObject *o) Q_Q(QFxItem); QFxItem *i = qobject_cast<QFxItem *>(o); if (i) - q->children()->append(i); + q->fxChildren()->append(i); else resources_append(o); } @@ -2271,7 +2271,7 @@ void QFxItem::focusChanged(bool flag) emit focusChanged(); } -QmlList<QFxItem *> *QFxItem::children() +QmlList<QFxItem *> *QFxItem::fxChildren() { Q_D(QFxItem); return &(d->children); |