diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-27 00:09:11 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-27 00:09:11 (GMT) |
commit | baeb25062194c9ddc36c4536662de46b6b09cd68 (patch) | |
tree | dc9e697a941e136f1c11849f3ab6abf30d89d804 /src/declarative/fx/qfxitem.cpp | |
parent | 0cb67317e8c22282901a73568cf903ea1bec725d (diff) | |
parent | 79d5daab124e98880fe0847c19cad4def672870b (diff) | |
download | Qt-baeb25062194c9ddc36c4536662de46b6b09cd68.zip Qt-baeb25062194c9ddc36c4536662de46b6b09cd68.tar.gz Qt-baeb25062194c9ddc36c4536662de46b6b09cd68.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxitem.cpp')
-rw-r--r-- | src/declarative/fx/qfxitem.cpp | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index c3c6bc4..a8be81f 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -301,11 +301,11 @@ void QFxContents::setItem(QFxItem *item) /* Key filters can be installed on a QFxItem, but not removed. Currently they - are only used by attached objects (which are only destroyed on Item - destruction), so this isn't a problem. If in future this becomes any form + are only used by attached objects (which are only destroyed on Item + destruction), so this isn't a problem. If in future this becomes any form of public API, they will have to support removal too. -*/ -class QFxItemKeyFilter +*/ +class QFxItemKeyFilter { public: QFxItemKeyFilter(QFxItem * = 0); @@ -321,7 +321,7 @@ private: QFxItemKeyFilter::QFxItemKeyFilter(QFxItem *item) : m_next(0) { - QFxItemPrivate *p = + QFxItemPrivate *p = item?static_cast<QFxItemPrivate *>(QGraphicsItemPrivate::get(item)):0; if (p) { m_next = p->keyHandler; @@ -346,7 +346,7 @@ void QFxItemKeyFilter::keyReleased(QKeyEvent *event) class QFxKeyNavigationAttachedPrivate : public QObjectPrivate { public: - QFxKeyNavigationAttachedPrivate() + QFxKeyNavigationAttachedPrivate() : QObjectPrivate(), left(0), right(0), up(0), down(0) {} QFxItem *left; @@ -378,7 +378,7 @@ public: static QFxKeyNavigationAttached *qmlAttachedProperties(QObject *); -signals: +Q_SIGNALS: void changed(); private: @@ -860,7 +860,7 @@ public: static QFxKeysAttached *qmlAttachedProperties(QObject *); -signals: +Q_SIGNALS: void enabledChanged(); void pressed(QFxKeyEvent *event); void released(QFxKeyEvent *event); @@ -965,7 +965,7 @@ bool QFxKeysAttachedPrivate::isConnected(const char *signalName) } QFxKeysAttached::QFxKeysAttached(QObject *parent) -: QObject(*(new QFxKeysAttachedPrivate), parent), +: QObject(*(new QFxKeysAttachedPrivate), parent), QFxItemKeyFilter(qobject_cast<QFxItem*>(parent)) { } @@ -1076,18 +1076,6 @@ QFxKeysAttached *QFxKeysAttached::qmlAttachedProperties(QObject *obj) */ /*! - \fn void QFxItem::xChanged() - - This signal is emitted when the x coordinate of the item changes. -*/ - -/*! - \fn void QFxItem::yChanged() - - This signal is emitted when the y coordinate of the item changes. -*/ - -/*! \fn void QFxItem::widthChanged() This signal is emitted when the width of the item changes. |