From 0853b1607169708ec9d75ca023380dcc422259ca Mon Sep 17 00:00:00 2001
From: Jan Arve Saether <jan-arve.saether@digia.com>
Date: Fri, 22 Mar 2013 16:00:52 +0100
Subject: [PATCH] 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 <jens.bache-wiig@digia.com>
---
 examples/basiclayouts/main.qml     |  4 ++--
 src/layouts/qquicklinearlayout.cpp | 24 ++++++++++++------------
 src/layouts/qquicklinearlayout_p.h | 16 ++++++++--------
 tests/manual/Layout.qml            |  4 ++--
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/examples/basiclayouts/main.qml b/examples/basiclayouts/main.qml
index 374646d4e..2e338a81b 100644
--- a/examples/basiclayouts/main.qml
+++ b/examples/basiclayouts/main.qml
@@ -88,8 +88,8 @@ ApplicationWindow {
             Layout.fillWidth: true
             GridLayout {
                 id: gridLayout
-                horizontalSpacing: 6
-                verticalSpacing: 6
+                rowSpacing: 6
+                columnSpacing: 6
                 Label {
                     text: "Line 1"
                     Layout.row: 0
diff --git a/src/layouts/qquicklinearlayout.cpp b/src/layouts/qquicklinearlayout.cpp
index 1bdc62f8e..d098a6c45 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();
 }
diff --git a/src/layouts/qquicklinearlayout_p.h b/src/layouts/qquicklinearlayout_p.h
index 858d0b9b6..04b3b3001 100644
--- a/src/layouts/qquicklinearlayout_p.h
+++ b/src/layouts/qquicklinearlayout_p.h
@@ -109,17 +109,17 @@ class QQuickGridLayoutPrivate;
 class QQuickGridLayout : public QQuickGridLayoutBase
 {
     Q_OBJECT
-    Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing NOTIFY horizontalSpacingChanged)
-    Q_PROPERTY(qreal verticalSpacing READ verticalSpacing WRITE setVerticalSpacing NOTIFY verticalSpacingChanged)
+    Q_PROPERTY(qreal columnSpacing READ columnSpacing WRITE setHorizontalSpacing NOTIFY columnSpacingChanged)
+    Q_PROPERTY(qreal rowSpacing READ rowSpacing WRITE setVerticalSpacing NOTIFY rowSpacingChanged)
 public:
     explicit QQuickGridLayout(QQuickItem *parent = 0);
-    qreal horizontalSpacing() const;
+    qreal columnSpacing() const;
     void setHorizontalSpacing(qreal spacing);
-    qreal verticalSpacing() const;
+    qreal rowSpacing() const;
     void setVerticalSpacing(qreal spacing);
 signals:
-    void horizontalSpacingChanged();
-    void verticalSpacingChanged();
+    void columnSpacingChanged();
+    void rowSpacingChanged();
 
 private:
     Q_DECLARE_PRIVATE(QQuickGridLayout)
@@ -130,8 +130,8 @@ class QQuickGridLayoutPrivate : public QQuickGridLayoutBasePrivate
     Q_DECLARE_PUBLIC(QQuickGridLayout)
 public:
     QQuickGridLayoutPrivate() {}
-    qreal horizontalSpacing;
-    qreal verticalSpacing;
+    qreal columnSpacing;
+    qreal rowSpacing;
 };
 
 
diff --git a/tests/manual/Layout.qml b/tests/manual/Layout.qml
index 3577aa9d8..2fe822223 100644
--- a/tests/manual/Layout.qml
+++ b/tests/manual/Layout.qml
@@ -559,8 +559,8 @@ Item {
                     // [1]
                     GridLayout {
                         id: flag
-                        verticalSpacing: spacingSlider.value
-                        horizontalSpacing: spacingSlider.value
+                        rowSpacing: spacingSlider.value
+                        columnSpacing: spacingSlider.value
                         // row 0
                         anchors.left: parent.left
                         anchors.right: parent.right
-- 
GitLab