diff --git a/declarativeimports/qtextracomponents/mouseeventlistener.cpp b/declarativeimports/qtextracomponents/mouseeventlistener.cpp index 1489e28c0..d18a660cf 100644 --- a/declarativeimports/qtextracomponents/mouseeventlistener.cpp +++ b/declarativeimports/qtextracomponents/mouseeventlistener.cpp @@ -28,8 +28,8 @@ static const int PressAndHoldDelay = 800; -MouseEventListener::MouseEventListener(QDeclarativeItem *parent) - : QDeclarativeItem(parent), +MouseEventListener::MouseEventListener(QQuickItem *parent) + : QQuickItem(parent), m_pressed(false), m_pressAndHoldEvent(0), m_lastEvent(0), @@ -209,7 +209,7 @@ bool MouseEventListener::sceneEventFilter(QGraphicsItem *item, QEvent *event) break; } - return QDeclarativeItem::sceneEventFilter(item, event); + return QQuickItem::sceneEventFilter(item, event); } #include "mouseeventlistener.moc" diff --git a/declarativeimports/qtextracomponents/mouseeventlistener.h b/declarativeimports/qtextracomponents/mouseeventlistener.h index 9b9aaac18..9fc22aea1 100644 --- a/declarativeimports/qtextracomponents/mouseeventlistener.h +++ b/declarativeimports/qtextracomponents/mouseeventlistener.h @@ -20,7 +20,7 @@ #ifndef MOUSEEVENTLISTENER_H #define MOUSEEVENTLISTENER_H -#include +#include class KDeclarativeMouseEvent : public QObject { @@ -120,7 +120,7 @@ private: Qt::Orientation m_orientation; }; -class MouseEventListener : public QDeclarativeItem +class MouseEventListener : public QQuickItem { Q_OBJECT /** @@ -135,7 +135,7 @@ class MouseEventListener : public QDeclarativeItem Q_PROPERTY(bool containsMouse READ containsMouse NOTIFY containsMouseChanged) public: - MouseEventListener(QDeclarativeItem *parent=0); + MouseEventListener(QQuickItem *parent=0); ~MouseEventListener(); bool containsMouse() const; diff --git a/declarativeimports/qtextracomponents/qiconitem.cpp b/declarativeimports/qtextracomponents/qiconitem.cpp index f14a814fc..dc63385a0 100644 --- a/declarativeimports/qtextracomponents/qiconitem.cpp +++ b/declarativeimports/qtextracomponents/qiconitem.cpp @@ -25,8 +25,8 @@ #include -QIconItem::QIconItem(QDeclarativeItem *parent) - : QDeclarativeItem(parent), +QIconItem::QIconItem(QQuickItem *parent) + : QQuickItem(parent), m_smooth(false), m_state(DefaultState) { diff --git a/declarativeimports/qtextracomponents/qiconitem.h b/declarativeimports/qtextracomponents/qiconitem.h index b077469ca..1f48c353c 100644 --- a/declarativeimports/qtextracomponents/qiconitem.h +++ b/declarativeimports/qtextracomponents/qiconitem.h @@ -19,11 +19,11 @@ #ifndef QICONITEM_H #define QICONITEM_H -#include +#include #include #include -class QIconItem : public QDeclarativeItem +class QIconItem : public QQuickItem { Q_OBJECT @@ -43,7 +43,7 @@ public: DisabledState ///Icon is disabled. }; - QIconItem(QDeclarativeItem *parent=0); + QIconItem(QQuickItem *parent=0); ~QIconItem(); void setIcon(const QVariant &icon); diff --git a/declarativeimports/qtextracomponents/qimageitem.h b/declarativeimports/qtextracomponents/qimageitem.h index 1aca6b809..d12ecdf0e 100644 --- a/declarativeimports/qtextracomponents/qimageitem.h +++ b/declarativeimports/qtextracomponents/qimageitem.h @@ -19,10 +19,10 @@ #ifndef QIMAGEITEM_H #define QIMAGEITEM_H -#include +#include #include -class QImageItem : public QDeclarativeItem +class QImageItem : public QQuickItem { Q_OBJECT @@ -44,7 +44,7 @@ public: TileHorizontally //the image is stretched vertically and tiled horizontally }; - QImageItem(QDeclarativeItem *parent=0); + QImageItem(QQuickItem *parent=0); ~QImageItem(); void setImage(const QImage &image); diff --git a/declarativeimports/qtextracomponents/qpixmapitem.cpp b/declarativeimports/qtextracomponents/qpixmapitem.cpp index 9ef552136..6992731e6 100644 --- a/declarativeimports/qtextracomponents/qpixmapitem.cpp +++ b/declarativeimports/qtextracomponents/qpixmapitem.cpp @@ -22,8 +22,8 @@ #include -QPixmapItem::QPixmapItem(QDeclarativeItem *parent) - : QDeclarativeItem(parent), +QPixmapItem::QPixmapItem(QQuickItem *parent) + : QQuickItem(parent), m_smooth(false), m_fillMode(QPixmapItem::Stretch) { diff --git a/declarativeimports/qtextracomponents/qpixmapitem.h b/declarativeimports/qtextracomponents/qpixmapitem.h index bc06219ee..79b8451ce 100644 --- a/declarativeimports/qtextracomponents/qpixmapitem.h +++ b/declarativeimports/qtextracomponents/qpixmapitem.h @@ -19,10 +19,10 @@ #ifndef QPIXMAPITEM_H #define QPIXMAPITEM_H -#include +#include #include -class QPixmapItem : public QDeclarativeItem +class QPixmapItem : public QQuickItem { Q_OBJECT @@ -44,7 +44,7 @@ public: TileHorizontally //the image is stretched vertically and tiled horizontally }; - QPixmapItem(QDeclarativeItem *parent=0); + QPixmapItem(QQuickItem *parent=0); ~QPixmapItem(); void setPixmap(const QPixmap &pixmap);