diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-07-12 06:35:41 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-07-13 00:01:08 (GMT) |
| commit | bfa139ff61d1e5b495fe92be6073ccbdcdc91c77 (patch) | |
| tree | e3aa51028bad9893079c8a6a303a23860e57877e /src/declarative/graphicsitems/qdeclarativeitem_p.h | |
| parent | 686fca1c78e6d4d2ba597dd75d982c76647c7707 (diff) | |
| download | Qt-bfa139ff61d1e5b495fe92be6073ccbdcdc91c77.zip Qt-bfa139ff61d1e5b495fe92be6073ccbdcdc91c77.tar.gz Qt-bfa139ff61d1e5b495fe92be6073ccbdcdc91c77.tar.bz2 | |
Private variable cleanup.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeitem_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem_p.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem_p.h b/src/declarative/graphicsitems/qdeclarativeitem_p.h index 84ae4ef..bc5d809 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem_p.h +++ b/src/declarative/graphicsitems/qdeclarativeitem_p.h @@ -120,11 +120,11 @@ class Q_DECLARATIVE_EXPORT QDeclarativeItemPrivate : public QGraphicsItemPrivate public: QDeclarativeItemPrivate() : _anchors(0), _contents(0), - _baselineOffset(0), + baselineOffset(0), _anchorLines(0), _stateGroup(0), origin(QDeclarativeItem::Center), widthValid(false), heightValid(false), - _componentComplete(true), _keepMouse(false), + componentComplete(true), keepMouse(false), smooth(false), transformOriginDirty(true), doneEventPreHandler(false), keyHandler(0), mWidth(0), mHeight(0), implicitWidth(0), implicitHeight(0) { @@ -144,12 +144,10 @@ public: QDeclarative_setParent_noEvent(q, parent); q->setParentItem(parent); } - _baselineOffset.invalidate(); + baselineOffset.invalidate(); mouseSetsFocus = false; } - QString _id; - // Private Properties qreal width() const; void setWidth(qreal); @@ -203,7 +201,7 @@ public: if (!_anchors) { Q_Q(QDeclarativeItem); _anchors = new QDeclarativeAnchors(q); - if (!_componentComplete) + if (!componentComplete) _anchors->classBegin(); } return _anchors; @@ -211,7 +209,7 @@ public: QDeclarativeAnchors *_anchors; QDeclarativeContents *_contents; - QDeclarativeNullableValue<qreal> _baselineOffset; + QDeclarativeNullableValue<qreal> baselineOffset; struct AnchorLines { AnchorLines(QGraphicsObject *); @@ -260,8 +258,8 @@ public: QDeclarativeItem::TransformOrigin origin:4; bool widthValid:1; bool heightValid:1; - bool _componentComplete:1; - bool _keepMouse:1; + bool componentComplete:1; + bool keepMouse:1; bool smooth:1; bool transformOriginDirty : 1; bool doneEventPreHandler : 1; |