Tests: Remove empty init/cleanup slots, constructors and destructors.

Move some code (like registrations of meta types) from init() to
initTestCase() in the process.

Change-Id: I57db5156647cfadab554fbed853b2e68b2815f3b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>

5 files changed, 2 insertions, 107 deletions

diff --git a/tests/auto/other/gestures/tst_gestures.cpp b/tests/auto/other/gestures/tst_gestures.cpp
index 851edaeb19..fa65c29b00 100644
--- a/tests/auto/other/gestures/tst_gestures.cpp
+++ b/tests/auto/other/gestures/tst_gestures.cpp
@@ -309,17 +309,9 @@ class tst_Gestures : public QObject
 {
 Q_OBJECT
 
-public:
-    tst_Gestures();
-    virtual ~tst_Gestures();
-
-public slots:
+private slots:
     void initTestCase();
     void cleanupTestCase();
-    void init();
-    void cleanup();
-
-private slots:
     void customGesture();
     void autoCancelingGestures();
     void gestureOverChild();
@@ -355,14 +347,6 @@ private slots:
     void bug_13501_gesture_not_accepted();
 };
 
-tst_Gestures::tst_Gestures()
-{
-}
-
-tst_Gestures::~tst_Gestures()
-{
-}
-
 void tst_Gestures::initTestCase()
 {
     CustomGesture::GestureType = QGestureRecognizer::registerRecognizer(new CustomGestureRecognizer);
@@ -375,14 +359,6 @@ void tst_Gestures::cleanupTestCase()
     QGestureRecognizer::unregisterRecognizer(CustomGesture::GestureType);
 }
 
-void tst_Gestures::init()
-{
-}
-
-void tst_Gestures::cleanup()
-{
-}
-
 void tst_Gestures::customGesture()
 {
     GestureWidget widget;
diff --git a/tests/auto/other/modeltest/tst_modeltest.cpp b/tests/auto/other/modeltest/tst_modeltest.cpp
index 06195fdbae..f07609b230 100644
--- a/tests/auto/other/modeltest/tst_modeltest.cpp
+++ b/tests/auto/other/modeltest/tst_modeltest.cpp
@@ -44,16 +44,6 @@ class tst_ModelTest : public QObject
 {
     Q_OBJECT
 
-public:
-    tst_ModelTest() {}
-    virtual ~tst_ModelTest() {}
-
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
-
 private slots:
     void stringListModel();
     void treeWidgetModel();
@@ -63,24 +53,6 @@ private slots:
     void testResetThroughProxy();
 };
 
-
-
-void tst_ModelTest::initTestCase()
-{
-}
-
-void tst_ModelTest::cleanupTestCase()
-{
-}
-
-void tst_ModelTest::init()
-{
-
-}
-
-void tst_ModelTest::cleanup()
-{
-}
 /*
   tests
 */
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index 8fe4d976b3..5ba789a0ea 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -205,7 +205,6 @@ class tst_QAccessibility : public QObject
     Q_OBJECT
 public:
     tst_QAccessibility();
-    virtual ~tst_QAccessibility();
 
 public slots:
     void initTestCase();
@@ -286,10 +285,6 @@ tst_QAccessibility::tst_QAccessibility()
     click_count = 0;
 }
 
-tst_QAccessibility::~tst_QAccessibility()
-{
-}
-
 void tst_QAccessibility::onClicked()
 {
     click_count++;
diff --git a/tests/auto/other/qcomplextext/tst_qcomplextext.cpp b/tests/auto/other/qcomplextext/tst_qcomplextext.cpp
index 1428a63123..32065c3dd0 100644
--- a/tests/auto/other/qcomplextext/tst_qcomplextext.cpp
+++ b/tests/auto/other/qcomplextext/tst_qcomplextext.cpp
@@ -41,14 +41,6 @@ class tst_QComplexText : public QObject
 {
 Q_OBJECT
 
-public:
-    tst_QComplexText();
-    virtual ~tst_QComplexText();
-
-
-public slots:
-    void init();
-    void cleanup();
 private slots:
     void bidiReorderString_data();
     void bidiReorderString();
@@ -62,27 +54,6 @@ private slots:
     void bidiInvalidCursorNoMovement();
 };
 
-tst_QComplexText::tst_QComplexText()
-{
-}
-
-tst_QComplexText::~tst_QComplexText()
-{
-
-}
-
-void tst_QComplexText::init()
-{
-// This will be executed immediately before each test is run.
-// TODO: Add initialization code here.
-}
-
-void tst_QComplexText::cleanup()
-{
-// This will be executed immediately after each test is run.
-// TODO: Add cleanup code here.
-}
-
 void tst_QComplexText::bidiReorderString_data()
 {
     QTest::addColumn<QString>("logical");
diff --git a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
index 7cb6e67cbb..e044f5227a 100644
--- a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
+++ b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
@@ -81,18 +81,12 @@ class tst_QFocusEvent : public QObject
     Q_OBJECT
 
 public:
-    tst_QFocusEvent();
-    virtual ~tst_QFocusEvent();
-
-
     void initWidget();
 
-public slots:
+private slots:
     void initTestCase();
     void cleanupTestCase();
-    void init();
     void cleanup();
-private slots:
     void checkReason_Tab();
     void checkReason_ShiftTab();
     void checkReason_BackTab();
@@ -107,15 +101,6 @@ private:
     FocusLineEdit* childFocusWidgetTwo;
 };
 
-tst_QFocusEvent::tst_QFocusEvent()
-{
-}
-
-tst_QFocusEvent::~tst_QFocusEvent()
-{
-
-}
-
 void tst_QFocusEvent::initTestCase()
 {
     testFocusWidget = new QWidget( 0 );
@@ -139,10 +124,6 @@ void tst_QFocusEvent::cleanupTestCase()
     delete testFocusWidget;
 }
 
-void tst_QFocusEvent::init()
-{
-}
-
 void tst_QFocusEvent::cleanup()
 {
     childFocusWidgetTwo->setGeometry( 10, 50, 180, 20 );