Axes Tests: Fix Clang warnings about hiding overloaded virtual functions

Change tst_QAbstractAxis::init(QAbstractAxis* axis,QAbstractSeries* series)
to a protected non-virtual, non-slot helper function initAxes().
Remove overridden functions that are empty or identical to the
base implementation (cleanupTestCase()). Add override.

Fixes:
tst_qvalueaxis.cpp(41,10):  warning: 'tst_QValueAxis::init' hides overloaded virtual function [-Woverloaded-virtual]
tst_qlogvalueaxis.cpp(42,10):  warning: 'tst_QLogValueAxis::init' hides overloaded virtual function [-Woverloaded-virtual]
tst_qcategoryaxis.cpp(41,10):  warning: 'tst_QCategoryAxis::init' hides overloaded virtual function [-Woverloaded-virtual]
tst_qbarcategoryaxis.cpp(42,10):  warning: 'tst_QBarCategoriesAxis::init' hides overloaded virtual function [-Woverloaded-virtual]

Task-number: QTBUG-63512
Change-Id: Ieb5fae83a43b6ca6ff4211db980a56c10c02c015
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

7 files changed, 12 insertions, 43 deletions

diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
index 0201522c..d36af170 100644
--- a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
+++ b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
@@ -41,7 +41,7 @@ void tst_QAbstractAxis::cleanupTestCase()
     QTest::qWait(1); // Allow final deleteLaters to run
 }
 
-void tst_QAbstractAxis::init(QAbstractAxis* axis, QAbstractSeries* series)
+void tst_QAbstractAxis::initAxes(QAbstractAxis *axis, QAbstractSeries *series)
 {
     m_axis = axis;
     m_series = series;
diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.h b/tests/auto/qabstractaxis/tst_qabstractaxis.h
index c9341685..31d06f0d 100644
--- a/tests/auto/qabstractaxis/tst_qabstractaxis.h
+++ b/tests/auto/qabstractaxis/tst_qabstractaxis.h
@@ -44,9 +44,11 @@ class tst_QAbstractAxis : public QObject
 public slots:
     virtual void initTestCase();
     virtual void cleanupTestCase();
-    virtual void init(QAbstractAxis* axis,QAbstractSeries* series);
     virtual void cleanup();
 
+protected:
+    void initAxes(QAbstractAxis *axis, QAbstractSeries *series);
+
 private slots:
     void axisPen_data();
     void axisPen();
diff --git a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
index 343cdd98..0914706c 100644
--- a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
+++ b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
@@ -37,10 +37,8 @@ class tst_QBarCategoriesAxis: public tst_QAbstractAxis
 Q_OBJECT
 
 public slots:
-    void initTestCase();
-    void cleanupTestCase();
     void init();
-    void cleanup();
+    void cleanup() override;
 
 private slots:
     void qbarcategoryaxis_data();
@@ -90,15 +88,6 @@ private:
     QBarSeries* m_series;
 };
 
-void tst_QBarCategoriesAxis::initTestCase()
-{
-}
-
-void tst_QBarCategoriesAxis::cleanupTestCase()
-{
-    QTest::qWait(1); // Allow final deleteLaters to run
-}
-
 void tst_QBarCategoriesAxis::init()
 {
     m_baraxis = new QBarCategoryAxis();
@@ -128,7 +117,7 @@ void tst_QBarCategoriesAxis::init()
     foreach(QString category, categories)
         m_baraxis->append(category);
 
-    tst_QAbstractAxis::init(m_baraxis, m_series);
+    tst_QAbstractAxis::initAxes(m_baraxis, m_series);
     m_chart->addSeries(m_series);
     m_chart->createDefaultAxes();
 }
diff --git a/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp b/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp
index 5610914c..2a33d0a3 100644
--- a/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp
+++ b/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp
@@ -89,7 +89,7 @@ void tst_QCategoryAxis::init()
     m_categoryaxis = new QCategoryAxis();
     m_series = new QLineSeries();
     *m_series << QPointF(-100, -100) << QPointF(0, 0) << QPointF(100, 100);
-    tst_QAbstractAxis::init(m_categoryaxis, m_series);
+    tst_QAbstractAxis::initAxes(m_categoryaxis, m_series);
     m_chart->addSeries(m_series);
     m_chart->createDefaultAxes();
 }
diff --git a/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp b/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp
index 5091d1df..1a5f2c27 100644
--- a/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp
+++ b/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp
@@ -88,7 +88,7 @@ void tst_QDateTimeAxis::init()
     m_dateTimeAxisY = new QDateTimeAxis();
     m_series = new QLineSeries();
     *m_series << QPointF(-100, -100) << QPointF(0, 0) << QPointF(100, 100);
-    //    tst_QAbstractAxis::init(m_datetimeaxis, m_series);
+    //    tst_QAbstractAxis::initAxes(m_datetimeaxis, m_series);
 
     m_view = new QChartView;
     m_view->resize(200, 200);
diff --git a/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp b/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp
index 427008f8..ba987670 100644
--- a/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp
+++ b/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp
@@ -37,10 +37,8 @@ class tst_QLogValueAxis: public tst_QAbstractAxis
 Q_OBJECT
 
 public slots:
-    void initTestCase();
-    void cleanupTestCase();
     void init();
-    void cleanup();
+    void cleanup() override;
 
 private slots:
     void qlogvalueaxis_data();
@@ -77,21 +75,12 @@ private:
     QLineSeries* m_series;
 };
 
-void tst_QLogValueAxis::initTestCase()
-{
-}
-
-void tst_QLogValueAxis::cleanupTestCase()
-{
-    QTest::qWait(1); // Allow final deleteLaters to run
-}
-
 void tst_QLogValueAxis::init()
 {
     m_logvaluesaxis = new QLogValueAxis();
     m_series = new QLineSeries();
     *m_series << QPointF(1, 1) << QPointF(100, 100);
-    tst_QAbstractAxis::init(m_logvaluesaxis,m_series);
+    tst_QAbstractAxis::initAxes(m_logvaluesaxis, m_series);
     m_chart->addSeries(m_series);
     m_chart->createDefaultAxes();
 }
diff --git a/tests/auto/qvalueaxis/tst_qvalueaxis.cpp b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
index 57c78911..d865b9c2 100644
--- a/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
+++ b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
@@ -36,10 +36,8 @@ class tst_QValueAxis: public tst_QAbstractAxis
 Q_OBJECT
 
 public slots:
-    void initTestCase();
-    void cleanupTestCase();
     void init();
-    void cleanup();
+    void cleanup() override;
 
 private slots:
     void qvalueaxis_data();
@@ -78,21 +76,12 @@ private:
     QLineSeries* m_series;
 };
 
-void tst_QValueAxis::initTestCase()
-{
-}
-
-void tst_QValueAxis::cleanupTestCase()
-{
-    QTest::qWait(1); // Allow final deleteLaters to run
-}
-
 void tst_QValueAxis::init()
 {
     m_valuesaxis = new QValueAxis();
     m_series = new QLineSeries();
     *m_series << QPointF(-100, -100) << QPointF(0, 0) << QPointF(100, 100);
-    tst_QAbstractAxis::init(m_valuesaxis,m_series);
+    tst_QAbstractAxis::initAxes(m_valuesaxis,m_series);
     m_chart->addSeries(m_series);
     m_chart->createDefaultAxes();
 }