From 4a95748249703a65f9c42f810bcbea6ba27810f5 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Wed, 17 Sep 2014 20:26:29 +0200 Subject: [PATCH] Don't redeclare QQuickItem properties for implicitSizes Change-Id: I96a8e6acd23cdee77048bc064963c7735b6615db --- src/declarativeimports/core/framesvgitem.cpp | 32 -------------------- src/declarativeimports/core/framesvgitem.h | 18 ----------- 2 files changed, 50 deletions(-) diff --git a/src/declarativeimports/core/framesvgitem.cpp b/src/declarativeimports/core/framesvgitem.cpp index af4ddf29a..18b7fd281 100644 --- a/src/declarativeimports/core/framesvgitem.cpp +++ b/src/declarativeimports/core/framesvgitem.cpp @@ -390,38 +390,6 @@ void FrameSvgItem::doUpdate() update(); } -void FrameSvgItem::setImplicitWidth(qreal width) -{ - if (implicitWidth() == width) { - return; - } - - QQuickItem::setImplicitWidth(width); - - emit implicitWidthChanged(); -} - -qreal FrameSvgItem::implicitWidth() const -{ - return QQuickItem::implicitWidth(); -} - -void FrameSvgItem::setImplicitHeight(qreal height) -{ - if (implicitHeight() == height) { - return; - } - - QQuickItem::setImplicitHeight(height); - - emit implicitHeightChanged(); -} - -qreal FrameSvgItem::implicitHeight() const -{ - return QQuickItem::implicitHeight(); -} - Plasma::FrameSvg *FrameSvgItem::frameSvg() const { return m_frameSvg; diff --git a/src/declarativeimports/core/framesvgitem.h b/src/declarativeimports/core/framesvgitem.h index 0d3e4e150..d82540345 100644 --- a/src/declarativeimports/core/framesvgitem.h +++ b/src/declarativeimports/core/framesvgitem.h @@ -132,16 +132,6 @@ class FrameSvgItem : public QQuickItem */ Q_PROPERTY(Plasma::FrameSvg::EnabledBorders enabledBorders READ enabledBorders WRITE setEnabledBorders NOTIFY enabledBordersChanged) - /** - * suggested default size hint for width - */ - Q_PROPERTY(qreal implicitWidth READ implicitWidth WRITE setImplicitWidth NOTIFY implicitWidthChanged) - - /** - * suggested default size hint for height - */ - Q_PROPERTY(qreal implicitHeight READ implicitHeight WRITE setImplicitHeight NOTIFY implicitHeightChanged) - public: /** * @return true if the svg has the necessary elements with the given prefix @@ -169,12 +159,6 @@ public: void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); - void setImplicitWidth(qreal width); - qreal implicitWidth() const; - - void setImplicitHeight(qreal height); - qreal implicitHeight() const; - /** * Only to be used from inside this library, is not intended to be invokable */ @@ -193,8 +177,6 @@ Q_SIGNALS: void imagePathChanged(); void prefixChanged(); void enabledBordersChanged(); - void implicitWidthChanged(); - void implicitHeightChanged(); private Q_SLOTS: void doUpdate();