Commit c7ec69b4 authored by Aaron Kennedy's avatar Aaron Kennedy Committed by Qt by Nokia

Reduce size of QQuickItemPrivate

Change-Id: I02653536f68cfef3dfc06acaf30e2565a97dc194
Reviewed-by: default avatarRoberto Raggi <roberto.raggi@nokia.com>
parent ef6318ae
......@@ -75,13 +75,13 @@ void DesignerSupport::refFromEffectItem(QQuickItem *referencedItem, bool hide)
QQuickItemPrivate::get(referencedItem)->refFromEffectItem(hide);
QQuickCanvasPrivate::get(referencedItem->canvas())->updateDirtyNode(referencedItem);
Q_ASSERT(QQuickItemPrivate::get(referencedItem)->rootNode);
Q_ASSERT(QQuickItemPrivate::get(referencedItem)->rootNode());
if (!m_itemTextureHash.contains(referencedItem)) {
QQuickShaderEffectTexture *texture = new QQuickShaderEffectTexture(referencedItem);
texture->setLive(true);
texture->setItem(QQuickItemPrivate::get(referencedItem)->rootNode);
texture->setItem(QQuickItemPrivate::get(referencedItem)->rootNode());
texture->setRect(referencedItem->boundingRect());
texture->setSize(referencedItem->boundingRect().size().toSize());
texture->setRecursive(true);
......
......@@ -62,8 +62,6 @@ QT_BEGIN_NAMESPACE
class QQuickAnchorLine
{
public:
QQuickAnchorLine() : item(0), anchorLine(Invalid) {}
enum AnchorLine {
Invalid = 0x0,
Left = 0x01,
......@@ -77,6 +75,9 @@ public:
Vertical_Mask = Top | Bottom | VCenter | Baseline
};
QQuickAnchorLine() : item(0), anchorLine(Invalid) {}
QQuickAnchorLine(QQuickItem *i, AnchorLine l) : item(i), anchorLine(l) {}
QQuickItem *item;
AnchorLine anchorLine;
};
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -251,7 +251,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i
//But specific to MouseArea, so doesn't belong in canvas
Q_Q(const QQuickMouseArea);
QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
if (itemPrivate->opacity == 0.0)
if (itemPrivate->opacity() == 0.0)
return false;
if (itemPrivate->flags & QQuickItem::ItemClipsChildrenToShape) {
......@@ -270,7 +270,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i
}
QQuickMouseArea* ma = qobject_cast<QQuickMouseArea*>(item);
if (ma && ma != q && itemPrivate->acceptedMouseButtons & ev->button()) {
if (ma && ma != q && itemPrivate->acceptedMouseButtons() & ev->button()) {
switch (sig) {
case Click:
if (!ma->d_func()->isClickConnected())
......
......@@ -95,7 +95,7 @@ QQuickScreenAttached::QQuickScreenAttached(QObject* attachee)
m_attachee = qobject_cast<QQuickItem*>(attachee);
if (m_attachee) {
QQuickItemPrivate::get(m_attachee)->screenAttached = this;
QQuickItemPrivate::get(m_attachee)->extra.value().screenAttached = this;
if (m_attachee->canvas()) //It might not be assigned to a canvas yet
canvasChanged(m_attachee->canvas());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment