Change the member QGALPrivate::spacing to QGALPrivate::spacings.

This was done to avoid any potential shadowing problems (we already use
the variable name 'spacing' several places)

3 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/graphicsview/qgraphicsanchorlayout.cpp b/src/gui/graphicsview/qgraphicsanchorlayout.cpp
index 9846988..98e4b32 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout.cpp
@@ -207,9 +207,9 @@ void QGraphicsAnchorLayout::setSpacing(qreal spacing, Qt::Orientations orientati
 {
     Q_D(QGraphicsAnchorLayout);
     if (orientations & Qt::Horizontal)
-        d->spacing[0] = spacing;
+        d->spacings[0] = spacing;
     if (orientations & Qt::Vertical)
-        d->spacing[1] = spacing;
+        d->spacings[1] = spacing;
 }
 
 qreal QGraphicsAnchorLayout::spacing(Qt::Orientation orientation) const
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index d7bee19..0e35566 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -226,7 +226,7 @@ QGraphicsAnchorLayoutPrivate::QGraphicsAnchorLayoutPrivate()
     : calculateGraphCacheDirty(1)
 {
     for (int i = 0; i < NOrientations; ++i) {
-        spacing[i] = -1;
+        spacings[i] = -1;
         graphSimplified[i] = false;
     }
 }
@@ -1179,7 +1179,7 @@ void QGraphicsAnchorLayoutPrivate::correctEdgeDirection(QGraphicsLayoutItem *&fi
 qreal QGraphicsAnchorLayoutPrivate::effectiveSpacing(Orientation orientation) const
 {
     Q_Q(const QGraphicsAnchorLayout);
-    qreal s = spacing[orientation];
+    qreal s = spacings[orientation];
     if (s < 0) {
         QGraphicsLayoutItem *parent = q->parentLayoutItem();
         while (parent && parent->isLayout()) {
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
index ce4eaf7..7b210cd 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
@@ -390,7 +390,7 @@ public:
                                     GraphPath path);
     void solvePreferred(QList<QSimplexConstraint *> constraints);
 
-    qreal spacing[NOrientations];
+    qreal spacings[NOrientations];
     // Size hints from simplex engine
     qreal sizeHints[2][3];