From 0853b1607169708ec9d75ca023380dcc422259ca Mon Sep 17 00:00:00 2001 From: Jan Arve Saether Date: Fri, 22 Mar 2013 16:00:52 +0100 Subject: API: Rename {vertic,horizont}alSpacing to {row,column}Spacing This makes it more consistent with Grid element, and with the other properties the GridLayout has (rows,columns,Layout.row...) Change-Id: I341a806df889a7888ac0466e07d73bb2ea90f5ef Reviewed-by: Jens Bache-Wiig --- src/layouts/qquicklinearlayout.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/layouts/qquicklinearlayout.cpp') diff --git a/src/layouts/qquicklinearlayout.cpp b/src/layouts/qquicklinearlayout.cpp index 1bdc62f8..d098a6c4 100644 --- a/src/layouts/qquicklinearlayout.cpp +++ b/src/layouts/qquicklinearlayout.cpp @@ -339,42 +339,42 @@ QQuickGridLayout::QQuickGridLayout(QQuickItem *parent /* = 0*/) : QQuickGridLayoutBase(*new QQuickGridLayoutPrivate, Qt::Horizontal, parent) { Q_D(QQuickGridLayout); - d->horizontalSpacing = q_declarativeLayoutDefaultSpacing; - d->verticalSpacing = q_declarativeLayoutDefaultSpacing; - d->engine.setSpacing(d->horizontalSpacing, Qt::Horizontal); - d->engine.setSpacing(d->verticalSpacing, Qt::Vertical); + d->columnSpacing = q_declarativeLayoutDefaultSpacing; + d->rowSpacing = q_declarativeLayoutDefaultSpacing; + d->engine.setSpacing(d->columnSpacing, Qt::Horizontal); + d->engine.setSpacing(d->rowSpacing, Qt::Vertical); } -qreal QQuickGridLayout::horizontalSpacing() const +qreal QQuickGridLayout::columnSpacing() const { Q_D(const QQuickGridLayout); - return d->horizontalSpacing; + return d->columnSpacing; } void QQuickGridLayout::setHorizontalSpacing(qreal spacing) { Q_D(QQuickGridLayout); - if (qIsNaN(spacing) || d->horizontalSpacing == spacing) + if (qIsNaN(spacing) || d->columnSpacing == spacing) return; - d->horizontalSpacing = spacing; + d->columnSpacing = spacing; d->engine.setSpacing(spacing, Qt::Horizontal | Qt::Vertical); invalidate(); } -qreal QQuickGridLayout::verticalSpacing() const +qreal QQuickGridLayout::rowSpacing() const { Q_D(const QQuickGridLayout); - return d->verticalSpacing; + return d->rowSpacing; } void QQuickGridLayout::setVerticalSpacing(qreal spacing) { Q_D(QQuickGridLayout); - if (qIsNaN(spacing) || d->verticalSpacing == spacing) + if (qIsNaN(spacing) || d->rowSpacing == spacing) return; - d->verticalSpacing = spacing; + d->rowSpacing = spacing; d->engine.setSpacing(spacing, Qt::Horizontal | Qt::Vertical); invalidate(); } -- cgit v1.2.1