From 03e174e986920cf727f11200daa8b0eecfe02216 Mon Sep 17 00:00:00 2001 From: Kim Motoyoshi Kalland Date: Tue, 17 Jul 2012 13:26:25 +0200 Subject: Rename Rectangle's border.aligned property to border.pixelAligned. Rename the Rectangle element's border.aligned property to border.pixelAligned to be consistent with the Flickable element's pixelAligned property. Change-Id: I916a47416c558f9a96f7b966c344525db984a85f Reviewed-by: Gunnar Sletta Reviewed-by: Michael Brasser --- src/quick/items/qquickrectangle.cpp | 8 ++++---- src/quick/items/qquickrectangle_p.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/quick/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp index 2789d8596d..ca4a9f55cc 100644 --- a/src/quick/items/qquickrectangle.cpp +++ b/src/quick/items/qquickrectangle.cpp @@ -108,12 +108,12 @@ void QQuickPen::setColor(const QColor &c) emit penChanged(); } -bool QQuickPen::aligned() const +bool QQuickPen::pixelAligned() const { return m_aligned; } -void QQuickPen::setAligned(bool aligned) +void QQuickPen::setPixelAligned(bool aligned) { if (aligned == m_aligned) return; @@ -318,7 +318,7 @@ void QQuickRectangle::doUpdate() qreal penMargin = 0; qreal penOffset = 0; if (d->pen && d->pen->isValid()) { - if (d->pen->aligned()) { + if (d->pen->pixelAligned()) { const int pw = qRound(d->pen->width()); penMargin = qreal(0.5) * pw; penOffset = (pw & 1) * qreal(0.5); @@ -497,7 +497,7 @@ QSGNode *QQuickRectangle::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData if (d->pen && d->pen->isValid()) { rectangle->setPenColor(d->pen->color()); rectangle->setPenWidth(d->pen->width()); - rectangle->setAligned(d->pen->aligned()); + rectangle->setAligned(d->pen->pixelAligned()); } else { rectangle->setPenWidth(0); } diff --git a/src/quick/items/qquickrectangle_p.h b/src/quick/items/qquickrectangle_p.h index 0ac2ea6aaa..194ff15086 100644 --- a/src/quick/items/qquickrectangle_p.h +++ b/src/quick/items/qquickrectangle_p.h @@ -58,7 +58,7 @@ class Q_AUTOTEST_EXPORT QQuickPen : public QObject Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY penChanged) Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY penChanged) - Q_PROPERTY(bool aligned READ aligned WRITE setAligned NOTIFY penChanged) + Q_PROPERTY(bool pixelAligned READ pixelAligned WRITE setPixelAligned NOTIFY penChanged) public: QQuickPen(QObject *parent=0); @@ -68,8 +68,8 @@ public: QColor color() const; void setColor(const QColor &c); - bool aligned() const; - void setAligned(bool aligned); + bool pixelAligned() const; + void setPixelAligned(bool aligned); bool isValid() const; -- cgit v1.2.3