From c9cd3b690386661fa19904ccf8958bf83ef0ad24 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Wed, 16 Nov 2011 10:47:56 +1000 Subject: [PATCH] Remove unused code in qquickimplicitsizeitem. Change-Id: I47ad98e0c515ddc5a9ac224048cdf396cce22699 Reviewed-by: Bea Lam --- src/declarative/items/qquickimplicitsizeitem.cpp | 28 -------------------- src/declarative/items/qquickimplicitsizeitem_p.h | 26 ------------------ src/declarative/items/qquickimplicitsizeitem_p_p.h | 14 ---------- 3 files changed, 0 insertions(+), 68 deletions(-) diff --git a/src/declarative/items/qquickimplicitsizeitem.cpp b/src/declarative/items/qquickimplicitsizeitem.cpp index 807fb48..b0c5826 100644 --- a/src/declarative/items/qquickimplicitsizeitem.cpp +++ b/src/declarative/items/qquickimplicitsizeitem.cpp @@ -56,37 +56,9 @@ void QQuickImplicitSizeItemPrivate::implicitHeightChanged() emit q->implicitHeightChanged(); } -QQuickImplicitSizeItem::QQuickImplicitSizeItem(QQuickItem *parent) - : QQuickItem(*(new QQuickImplicitSizeItemPrivate), parent) -{ -} - QQuickImplicitSizeItem::QQuickImplicitSizeItem(QQuickImplicitSizeItemPrivate &dd, QQuickItem *parent) : QQuickItem(dd, parent) { } - -void QQuickImplicitSizePaintedItemPrivate::implicitWidthChanged() -{ - Q_Q(QQuickImplicitSizePaintedItem); - emit q->implicitWidthChanged(); -} - -void QQuickImplicitSizePaintedItemPrivate::implicitHeightChanged() -{ - Q_Q(QQuickImplicitSizePaintedItem); - emit q->implicitHeightChanged(); -} - -QQuickImplicitSizePaintedItem::QQuickImplicitSizePaintedItem(QQuickItem *parent) - : QQuickPaintedItem(*(new QQuickImplicitSizePaintedItemPrivate), parent) -{ -} - -QQuickImplicitSizePaintedItem::QQuickImplicitSizePaintedItem(QQuickImplicitSizePaintedItemPrivate &dd, QQuickItem *parent) - : QQuickPaintedItem(dd, parent) -{ -} - QT_END_NAMESPACE diff --git a/src/declarative/items/qquickimplicitsizeitem_p.h b/src/declarative/items/qquickimplicitsizeitem_p.h index eaa9b39..9ca98e1 100644 --- a/src/declarative/items/qquickimplicitsizeitem_p.h +++ b/src/declarative/items/qquickimplicitsizeitem_p.h @@ -56,9 +56,6 @@ class Q_AUTOTEST_EXPORT QQuickImplicitSizeItem : public QQuickItem Q_PROPERTY(qreal implicitWidth READ implicitWidth NOTIFY implicitWidthChanged) Q_PROPERTY(qreal implicitHeight READ implicitHeight NOTIFY implicitHeightChanged) -public: - QQuickImplicitSizeItem(QQuickItem *parent = 0); - protected: QQuickImplicitSizeItem(QQuickImplicitSizeItemPrivate &dd, QQuickItem *parent); @@ -71,29 +68,6 @@ private: Q_DECLARE_PRIVATE(QQuickImplicitSizeItem) }; -class QQuickImplicitSizePaintedItemPrivate; -class Q_AUTOTEST_EXPORT QQuickImplicitSizePaintedItem : public QQuickPaintedItem -{ - Q_OBJECT - Q_PROPERTY(qreal implicitWidth READ implicitWidth NOTIFY implicitWidthChanged) - Q_PROPERTY(qreal implicitHeight READ implicitHeight NOTIFY implicitHeightChanged) - -public: - QQuickImplicitSizePaintedItem(QQuickItem *parent = 0); - -protected: - QQuickImplicitSizePaintedItem(QQuickImplicitSizePaintedItemPrivate &dd, QQuickItem *parent); - virtual void drawContents(QPainter *, const QRect &) {}; - -Q_SIGNALS: - void implicitWidthChanged(); - void implicitHeightChanged(); - -private: - Q_DISABLE_COPY(QQuickImplicitSizePaintedItem) - Q_DECLARE_PRIVATE(QQuickImplicitSizePaintedItem) -}; - QT_END_NAMESPACE QT_END_HEADER diff --git a/src/declarative/items/qquickimplicitsizeitem_p_p.h b/src/declarative/items/qquickimplicitsizeitem_p_p.h index 683fcc1..17c204d 100644 --- a/src/declarative/items/qquickimplicitsizeitem_p_p.h +++ b/src/declarative/items/qquickimplicitsizeitem_p_p.h @@ -73,20 +73,6 @@ public: virtual void implicitHeightChanged(); }; - -class QQuickImplicitSizePaintedItemPrivate : public QQuickPaintedItemPrivate -{ - Q_DECLARE_PUBLIC(QQuickImplicitSizePaintedItem) - -public: - QQuickImplicitSizePaintedItemPrivate() - { - } - - virtual void implicitWidthChanged(); - virtual void implicitHeightChanged(); -}; - QT_END_NAMESPACE #endif // QQUICKIMPLICITSIZEITEM_P_H -- 1.7.2.5