diff options
Diffstat (limited to 'src/graphicsitems')
-rw-r--r-- | src/graphicsitems/qximage.cpp | 24 | ||||
-rw-r--r-- | src/graphicsitems/qximage_p.h | 5 | ||||
-rw-r--r-- | src/graphicsitems/qximage_p_p.h | 1 |
3 files changed, 0 insertions, 30 deletions
diff --git a/src/graphicsitems/qximage.cpp b/src/graphicsitems/qximage.cpp index 68ceac0..4ea42ce 100644 --- a/src/graphicsitems/qximage.cpp +++ b/src/graphicsitems/qximage.cpp @@ -63,29 +63,6 @@ QxImage::~QxImage() delete d->node; } -QPixmap QxImage::pixmap() const -{ - Q_D(const QxImage); - return d->pix.pixmap(); -} - -void QxImage::setPixmap(const QPixmap &pix) -{ - Q_D(QxImage); - if (!d->url.isEmpty()) - return; - d->setPixmap(pix); -} - -void QxImagePrivate::setPixmap(const QPixmap &pixmap) -{ - Q_Q(QxImage); - pix.setPixmap(pixmap); - - if (node) - q->pixmapChange(); -} - QxImage::FillMode QxImage::fillMode() const { Q_D(const QxImage); @@ -235,7 +212,6 @@ void QxImage::pixmapChange() d->status = d->pix.isNull() ? QxImageBase::Null : QxImageBase::Ready; d->pixmapDirty = true; d->update(); - emit pixmapChanged(); } void QxImage::renderOpacityChanged(qreal newOpacity, qreal oldOpacity) diff --git a/src/graphicsitems/qximage_p.h b/src/graphicsitems/qximage_p.h index 229126b..47c4d30 100644 --- a/src/graphicsitems/qximage_p.h +++ b/src/graphicsitems/qximage_p.h @@ -52,7 +52,6 @@ class QxImage : public QxImageBase Q_OBJECT Q_ENUMS(FillMode) - Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap NOTIFY pixmapChanged DESIGNABLE false) Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged) Q_PROPERTY(qreal paintedWidth READ paintedWidth NOTIFY paintedGeometryChanged) Q_PROPERTY(qreal paintedHeight READ paintedHeight NOTIFY paintedGeometryChanged) @@ -65,14 +64,10 @@ public: FillMode fillMode() const; void setFillMode(FillMode); - QPixmap pixmap() const; - void setPixmap(const QPixmap &); - qreal paintedWidth() const; qreal paintedHeight() const; Q_SIGNALS: - void pixmapChanged(); void fillModeChanged(); void paintedGeometryChanged(); diff --git a/src/graphicsitems/qximage_p_p.h b/src/graphicsitems/qximage_p_p.h index 9de93f2..7c17975 100644 --- a/src/graphicsitems/qximage_p_p.h +++ b/src/graphicsitems/qximage_p_p.h @@ -70,7 +70,6 @@ public: QxImage::FillMode fillMode; qreal paintedWidth; qreal paintedHeight; - void setPixmap(const QPixmap &pix); void update(); void updateOpacity(); |