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>

3 files changed, 3 insertions, 53 deletions

diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index 1257a3f420..dfa2280a6b 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -103,13 +103,10 @@ Q_OBJECT
 
 public:
     tst_QApplication();
-    virtual ~tst_QApplication();
 
-public slots:
+private slots:
     void initTestCase();
-    void init();
     void cleanup();
-private slots:
     void sendEventsOnProcessEvents(); // this must be the first test
     void staticSetup();
 
@@ -249,17 +246,6 @@ tst_QApplication::tst_QApplication()
 #endif
 }
 
-tst_QApplication::~tst_QApplication()
-{
-
-}
-
-void tst_QApplication::init()
-{
-// TODO: Add initialization code here.
-// This will be executed immediately before each test is run.
-}
-
 void tst_QApplication::cleanup()
 {
 // TODO: Add cleanup code here.
diff --git a/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp b/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp
index e94dfa5754..df7f14add3 100644
--- a/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp
+++ b/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp
@@ -41,15 +41,9 @@ class tst_QDesktopWidget : public QObject
 {
     Q_OBJECT
 
-public:
-    tst_QDesktopWidget();
-    virtual ~tst_QDesktopWidget();
-
-public slots:
-    void init();
+private slots:
     void cleanup();
 
-private slots:
     void numScreens();
     void primaryScreen();
     void screenNumberForQWidget();
@@ -59,18 +53,6 @@ private slots:
     void topLevels();
 };
 
-tst_QDesktopWidget::tst_QDesktopWidget()
-{
-}
-
-tst_QDesktopWidget::~tst_QDesktopWidget()
-{
-}
-
-void tst_QDesktopWidget::init()
-{
-}
-
 void tst_QDesktopWidget::cleanup()
 {
     QVERIFY(QApplication::topLevelWidgets().isEmpty());
diff --git a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
index eec572c3c4..e65e2e0899 100644
--- a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
+++ b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
@@ -46,16 +46,11 @@ class tst_QStackedLayout : public QObject
 
 public:
     tst_QStackedLayout();
-    virtual ~tst_QStackedLayout();
 
-
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
+private slots:
     void init();
     void cleanup();
 
-private slots:
     void getSetCheck();
     void testCase();
     void deleteCurrent();
@@ -100,18 +95,6 @@ tst_QStackedLayout::tst_QStackedLayout()
 {
 }
 
-tst_QStackedLayout::~tst_QStackedLayout()
-{
-}
-
-void tst_QStackedLayout::initTestCase()
-{
-}
-
-void tst_QStackedLayout::cleanupTestCase()
-{
-}
-
 void tst_QStackedLayout::init()
 {
     if (testWidget) {
@@ -134,7 +117,6 @@ void tst_QStackedLayout::cleanup()
     testWidget = 0;
 }
 
-
 void tst_QStackedLayout::testCase()
 {
     QStackedLayout onStack(testWidget);