aboutsummaryrefslogtreecommitdiffstats
path: root/src/controls/qquickcontainer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/controls/qquickcontainer.cpp')
-rw-r--r--src/controls/qquickcontainer.cpp33
1 files changed, 12 insertions, 21 deletions
diff --git a/src/controls/qquickcontainer.cpp b/src/controls/qquickcontainer.cpp
index 95464e7e..456dd6c8 100644
--- a/src/controls/qquickcontainer.cpp
+++ b/src/controls/qquickcontainer.cpp
@@ -53,16 +53,6 @@ QQuickContainerPrivate::QQuickContainerPrivate() :
{
}
-qreal QQuickContainerPrivate::getContentWidth() const
-{
- return contentWidth;
-}
-
-qreal QQuickContainerPrivate::getContentHeight() const
-{
- return contentHeight;
-}
-
QQuickContainer::QQuickContainer(QQuickItem *parent) :
QQuickControl(*(new QQuickContainerPrivate), parent)
{
@@ -79,6 +69,12 @@ QQuickContainer::QQuickContainer(QQuickContainerPrivate &dd, QQuickItem *parent)
TODO
*/
+qreal QQuickContainer::contentWidth() const
+{
+ Q_D(const QQuickContainer);
+ return d->contentWidth;
+}
+
void QQuickContainer::setContentWidth(qreal width)
{
Q_D(QQuickContainer);
@@ -88,6 +84,12 @@ void QQuickContainer::setContentWidth(qreal width)
}
}
+qreal QQuickContainer::contentHeight() const
+{
+ Q_D(const QQuickContainer);
+ return d->contentHeight;
+}
+
void QQuickContainer::setContentHeight(qreal height)
{
Q_D(QQuickContainer);
@@ -129,15 +131,4 @@ void QQuickContainer::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem
Q_UNUSED(oldItem);
}
-void QQuickContainer::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
-{
- Q_D(QQuickContainer);
- QQuickItem::geometryChanged(newGeometry, oldGeometry);
- d->resizeBackground();
-}
-
-void QQuickContainer::paddingChange()
-{
-}
-
QT_END_NAMESPACE