diff options
| author | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2016-04-20 12:52:11 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2016-04-20 14:14:45 +0000 |
| commit | 3b9d7ee10e2ae6565f0767219303d9a11d80f489 (patch) | |
| tree | 144e555bc7c68a2648e91d8ec955d9ff756aad72 | |
| parent | 0b7c11e7c2bb457bff399fdec38d9cf266e89a86 (diff) | |
QML: Remove baselineOffsetValid flag from QQuickItem.
This flag was only used to return 0.0 when false, and baselineOffset
when true. So initializing the baselineOffset to 0.0 does the same thing.
Change-Id: Ia92b05761ea3a03175ae0078bf950a1b4da2d356
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 10 | ||||
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 5 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index c363894a8b..b15dd76f27 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -3083,7 +3083,6 @@ QQuickItemPrivate::QQuickItemPrivate() , flags(0) , widthValid(false) , heightValid(false) - , baselineOffsetValid(false) , componentComplete(true) , keepMouse(false) , keepTouch(false) @@ -3157,7 +3156,7 @@ void QQuickItemPrivate::init(QQuickItem *parent) registerAccessorProperties(); - baselineOffsetValid = false; + baselineOffset = 0.0; if (parent) { q->setParentItem(parent); @@ -4207,11 +4206,7 @@ QQuickAnchorLine QQuickItemPrivate::baseline() const qreal QQuickItem::baselineOffset() const { Q_D(const QQuickItem); - if (d->baselineOffsetValid) { - return d->baselineOffset; - } else { - return 0.0; - } + return d->baselineOffset; } void QQuickItem::setBaselineOffset(qreal offset) @@ -4221,7 +4216,6 @@ void QQuickItem::setBaselineOffset(qreal offset) return; d->baselineOffset = offset; - d->baselineOffsetValid = true; for (int ii = 0; ii < d->changeListeners.count(); ++ii) { const QQuickItemPrivate::ChangeListener &change = d->changeListeners.at(ii); diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index 634aa2b658..c5d54a390b 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -396,7 +396,6 @@ public: quint32 flags:5; bool widthValid:1; bool heightValid:1; - bool baselineOffsetValid:1; bool componentComplete:1; bool keepMouse:1; bool keepTouch:1; @@ -405,8 +404,8 @@ public: bool antialiasing:1; bool focus:1; bool activeFocus:1; - // Bit 16 bool notifiedFocus:1; + // Bit 16 bool notifiedActiveFocus:1; bool filtersChildMouseEvents:1; bool explicitVisible:1; @@ -422,8 +421,8 @@ public: bool isAccessible:1; bool culled:1; bool hasCursor:1; - // Bit 32 bool hasCursorInChild:1; + // Bit 32 bool activeFocusOnTab:1; bool implicitAntialiasing:1; bool antialiasingValid:1; |