From 774f7e43278bedaeb4fd3751b9757c1f26652605 2012-03-12 09:40:14
From: Michal Klocek <michal.klocek@digia.com>
Date: 2012-03-12 09:40:14
Subject: [PATCH] Renames Grid to GridLine

---

diff --git a/examples/axischart/main.cpp b/examples/axischart/main.cpp
index 55a3ae1..aea3f23 100644
--- a/examples/axischart/main.cpp
+++ b/examples/axischart/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 
     QChartAxis* axisX = chartView->axisX();
     axisX->setLabelsAngle(45);
-    axisX->setGridPen(Qt::DashLine);
+    axisX->setGridLinePen(Qt::DashLine);
 
     QChartAxisCategories* categoriesX = axisX->categories();
     categoriesX->insert(0,"low");
diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp
index 77b6a77..0fe5f4f 100644
--- a/examples/barchart/main.cpp
+++ b/examples/barchart/main.cpp
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
     //! [5]
 
     //! [6]
-    chartView->axisX()->setGridVisible(false);
+    chartView->axisX()->setGridLineVisible(false);
     //! [6]
 
     window.setCentralWidget(chartView);
diff --git a/examples/percentbarchart/main.cpp b/examples/percentbarchart/main.cpp
index d43e221..a493b78 100644
--- a/examples/percentbarchart/main.cpp
+++ b/examples/percentbarchart/main.cpp
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
 
     //! [6]
     chartView->axisX()->setAxisVisible(false);
-    chartView->axisX()->setGridVisible(false);
+    chartView->axisX()->setGridLineVisible(false);
     chartView->axisX()->setLabelsVisible(false);
     //! [6]
 
diff --git a/examples/stackedbarchart/main.cpp b/examples/stackedbarchart/main.cpp
index 1521dd7..179a7d9 100644
--- a/examples/stackedbarchart/main.cpp
+++ b/examples/stackedbarchart/main.cpp
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
     //! [5]
 
     //! [6]
-    chartView->axisX()->setGridVisible(false);
+    chartView->axisX()->setGridLineVisible(false);
     //! [6]
 
     window.setCentralWidget(chartView);
diff --git a/examples/stackedbarchartdrilldown/main.cpp b/examples/stackedbarchartdrilldown/main.cpp
index bed0ce4..0bb409d 100644
--- a/examples/stackedbarchartdrilldown/main.cpp
+++ b/examples/stackedbarchartdrilldown/main.cpp
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
 
     // Disable axis, since they don't really apply to bar chart
 //    drilldownChart->axisX()->setAxisVisible(false);
-    drilldownChart->axisX()->setGridVisible(false);
+    drilldownChart->axisX()->setGridLineVisible(false);
 //    drilldownChart->axisX()->setLabelsVisible(false);
 
     QLegend* l = drilldownChart->legend();
diff --git a/src/axis/axisitem.cpp b/src/axis/axisitem.cpp
index e75053d..4994377 100644
--- a/src/axis/axisitem.cpp
+++ b/src/axis/axisitem.cpp
@@ -336,7 +336,7 @@ void AxisItem::handleAxisUpdated()
         setAxisOpacity(0);
     }
 
-    if(m_chartAxis->isGridVisible()) {
+    if(m_chartAxis->isGridLineVisible()) {
         setGridOpacity(100);
     }
     else {
@@ -363,7 +363,7 @@ void AxisItem::handleAxisUpdated()
     setLabelsPen(m_chartAxis->labelsPen());
     setLabelsBrush(m_chartAxis->labelsBrush());
     setLabelsFont(m_chartAxis->labelsFont());
-    setGridPen(m_chartAxis->gridPen());
+    setGridPen(m_chartAxis->gridLinePen());
     setShadesPen(m_chartAxis->shadesPen());
     setShadesBrush(m_chartAxis->shadesBrush());
 
diff --git a/src/axis/qchartaxis.cpp b/src/axis/qchartaxis.cpp
index 0843ec2..3492743 100644
--- a/src/axis/qchartaxis.cpp
+++ b/src/axis/qchartaxis.cpp
@@ -28,9 +28,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 
 /*!
-   \fn bool QChartAxis::isGridVisible() const
+   \fn bool QChartAxis::isGridLineVisible() const
    \brief Returns if grid is visible
-   \sa setGridVisible()
+   \sa setGridLineVisible()
 */
 
 /*!
@@ -142,7 +142,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 QChartAxis::QChartAxis(QObject* parent):QObject(parent),
 m_axisVisible(true),
-m_gridVisible(true),
+m_gridLineVisible(true),
 m_labelsVisible(true),
 m_labelsAngle(0),
 m_shadesVisible(true),
@@ -185,23 +185,23 @@ void QChartAxis::setAxisVisible(bool visible)
 }
 
 /*!
-  Sets if grid is \a visible.
+  Sets if grid line is \a visible.
  */
-void QChartAxis::setGridVisible(bool visible)
+void QChartAxis::setGridLineVisible(bool visible)
 {
-	if (m_gridVisible!=visible) {
-    m_gridVisible=visible;
+	if (m_gridLineVisible!=visible) {
+    m_gridLineVisible=visible;
     emit updated();
 	}
 }
 
 /*!
-  Sets \a pen used to draw grid.
+  Sets \a pen used to draw grid line.
  */
-void QChartAxis::setGridPen(const QPen& pen)
+void QChartAxis::setGridLinePen(const QPen& pen)
 {
-	if (m_gridPen!=pen) {
-    m_gridPen=pen;
+	if (m_gridLinePen!=pen) {
+    m_gridLinePen=pen;
     emit updated();
 	}
 }
@@ -368,7 +368,7 @@ void QChartAxis::setTicksCount(int count)
 void QChartAxis::show()
 {
    m_axisVisible=true;
-   m_gridVisible=true;
+   m_gridLineVisible=true;
    m_labelsVisible=true;
    m_shadesVisible=true;
    emit updated();
@@ -380,7 +380,7 @@ void QChartAxis::show()
 void QChartAxis::hide()
 {
     m_axisVisible=false;
-    m_gridVisible=false;
+    m_gridLineVisible=false;
     m_labelsVisible=false;
     m_shadesVisible=false;
     emit updated();
diff --git a/src/axis/qchartaxis.h b/src/axis/qchartaxis.h
index 0bb2a3f..f63d668 100644
--- a/src/axis/qchartaxis.h
+++ b/src/axis/qchartaxis.h
@@ -22,10 +22,10 @@ public:
     QPen axisPen() const { return m_axisPen;};
 
     //grid handling
-    bool isGridVisible() const { return m_gridVisible;};
-    void setGridVisible(bool visible);
-    void setGridPen(const QPen& pen);
-    QPen gridPen() const {return m_gridPen;}
+    bool isGridLineVisible() const { return m_gridLineVisible;};
+    void setGridLineVisible(bool visible);
+    void setGridLinePen(const QPen& pen);
+    QPen gridLinePen() const {return m_gridLinePen;}
 
     //labels handling
     bool labelsVisible() const { return m_labelsVisible;};
@@ -81,8 +81,8 @@ private:
     QPen m_axisPen;
     QBrush m_axisBrush;
 
-    bool m_gridVisible;
-    QPen m_gridPen;
+    bool m_gridLineVisible;
+    QPen m_gridLinePen;
 
     bool m_labelsVisible;
     QPen m_labelsPen;