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>

2 files changed, 2 insertions, 40 deletions

diff --git a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
index 8069865d93..808cc3ef34 100644
--- a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
+++ b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
@@ -57,12 +57,7 @@ class tst_QHostAddress : public QObject
 
 public:
     tst_QHostAddress();
-    virtual ~tst_QHostAddress();
 
-
-public slots:
-    void init();
-    void cleanup();
 private slots:
     void constructor_QString_data();
     void constructor_QString();
@@ -89,26 +84,13 @@ private slots:
     void convertv4v6();
 };
 
-tst_QHostAddress::tst_QHostAddress()
-{
-}
-
-tst_QHostAddress::~tst_QHostAddress()
-{
-}
-
 Q_DECLARE_METATYPE(QHostAddress)
 
-void tst_QHostAddress::init()
+tst_QHostAddress::tst_QHostAddress()
 {
     qRegisterMetaType<QHostAddress>("QHostAddress");
 }
 
-void tst_QHostAddress::cleanup()
-{
-    // No cleanup is required.
-}
-
 void tst_QHostAddress::constructor_QString_data()
 {
     setAddress_QString_data();
diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
index 5f0addba98..a38b8d0873 100644
--- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
@@ -92,17 +92,9 @@ class tst_QHostInfo : public QObject
 {
     Q_OBJECT
 
-public:
-    tst_QHostInfo();
-    virtual ~tst_QHostInfo();
-
-
-public slots:
+private slots:
     void init();
-    void cleanup();
     void initTestCase();
-
-private slots:
     void getSetCheck();
     void staticInformation();
     void lookupIPv4_data();
@@ -169,14 +161,6 @@ void tst_QHostInfo::staticInformation()
     qDebug() << "Domain name:" << QHostInfo::localDomainName();
 }
 
-tst_QHostInfo::tst_QHostInfo()
-{
-}
-
-tst_QHostInfo::~tst_QHostInfo()
-{
-}
-
 void tst_QHostInfo::initTestCase()
 {
     QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
@@ -237,10 +221,6 @@ void tst_QHostInfo::init()
     qt_qhostinfo_enable_cache(cache);
 }
 
-void tst_QHostInfo::cleanup()
-{
-}
-
 void tst_QHostInfo::lookupIPv4_data()
 {
     QTest::addColumn<QString>("hostname");