From b5e4768d3a3ab0f97b77d02d7b83d3ee6713a6b8 2012-11-26 12:58:47
From: Jani Honkonen <jani.honkonen@digia.com>
Date: 2012-11-26 12:58:47
Subject: [PATCH] BC fix: change gridLineVisibleChanged() back to gridVisibleChanged()

---

diff --git a/src/axis/chartaxis.cpp b/src/axis/chartaxis.cpp
index 046dfde..01b6e16 100644
--- a/src/axis/chartaxis.cpp
+++ b/src/axis/chartaxis.cpp
@@ -67,7 +67,7 @@ void ChartAxis::connectSlots()
 {
     QObject::connect(m_axis,SIGNAL(visibleChanged(bool)),this,SLOT(handleVisibleChanged(bool)));
     QObject::connect(m_axis,SIGNAL(lineVisibleChanged(bool)),this,SLOT(handleArrowVisibleChanged(bool)));
-    QObject::connect(m_axis,SIGNAL(gridLineVisibleChanged(bool)),this,SLOT(handleGridVisibleChanged(bool)));
+    QObject::connect(m_axis,SIGNAL(gridVisibleChanged(bool)),this,SLOT(handleGridVisibleChanged(bool)));
     QObject::connect(m_axis,SIGNAL(labelsVisibleChanged(bool)),this,SLOT(handleLabelsVisibleChanged(bool)));
     QObject::connect(m_axis,SIGNAL(shadesVisibleChanged(bool)),this,SLOT(handleShadesVisibleChanged(bool)));
     QObject::connect(m_axis,SIGNAL(labelsAngleChanged(int)),this,SLOT(handleLabelsAngleChanged(int)));
diff --git a/src/axis/qabstractaxis.cpp b/src/axis/qabstractaxis.cpp
index b126e42..e4a83a4 100644
--- a/src/axis/qabstractaxis.cpp
+++ b/src/axis/qabstractaxis.cpp
@@ -369,7 +369,7 @@ void QAbstractAxis::setGridLineVisible(bool visible)
 {
     if (d_ptr->m_gridLineVisible != visible) {
         d_ptr->m_gridLineVisible = visible;
-        emit gridLineVisibleChanged(visible);
+        emit gridVisibleChanged(visible);
     }
 }
 
diff --git a/src/axis/qabstractaxis.h b/src/axis/qabstractaxis.h
index c166816..f08126d 100644
--- a/src/axis/qabstractaxis.h
+++ b/src/axis/qabstractaxis.h
@@ -50,7 +50,7 @@ class QTCOMMERCIALCHART_EXPORT QAbstractAxis : public QObject
     //TODO: make wrapping of color for qml
     Q_PROPERTY(QColor labelsColor READ labelsColor WRITE setLabelsColor NOTIFY labelsColorChanged)
     //grid
-    Q_PROPERTY(bool gridVisible READ isGridLineVisible WRITE setGridLineVisible NOTIFY gridLineVisibleChanged)
+    Q_PROPERTY(bool gridVisible READ isGridLineVisible WRITE setGridLineVisible NOTIFY gridVisibleChanged)
     Q_PROPERTY(QPen girdLinePen READ gridLinePen WRITE setGridLinePen NOTIFY gridLinePenChanged)
     //shades
     Q_PROPERTY(bool shadesVisible READ shadesVisible WRITE setShadesVisible NOTIFY shadesVisibleChanged)
@@ -168,7 +168,7 @@ Q_SIGNALS:
     void labelsFontChanged(const QFont& pen);
     void labelsAngleChanged(int angle);
     void gridLinePenChanged(const QPen& pen);
-    void gridLineVisibleChanged(bool visible);
+    void gridVisibleChanged(bool visible);
     void colorChanged(QColor color);
     void labelsColorChanged(QColor color);
     void titleTextChanged(const QString& title);
diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
index a3c618d..6807ed4 100644
--- a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
+++ b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
@@ -106,7 +106,7 @@ void tst_QAbstractAxis::axisPen()
 
     QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridLineVisibleChanged(bool)));
+    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
     QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
     QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
     QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
@@ -159,7 +159,7 @@ void tst_QAbstractAxis::gridLinePen()
 
     QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridLineVisibleChanged(bool)));
+    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
     QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
     QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
     QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
@@ -201,7 +201,7 @@ void tst_QAbstractAxis::lineVisible()
 
     QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridLineVisibleChanged(bool)));
+    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
     QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
     QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
     QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
@@ -243,7 +243,7 @@ void tst_QAbstractAxis::gridLineVisible()
 
     QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridLineVisibleChanged(bool)));
+    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
     QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
     QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
     QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
@@ -286,7 +286,7 @@ void tst_QAbstractAxis::visible()
 
     QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridLineVisibleChanged(bool)));
+    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
     QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
     QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
     QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
@@ -327,7 +327,7 @@ void tst_QAbstractAxis::labelsAngle()
 
     QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridLineVisibleChanged(bool)));
+    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
     QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
     QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
     QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
@@ -370,7 +370,7 @@ void tst_QAbstractAxis::labelsBrush()
 
     QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridLineVisibleChanged(bool)));
+    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
     QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
     QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
     QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
@@ -421,7 +421,7 @@ void tst_QAbstractAxis::labelsFont()
 
     QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridLineVisibleChanged(bool)));
+    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
     QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
     QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
     QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
@@ -463,7 +463,7 @@ void tst_QAbstractAxis::labelsPen()
 
     QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridLineVisibleChanged(bool)));
+    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
     QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
     QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
     QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
@@ -505,7 +505,7 @@ void tst_QAbstractAxis::labelsVisible()
 
     QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridLineVisibleChanged(bool)));
+    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
     QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
     QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
     QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
@@ -545,7 +545,7 @@ void tst_QAbstractAxis::orientation()
 
     QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridLineVisibleChanged(bool)));
+    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
     QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
     QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
     QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
@@ -646,7 +646,7 @@ void tst_QAbstractAxis::shadesBrush()
 
     QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridLineVisibleChanged(bool)));
+    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
     QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
     QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
     QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
@@ -697,7 +697,7 @@ void tst_QAbstractAxis::shadesPen()
 
     QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridLineVisibleChanged(bool)));
+    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
     QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
     QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
     QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
@@ -739,7 +739,7 @@ void tst_QAbstractAxis::shadesVisible()
 
     QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridLineVisibleChanged(bool)));
+    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
     QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
     QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
     QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
@@ -778,7 +778,7 @@ void tst_QAbstractAxis::show()
 
     QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridLineVisibleChanged(bool)));
+    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
     QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
     QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
     QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
@@ -812,7 +812,7 @@ void tst_QAbstractAxis::hide()
 
     QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridLineVisibleChanged(bool)));
+    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
     QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
     QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
     QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));