A bunch of class name porting, build not enabled for these yet
This commit is contained in:
parent
2ca026e96e
commit
e5bc563158
@ -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"
|
||||
|
@ -20,7 +20,7 @@
|
||||
#ifndef MOUSEEVENTLISTENER_H
|
||||
#define MOUSEEVENTLISTENER_H
|
||||
|
||||
#include <QDeclarativeItem>
|
||||
#include <QQuickItem>
|
||||
|
||||
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;
|
||||
|
@ -25,8 +25,8 @@
|
||||
#include <QPainter>
|
||||
|
||||
|
||||
QIconItem::QIconItem(QDeclarativeItem *parent)
|
||||
: QDeclarativeItem(parent),
|
||||
QIconItem::QIconItem(QQuickItem *parent)
|
||||
: QQuickItem(parent),
|
||||
m_smooth(false),
|
||||
m_state(DefaultState)
|
||||
{
|
||||
|
@ -19,11 +19,11 @@
|
||||
#ifndef QICONITEM_H
|
||||
#define QICONITEM_H
|
||||
|
||||
#include <QDeclarativeItem>
|
||||
#include <QQuickItem>
|
||||
#include <QPixmap>
|
||||
#include <QVariant>
|
||||
|
||||
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);
|
||||
|
@ -19,10 +19,10 @@
|
||||
#ifndef QIMAGEITEM_H
|
||||
#define QIMAGEITEM_H
|
||||
|
||||
#include <QDeclarativeItem>
|
||||
#include <QQuickItem>
|
||||
#include <QImage>
|
||||
|
||||
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);
|
||||
|
@ -22,8 +22,8 @@
|
||||
#include <QPainter>
|
||||
|
||||
|
||||
QPixmapItem::QPixmapItem(QDeclarativeItem *parent)
|
||||
: QDeclarativeItem(parent),
|
||||
QPixmapItem::QPixmapItem(QQuickItem *parent)
|
||||
: QQuickItem(parent),
|
||||
m_smooth(false),
|
||||
m_fillMode(QPixmapItem::Stretch)
|
||||
{
|
||||
|
@ -19,10 +19,10 @@
|
||||
#ifndef QPIXMAPITEM_H
|
||||
#define QPIXMAPITEM_H
|
||||
|
||||
#include <QDeclarativeItem>
|
||||
#include <QQuickItem>
|
||||
#include <QPixmap>
|
||||
|
||||
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);
|
||||
|
Loading…
Reference in New Issue
Block a user